chore(deps): lock file maintenance

fix(waybar): non-empty highlight missing
Move the style to the bottom of the file with `lib.mkAfter`.
2025-03-21 00:00:29 +01:00 · 2025-03-20 19:09:41 +01:00 · 2025-03-20 18:35:21 +01:00 · 2025-03-19 19:12:02 +01:00 · 2025-03-19 18:52:30 +01:00 · 2025-03-19 00:00:33 +01:00
10 changed files with 45 additions and 113 deletions
--- a/.forgejo/workflows/check.yml
+++ b/.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
--- a/flake-modules/nixos-modules.nix
+++ b/flake-modules/nixos-modules.nix
@ -12,7 +12,6 @@ in
    let
      nixosModule = {
        imports = [
-          inputs.niri.nixosModules.niri
          inputs.stylix.nixosModules.stylix
          inputs.home-manager.nixosModules.home-manager
          (modules + "/nixos")
--- a/flake.lock
+++ b/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": {
@ -275,57 +275,13 @@
        "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"
      }
    },
-    "niri": {
-      "inputs": {
-        "niri-stable": "niri-stable",
-        "niri-unstable": [],
-        "nixpkgs": [
-          "unstable"
-        ],
-        "nixpkgs-stable": [
-          "nixpkgs"
-        ],
-        "xwayland-satellite-stable": "xwayland-satellite-stable",
-        "xwayland-satellite-unstable": []
-      },
-      "locked": {
-        "lastModified": 1742108116,
-        "narHash": "sha256-NrV9ysEfSbeRUPo0jdCBeesuNLTVrpHGXg40snH1YGE=",
-        "owner": "sodiboo",
-        "repo": "niri-flake",
-        "rev": "824f10012de455a1d0ef795a605f28948ee10467",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sodiboo",
-        "repo": "niri-flake",
-        "type": "github"
-      }
-    },
-    "niri-stable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740117926,
-        "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=",
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "rev": "b94a5db8790339cf9134873d8b490be69e02ac71",
-        "type": "github"
-      },
-      "original": {
-        "owner": "YaLTeR",
-        "ref": "v25.02",
-        "repo": "niri",
-        "type": "github"
-      }
-    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1741862977,
-        "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=",
+        "lastModified": 1742388435,
+        "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0",
+        "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6",
        "type": "github"
      },
      "original": {
@ -337,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": {
@ -360,11 +316,11 @@
        "nuschtosSearch": []
      },
      "locked": {
-        "lastModified": 1741814789,
-        "narHash": "sha256-NbHsnnNwiYUcUaS4z8XK2tYpo3G8NXEKxaKkzMgMiLk=",
+        "lastModified": 1742488644,
+        "narHash": "sha256-vXpu7G4aupNCPlv8kAo7Y/jocfSUwglkvNx5cR0XjBo=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "33097dcf776d1fad0ff3842096c4e3546312f251",
+        "rev": "d44b33a1ea1a3e584a8c93164dbe0ba2ad4f3a13",
        "type": "github"
      },
      "original": {
@ -378,7 +334,6 @@
        "flake-parts": "flake-parts",
        "home-manager": "home-manager",
        "lix-module": "lix-module",
-        "niri": "niri",
        "nixpkgs": "nixpkgs",
        "nixvim": "nixvim",
        "stylix": "stylix",
@ -504,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": {
@ -516,23 +471,6 @@
        "repo": "treefmt-nix",
        "type": "github"
      }
-    },
-    "xwayland-satellite-stable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739246919,
-        "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=",
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Supreeeme",
-        "ref": "v0.5.1",
-        "repo": "xwayland-satellite",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -43,17 +43,6 @@
        nuschtosSearch.follows = "";
      };
    };
-    niri = {
-      url = "github:sodiboo/niri-flake";
-      inputs = {
-        # Deduplicate
-        nixpkgs.follows = "unstable";
-        nixpkgs-stable.follows = "nixpkgs";
-        # Unused
-        niri-unstable.follows = "";
-        xwayland-satellite-unstable.follows = "";
-      };
-    };
    flake-parts = {
      url = "github:hercules-ci/flake-parts";
      inputs.nixpkgs-lib.follows = "nixpkgs";
--- a/23
+++ b/23
@ -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:
--- a/modules/hm/gui/default.nix
+++ b/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 = {
--- a/modules/hm/users.nix
+++ b/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;
        };
--- a/modules/nixvim/extraPlugins/generated.nix
+++ b/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/";
  };
