packages: add more tags to tasks

2023-11-05 00:00:00 +07:00 · 2023-11-05 00:00:00 +07:00 · 0a00606752
parent 3ae2f1f680
commit 0a00606752
8 changed files with 47 additions and 23 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -2,24 +2,20 @@ root = true

 [*]
 tab_width = 4
+indent_size = 4
+indent_style = space
 charset = utf-8
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true

 [{*.yml,*.fish,*.jsonnet,*.libsonnet}]
-indent_style = space
 indent_size = 2

-[*.py]
-indent_style = space
-indent_size = 4
-
 [{Makefile,*.sh}]
 indent_style = tab

 [*.md]
-indent_style = space
 indent_size = 2
 max_line_length = 80
 trim_trailing_whitespace = false
--- a/roles/config/templates/fish/env.j2
+++ b/roles/config/templates/fish/env.j2
@ -52,6 +52,7 @@ set -gx CDKTF_HOME $XDG_DATA_HOME/terraform-cdk
 set -gx TF_PLUGIN_CACHE_DIR $XDG_CACHE_HOME/terraform/plugin-cache
 set -gx APPTAINER_CACHEDIR $XDG_CACHE_HOME/apptainer
 set -gx MAGEFILE_CACHE $XDG_CACHE_HOME/magefile
+set -gx MIX_XDG true
 # set -gx MANPATH :$XDG_DATA_HOME/man

 # common envs
--- a/roles/config/templates/git/config.j2
+++ b/roles/config/templates/git/config.j2
@ -61,11 +61,10 @@
    l = log --all --graph --pretty=format:'%C(yellow)%h%Creset %C(bold)<%an>%Creset -%C(bold)%C(green)%d%Creset %C(blue)%s%Creset (%cr)'
    br = branch --sort=-committerdate --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) %(color:bold)<%(authorname)>%(color:reset) - %(color:blue)%(contents:subject)%(color:reset) (%(committerdate:relative))'
    s = status -sbu
-    sbu = submodule update --remote --merge
-    redo = reset HEAD~1 --mixed
+    sbu = submodule update --remote --rebase
+    redo = reset HEAD~1
    unstage = reset HEAD
    wdiff = diff --word-diff
-    shallow = clone --single-branch --depth=1
    compare = !git log $1...$2 --format='%C(bold)%C(green)%m%Creset %C(yellow)%h%Creset %C(bold)<%an>%Creset - %C(blue)%s%Creset' --left-right

 # External, non-core functions
--- a/roles/packages/tasks/go-packages.jsonnet
+++ b/roles/packages/tasks/go-packages.jsonnet
@ -76,11 +76,12 @@ local packages =
    { name: 'mods', url: 'github.com/charmbracelet/mods' },

    // Nifty Pulumi stuff
-    { name: 'crd2pulumi', url: 'github.com/pulumi/crd2pulumi' },
-    { name: 'schema-tools', url: 'github.com/pulumi/schema-tools' },
+    { name: 'crd2pulumi', url: 'github.com/pulumi/crd2pulumi', tags: ['pulumi-addons'] },
+    { name: 'schema-tools', url: 'github.com/pulumi/schema-tools', tags: ['pulumi-addons'] },
    { name: 'kubespy', url: 'github.com/pulumi/kubespy' },
-    { name: 'registrygen', url: 'github.com/pulumi/registrygen' },
-    { name: 'pulumictl', url: 'github.com/pulumi/pulumictl/cmd/pulumictl' },
+    { name: 'registrygen', url: 'github.com/pulumi/registrygen', tags: ['pulumi-addons'] },
+    { name: 'pulumictl', url: 'github.com/pulumi/pulumictl/cmd/pulumictl', tags: ['pulumi-addons'] },
+    { name: 'pulumi-trace-tool', url: 'github.com/pulumi/pulumi-trace-tool', tags: ['pulumi-addons'] },

    // TODO: make an Alpine package when stablized and less feature locked down
    // (e.g. can customize themes, fonts, ...)
--- a/roles/packages/tasks/go-packages.yml
+++ b/roles/packages/tasks/go-packages.yml
@ -354,12 +354,16 @@
    cmd: /usr/bin/go install -ldflags "-s -w" github.com/pulumi/crd2pulumi@latest
    removes: /usr/bin/go
  name: packages | Install crd2pulumi
-  tags: crd2pulumi
+  tags:
+    - crd2pulumi
+    - pulumi-addons
 - command:
    cmd: /usr/bin/go install -ldflags "-s -w" github.com/pulumi/schema-tools@latest
    removes: /usr/bin/go
  name: packages | Install schema-tools
