[pull] main from JanDeDobbeleer:main

.commitlintrc.yml

@@ -2,28 +2,21 @@
 extends:
   - '@commitlint/config-conventional'
 rules:
+  body-max-line-length:
+    - 2
+    - always
+    - 200
   type-enum:
-  - 2
-  - always
-  - - chore
-    - ci
-    - feat
-    - fix
-    - docs
-    - theme
-    - refactor
-    - perf
-    - test
-    - revert
-help: |
-  **Possible types**:
-  `chore`:    Change build process, tooling or dependencies.
-  `ci`:       Changes to our CI configuration files and scripts
-  `feat`:     Adds a new feature.
-  `fix`:      Solves a bug.
-  `docs`:     Adds or alters documentation.
-  `theme`:    Work on or add a theme.
-  `refactor`: Rewrites code without feature, performance or bug changes.
-  `perf`:     Improves performance.
-  `test`:     Adds or modifies tests.
-  `revert`:   Changes that reverting other changes
+    - 2
+    - always
+    - - chore
+      - ci
+      - docs
+      - feat
+      - fix
+      - perf
+      - refactor
+      - revert
+      - style
+      - test
+      - theme

.config/configuration.winget

@@ -0,0 +1,31 @@
+# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
+properties:
+  resources:
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      directives:
+        description: Install Visual Studio Code
+      settings:
+        id: Microsoft.VisualStudioCode
+        source: winget
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: golang
+      directives:
+        description: Install Golang
+      settings:
+        id: GoLang.Go
+        source: winget
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      dependsOn: [golang]
+      directives:
+        description: Install golangci-lint
+      settings:
+        id: GolangCI.golangci-lint
+        source: winget
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      directives:
+        description: Install NodeJS
+        securityContext: elevated
+      settings:
+        id: OpenJS.NodeJS
+        source: winget
+  configurationVersion: 0.2.0

.devcontainer/Dockerfile