--- a/scripts/audiomenu/Cargo.lock
+++ b/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",
--- a/scripts/jpassmenu/Cargo.lock
+++ b/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",
Author	SHA1	Message	Date
Renovate Bot	5359f13621	chore(deps): lock file maintenance All checks were successful / check (push) Successful in 9s Details / check-renovaterc (push) Successful in 3s Details / build-packages (push) Successful in 14s Details / build-vm (push) Successful in 1s Details / report-size (push) Successful in 4s Details	2025-03-21 00:00:29 +01:00
Jalil David Salamé Messina	237a8f6ac5	fix(waybar): non-empty highlight missing All checks were successful / check (push) Successful in 9s Details / check-renovaterc (push) Successful in 3s Details / build-packages (push) Successful in 13s Details / build-vm (push) Successful in 1s Details / report-size (push) Successful in 3s Details Move the style to the bottom of the file with `lib.mkAfter`.	2025-03-20 19:09:41 +01:00
Jalil David Salamé Messina	54fd5df1f8	fix(jj): update signing config All checks were successful / check (push) Successful in 9s Details / check-renovaterc (push) Successful in 3s Details / build-packages (push) Successful in 13s Details / build-vm (push) Successful in 1s Details / report-size (push) Successful in 4s Details Some options have changed so set them so that signing works properly.	2025-03-20 18:35:21 +01:00
Jalil David Salamé Messina	3838039cee	chore: update nvim-silicon plugin All checks were successful / check (push) Successful in 9s Details / check-renovaterc (push) Successful in 3s Details / build-packages (push) Successful in 13s Details / build-vm (push) Successful in 2s Details / report-size (push) Successful in 4s Details Also fix `just update-vim-plugins` as it was broken by the recent refactor.	2025-03-19 19:12:02 +01:00
Jalil David Salamé Messina	bd970253f2	chore: update flake inputs Flake lock file updates: • Updated input 'nixvim': 'github:nix-community/nixvim/78f6166c23f80bdfbcc8c44b20f7f4132299a33f' (2025-03-17) → 'github:nix-community/nixvim/d79c291d5d80d587d518e0f530cc55adb0638c80' (2025-03-19) • Updated input 'nixvim/nixpkgs': 'github:NixOS/nixpkgs/1da52dd49a127ad74486b135898da2cef8c62665' (2025-02-05) → 'github:NixOS/nixpkgs/3549532663732bfd89993204d40543e9edaec4f2' (2025-03-18) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/b3b938ab8ba2e8a0ce9ee9b30ccfa5e903ae5753' (2025-03-18) → 'github:numtide/treefmt-nix/adc195eef5da3606891cedf80c0d9ce2d3190808' (2025-03-19)	2025-03-19 18:52:30 +01:00
Renovate Bot	a7af2d561c	chore(deps): lock file maintenance All checks were successful / check (push) Successful in 8s Details / check-renovaterc (push) Successful in 3s Details / build-packages (push) Successful in 13s Details / build-vm (push) Successful in 1s Details / report-size (push) Successful in 4s Details	2025-03-19 00:00:33 +01:00
Renovate Bot	8d6cb040cb	chore(deps): lock file maintenance All checks were successful / check (push) Successful in 8s Details / check-renovaterc (push) Successful in 3s Details / build-packages (push) Successful in 14s Details / build-vm (push) Successful in 2s Details / report-size (push) Successful in 4s Details	2025-03-18 00:00:36 +01:00
Jalil David Salamé Messina	a198949c26	ci: fix report-size deps All checks were successful / check (push) Successful in 9s Details / check-renovaterc (push) Successful in 3s Details / build-packages (push) Successful in 13s Details / build-vm (push) Successful in 2s Details / report-size (push) Successful in 4s Details It should run after the build jobs so that the cache is warm.	2025-03-17 08:29:54 +01:00