fix(waybar): non-empty highlight missing

Move the style to the bottom of the file with `lib.mkAfter`.

.forgejo/workflows/check.yml

@@ -39,7 +39,9 @@ jobs:
           nix build --print-build-logs '.#nixosConfigurations.vm.config.system.build.toplevel'
   report-size:
     runs-on: nixos
-    needs: build
+    needs:
+      - build-packages
+      - build-vm
     steps:
       - uses: "https://git.salame.cl/actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683" # v4
       - run: nix --version

flake.lock

@@ -226,11 +226,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739757849,
-        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
+        "lastModified": 1742234739,
+        "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
+        "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59",
         "type": "github"
       },
       "original": {
@@ -277,11 +277,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1741862977,
-        "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
+        "lastModified": 1742268799,
+        "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
+        "rev": "da044451c6a70518db5b730fe277b70f494188f1",
         "type": "github"
       },
       "original": {
@@ -293,11 +293,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1738797219,
-        "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=",
+        "lastModified": 1742272065,
+        "narHash": "sha256-ud8vcSzJsZ/CK+r8/v0lyf4yUntVmDq6Z0A41ODfWbE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1da52dd49a127ad74486b135898da2cef8c62665",
+        "rev": "3549532663732bfd89993204d40543e9edaec4f2",
         "type": "github"
       },
       "original": {
@@ -316,11 +316,11 @@
         "nuschtosSearch": []
       },
       "locked": {
-        "lastModified": 1741814789,
-        "narHash": "sha256-NbHsnnNwiYUcUaS4z8XK2tYpo3G8NXEKxaKkzMgMiLk=",
+        "lastModified": 1742396414,
+        "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "33097dcf776d1fad0ff3842096c4e3546312f251",
+        "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80",
         "type": "github"
       },
       "original": {
@@ -459,11 +459,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739829690,
-        "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
+        "lastModified": 1742370146,
+        "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "3d0579f5cc93436052d94b73925b48973a104204",
+        "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808",
         "type": "github"
       },
       "original": {

justfile

@@ -13,22 +13,19 @@ run-vm: build-vm
 
 update-vim-plugins:
     #!/bin/sh
-    # Use local nixpkgs if available
-    nixpkgs="$HOME/Dev/nixpkgs"
+    plugindir=./modules/nixvim/extraPlugins
     # copy nixpkgs from local checkout
-    if [ ! -d "$nixpkgs" ]; then
-        nixpkgs="$(mktemp -d)"
-        cp -r /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/. "$nixpkgs"
-        cd "$nixpkgs"
-        git init .
-        git add .
-        git commit -m 'dummy commit'
-        cd -
-    fi
+    nixpkgs="$(mktemp -d)"
+    cp -r /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/. "$nixpkgs"
+    cd "$nixpkgs"
+    git init .
+    git add .
+    git commit -m 'dummy commit'
+    cd -
     # update vim plugins
-    nix run nixpkgs#vimPluginsUpdater -- --proc=1 --nixpkgs "$nixpkgs" --no-commit -i ./nvim/extraPlugins/plugins -o ./nvim/extraPlugins/generated.nix update
+    nix run nixpkgs#vimPluginsUpdater -- --proc=1 --nixpkgs "$nixpkgs" --no-commit -i "$plugindir/plugins" -o "$plugindir/generated.nix" update
     # format the generated output
-    nix fmt ./nvim/extraPlugins/generated.nix
+    nix fmt "$plugindir/generated.nix"
 
 # Amend Update flake.lock PR
 flake-pr:

modules/hm/gui/default.nix

@@ -80,8 +80,10 @@ in
         settings = lib.mkIf config.jhome.styling.enable (
           import ./waybar-settings.nix { inherit config lib; }
         );
+        # Style overrides to highlight workspaces with windows
         style =
-          lib.optionalString config.jhome.styling.enable # css
+          lib.pipe
+            # css
             ''
               .modules-left #workspaces button {
                 border-bottom: 3px solid @base01;
@@ -89,7 +91,11 @@ in
               .modules-left #workspaces button.persistent {
                 border-bottom: 3px solid transparent;
               }
-            '';
+            ''
+            [
+              (lib.optionalString config.jhome.styling.enable)
+              lib.mkAfter
+            ];
       };
       # Terminal
       wezterm = {

modules/hm/users.nix

@@ -22,8 +22,9 @@ in
       };
       programs.jujutsu.settings = {
         user = lib.mkIf (cfg.defaultIdentity != null) { inherit (cfg.defaultIdentity) name email; };
+        git.sign-on-push = lib.mkDefault hasKey;
         signing = lib.mkIf hasKey {
-          sign-all = true;
+          behaviour = "own";
           backend = "gpg";
           key = signingKey;
         };

modules/nixvim/extraPlugins/generated.nix

@@ -10,12 +10,12 @@
 final: prev: {
   nvim-silicon = buildVimPlugin {
     pname = "nvim-silicon";
-    version = "2024-08-31";
+    version = "2025-01-09";
     src = fetchFromGitHub {
       owner = "michaelrommel";
       repo = "nvim-silicon";
-      rev = "9fe6001dc8cad4d9c53bcfc8649e3dc76ffa169c";
-      sha256 = "1qczi06yndkr2pmwidlkgmk0395x189sznvscn4fnr96jx58j5yl";
+      rev = "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32";
+      sha256 = "1zk6lgghvdcys20cqvh2g1kjf661q1w97niq5nx1zz4yppy2f9jy";
     };
     meta.homepage = "https://github.com/michaelrommel/nvim-silicon/";
   };

scripts/audiomenu/Cargo.lock

@@ -327,9 +327,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustix"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
+checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
 dependencies = [
  "bitflags",
  "errno",

scripts/jpassmenu/Cargo.lock

@@ -492,9 +492,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustix"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
+checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
 dependencies = [
  "bitflags",
  "errno",