@@ -0,0 +1,80 @@
+# See here for image contents: https://github.com/devcontainers/images/blob/main/src/go/.devcontainer/Dockerfile
+
+# [Choice] Go version: 1, 1.25, 1.26, 1-trixie, 1.25-trixie, 1.26-trixie, 1-bookworm, 1.25-bookworm, 1.26-bookworm, 1-bullseye, 1.25-bullseye, 1.26-bullseye
+ARG VARIANT=1-trixie
+FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT}
+
+# [Choice] Node.js version: none, lts/*, 24, 22, 20
+ARG NODE_VERSION="none"
+RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
+
+# Install powershell
+ARG PS_VERSION="7.6.0"
+# powershell-7.6.0-linux-x64.tar.gz
+# powershell-7.6.0-linux-arm64.tar.gz
+RUN ARCH="$(dpkg --print-architecture)"; \
+    if [ "${ARCH}" = "amd64" ]; then \
+        PS_BIN="v$PS_VERSION/powershell-$PS_VERSION-linux-x64.tar.gz"; \
+    elif [ "${ARCH}" = "arm64" ]; then \
+        PS_BIN="v$PS_VERSION/powershell-$PS_VERSION-linux-arm64.tar.gz"; \
+    elif [ "${ARCH}" = "armhf" ]; then \
+        PS_BIN="v$PS_VERSION/powershell-$PS_VERSION-linux-arm32.tar.gz"; \
+    fi; \
+    wget https://github.com/PowerShell/PowerShell/releases/download/$PS_BIN -O pwsh.tar.gz; \
+    mkdir /usr/local/pwsh && \
+    tar Cxvfz /usr/local/pwsh pwsh.tar.gz && \
+    rm pwsh.tar.gz && \
+    chmod +x /usr/local/pwsh/pwsh
+
+ENV PATH=$PATH:/usr/local/pwsh
+
+RUN echo 'deb http://download.opensuse.org/repositories/shells:/fish:/release:/4/Debian_13/ /' | tee /etc/apt/sources.list.d/shells:fish:release:4.list; \
+    curl -fsSL https://download.opensuse.org/repositories/shells:fish:release:4/Debian_13/Release.key | gpg --dearmor | tee /etc/apt/trusted.gpg.d/shells_fish_release_4.gpg > /dev/null; \
+    apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && apt-get install -y --no-install-recommends \
+    fish \
+    tmux \
+    fzf \
+    && apt-get clean
+
+ARG USERNAME=vscode
+
+# NOTE: devcontainers are Linux-only at this time but when
+# Windows or Darwin is supported someone will need to improve
+# the code logic above.
+
+# Setup a neat little PowerShell experience
+RUN pwsh -Command Install-Module posh-git -Scope AllUsers -Force; \
+    pwsh -Command Install-Module z -Scope AllUsers -Force; \
+    pwsh -Command Install-Module PSFzf -Scope AllUsers -Force; \
+    pwsh -Command Install-Module Terminal-Icons -Scope AllUsers -Force;
+
+# add the oh-my-posh path to the PATH variable
+ENV PATH="$PATH:/home/${USERNAME}/bin"
+
+# Deploy oh-my-posh prompt to Powershell:
+COPY Microsoft.PowerShell_profile.ps1 /home/${USERNAME}/.config/powershell/Microsoft.PowerShell_profile.ps1
+
+# Deploy oh-my-posh prompt to Fish:
+COPY config.fish /home/${USERNAME}/.config/fish/config.fish
+
+# Everything runs as root during build time, so we want
+# to make sure the vscode user can edit these paths too:
+RUN chmod 777 -R /home/${USERNAME}/.config
+
+# Override vscode's own Bash prompt with oh-my-posh:
+RUN sed -i 's/^__bash_prompt$/#&/' /home/${USERNAME}/.bashrc && \
+    echo "eval \"\$(oh-my-posh init bash)\"" >> /home/${USERNAME}/.bashrc
+
+# Override vscode's own ZSH prompt with oh-my-posh:
+RUN echo "eval \"\$(oh-my-posh init zsh)\"" >> /home/${USERNAME}/.zshrc
+
+# Set container timezone:
+ARG TZ="UTC"
+RUN ln -sf /usr/share/zoneinfo/${TZ} /etc/localtime
+
+# [Optional] Uncomment the next line to use go get to install anything else you need
+# RUN go get -x github.com/JanDeDobbeleer/battery
+
+# [Optional] Uncomment this line to install global node packages.
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

.devcontainer/Microsoft.PowerShell_profile.ps1

@@ -0,0 +1,9 @@
+Import-Module posh-git
+Import-Module PSFzf -ArgumentList 'Ctrl+t', 'Ctrl+r'
+Import-Module z
+Import-Module Terminal-Icons
+
+Set-PSReadlineKeyHandler -Key Tab -Function MenuComplete
+
+$env:POSH_GIT_ENABLED=$true
+oh-my-posh init pwsh | Invoke-Expression

.devcontainer/config.fish

@@ -0,0 +1,2 @@
+# Activate oh-my-posh prompt:
+oh-my-posh init fish | source

.devcontainer/devcontainer.json