-  tags: schema-tools
+  tags:
+    - schema-tools
+    - pulumi-addons
 - command:
    cmd: /usr/bin/go install -ldflags "-s -w" github.com/pulumi/kubespy@latest
    removes: /usr/bin/go
@ -369,12 +373,23 @@
    cmd: /usr/bin/go install -ldflags "-s -w" github.com/pulumi/registrygen@latest
    removes: /usr/bin/go
  name: packages | Install registrygen
-  tags: registrygen
+  tags:
+    - registrygen
+    - pulumi-addons
 - command:
    cmd: /usr/bin/go install -ldflags "-s -w" github.com/pulumi/pulumictl/cmd/pulumictl@latest
    removes: /usr/bin/go
  name: packages | Install pulumictl
-  tags: pulumictl
+  tags:
+    - pulumictl
+    - pulumi-addons
+- command:
+    cmd: /usr/bin/go install -ldflags "-s -w" github.com/pulumi/pulumi-trace-tool@latest
+    removes: /usr/bin/go
+  name: packages | Install pulumi-trace-tool
+  tags:
+    - pulumi-trace-tool
+    - pulumi-addons
 - command:
    cmd: /usr/bin/go install -ldflags "-s -w" oss.terrastruct.com/d2@latest
    removes: /usr/bin/go
--- a/roles/packages/tasks/rust-packages.jsonnet
+++ b/roles/packages/tasks/rust-packages.jsonnet
@ -40,6 +40,7 @@ local packages =
    { name: 'selene', tags: ['linters'] },
    { name: 'typos-cli', tags: ['linters'] },
    { name: 'pylyzer', tags: ['lspservers'] },
+    { name: 'cargo-spellcheck', tags: ['linters'] },
  ]
  + [
    { name: x }
@ -67,8 +68,8 @@ local packagesRaw =
    { name: 'qsv', flags: '--features all_full' },
    { name: 'faerber', url: 'https://github.com/nekowinston/faerber.git', flags: 'faerber' },
    { name: 'nerdfix', url: 'https://github.com/loichyan/nerdfix.git' },
-    { name: 'nil', url: 'https://github.com/oxalica/nil.git', flags: 'nil' },
-    { name: 'nixpkgs-fmt', url: 'https://github.com/nix-community/nixpkgs-fmt.git', flags: 'nixpkgs-fmt' },
+    { name: 'nil', url: 'https://github.com/oxalica/nil.git', flags: 'nil', tags: ['lspservers'] },
+    { name: 'nixpkgs-fmt', url: 'https://github.com/nix-community/nixpkgs-fmt.git', flags: 'nixpkgs-fmt', tags: ['linters'] },

    // taplo package from Alpine's repo doesn't enable "lsp" feature
    // Ref: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/42225
--- a/roles/packages/tasks/rust-packages.yml
+++ b/roles/packages/tasks/rust-packages.yml
@ -32,12 +32,16 @@
    cmd: /usr/bin/cargo install --locked --force --git https://github.com/oxalica/nil.git nil
    removes: /usr/bin/cargo
  name: packages | Install nil
-  tags: nil
+  tags:
+    - nil
+    - lspservers
 - command:
    cmd: /usr/bin/cargo install --locked --force --git https://github.com/nix-community/nixpkgs-fmt.git nixpkgs-fmt
    removes: /usr/bin/cargo
  name: packages | Install nixpkgs-fmt
-  tags: nixpkgs-fmt
+  tags:
+    - nixpkgs-fmt
+    - linters
 - command:
    cmd: /usr/bin/cargo install --locked --force taplo-cli --features native-tls,lsp
    removes: /usr/bin/cargo
@ -66,6 +70,13 @@
  tags:
    - pylyzer
    - lspservers
+- community.general.cargo:
+    name: cargo-spellcheck
+    state: latest
+  name: packages | Install cargo-spellcheck
+  tags:
+    - cargo-spellcheck
+    - linters
 - community.general.cargo:
    name: kubernix
    state: latest
--- a/roles/theme/defaults/main.yml
+++ b/roles/theme/defaults/main.yml
@ -3,8 +3,8 @@ wallpaper_dir: ~/Pictures/Wallpapers

 # Fonts that are not covered by system packages
 font_versions:
-  iosevka: 27.2.1
-  sarasa-gothic: 0.42.3
+  iosevka: 27.3.4
+  sarasa-gothic: 0.42.5

 kvantum_themes:
  - name: Nordic