@@ -0,0 +1,88 @@
+// For format details, see https://containers.dev/implementors/json_reference.
+// For config options, see the README at: https://github.com/devcontainers/images/tree/main/src/go
+{
+  "name": "oh-my-posh",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "args": {
+      // Update the VARIANT arg to pick a version of Go: 1, 1.25, 1.26
+      // Append -trixie, -bookworm or -bullseye to pin to an OS version.
+      "VARIANT": "2-1.26-trixie",
+
+      // Override me with your own timezone:
+      "TZ": "UTC",
+      // Use one of the "TZ database name" entries from:
+      // https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+
+      "NODE_VERSION": "lts/*",
+      //Powershell version
+      "PS_VERSION": "7.6.0"
+    }
+  },
+  "runArgs": [
+    "--cap-add=SYS_PTRACE",
+    "--security-opt",
+    "seccomp=unconfined",
+    "--security-opt",
+    "label=disable"
+  ],
+  "containerEnv": {
+    "HOME": "/home/vscode"
+  },
+
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "go.toolsManagement.checkForUpdates": "local",
+        "go.useLanguageServer": true,
+        "go.gopath": "/go",
+        "go.goroot": "/usr/local/go",
+        "terminal.integrated.profiles.linux": {
+          "bash": {
+            "path": "bash"
+          },
+          "zsh": {
+            "path": "zsh"
+          },
+          "fish": {
+            "path": "fish"
+          },
+          "tmux": {
+            "path": "tmux",
+            "icon": "terminal-tmux"
+          },
+          "pwsh": {
+            "path": "pwsh",
+            "icon": "terminal-powershell"
+          }
+        },
+        "terminal.integrated.defaultProfile.linux": "pwsh",
+        "terminal.integrated.defaultProfile.windows": "PowerShell",
+        "terminal.integrated.defaultProfile.osx": "pwsh",
+        "terminal.integrated.shellIntegration.enabled": false,
+        "tasks.statusbar.default.hide": true
+      },
+      "extensions": [
+        "bmalehorn.vscode-fish",
+        "davidanson.vscode-markdownlint",
+        "elves.elvish",
+        "esbenp.prettier-vscode",
+        "github.vscode-pull-request-github",
+        "golang.go",
+        "jnoortheen.xonsh",
+        "ms-azuretools.vscode-azurefunctions",
+        "ms-vscode.powershell",
+        "redhat.vscode-yaml",
+        "sumneko.lua",
+        "tamasfe.even-better-toml",
+        "yzhang.markdown-all-in-one"
+      ]
+    }
+  },
+  // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "vscode",
+  // This is running the same command as the VSCode Task 'devcontainer: rebuild oh-my-posh'
+  // It Compiles *oh-my-posh* from this repo while **overwriting** your preinstalled stable release.'
+  // Ideal for getting straight into developing & testing whilst using a devcontainer
+  "updateContentCommand": "cd src && go build -v -buildvcs=false -o /home/vscode/bin/oh-my-posh -ldflags \"-s -w -X 'github.com/jandedobbeleer/oh-my-posh/src/build.Version=development-$(git --no-pager log -1 --pretty=%h-%s)' -extldflags '-static'\""
+}

.editorconfig

@@ -32,3 +32,17 @@ trim_trailing_whitespace = false
 [*.{ps1,psd1,psm1}]
 indent_size = 4
 charset = utf-8-bom
+
+; Lua
+[*.lua]
+line_space_after_comment = max(2)
+line_space_after_do_statement = max(2)
+line_space_after_expression_statement = max(2)
+line_space_after_for_statement = max(2)
+line_space_after_function_statement = fixed(2)
+line_space_after_if_statement = max(2)
+line_space_after_local_or_assign_statement = max(2)
+line_space_after_repeat_statement = max(2)
+line_space_after_while_statement = max(2)
+max_line_length = unset
+quote_style = single

.gitattributes

@@ -1 +1,3 @@
 * text=auto eol=lf
+
+.github/workflows/*.lock.yml linguist-generated=true merge=ours

.github/FUNDING.yml

@@ -2,4 +2,4 @@
 
 github: jandedobbeleer
 ko_fi: jandedobbeleer
-liberapay: jandedobbeleer
+polar: oh-my-posh

.github/ISSUE_TEMPLATE/bug.yml

@@ -0,0 +1,66 @@
+name: 🐛 Bug Report
+description: File a bug report
+labels: ["🐛 bug"]
+assignees:
+  - jandedobbeleer
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/JanDeDobbeleer/oh-my-posh/blob/main/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: textarea
+    id: theme
+    attributes:
+      label: Theme
+      description: Which theme/config are you using?
+    validations:
+      required: true
+  - type: dropdown
+    id: operating-system
+    attributes:
+      label: What OS are you seeing the problem on?
+      multiple: true
+      options:
+        - Windows
+        - Linux
+        - macOS
+  - type: dropdown
+    id: shell
+    attributes:
+      label: Which shell are you using?
+      multiple: true
+      options:
+        - bash
+        - elvish
+        - fish
+        - cmd
+        - nu
+        - powershell
+        - xonsh
+        - zsh
+        - other (please specify)
+  - type: textarea
+    id: logs
+    attributes:
+      label: Log output
+      description: Please copy and paste the output generated by `oh-my-posh debug --plain`.
+      render: Shell
+    validations:
+      required: true