From a198949c2668d003239379ea9208d48892f02eab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 17 Mar 2025 08:29:30 +0100 Subject: [PATCH 01/10] ci: fix report-size deps It should run after the build jobs so that the cache is warm. --- .forgejo/workflows/check.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/check.yml b/.forgejo/workflows/check.yml index 2eb273b..8d44b1d 100644 --- 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 From 8d6cb040cb8c90b4b4231892fa897b380872060c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 18 Mar 2025 00:00:36 +0100 Subject: [PATCH 02/10] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 7db632e..6824466 100644 --- 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": { @@ -277,11 +277,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741862977, - "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", + "lastModified": 1742136038, + "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", + "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", "type": "github" }, "original": { From a7af2d561c8f3260bd18676468274e046734b2de Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 19 Mar 2025 00:00:33 +0100 Subject: [PATCH 03/10] chore(deps): lock file maintenance --- flake.lock | 18 +++++++++--------- scripts/audiomenu/Cargo.lock | 4 ++-- scripts/jpassmenu/Cargo.lock | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 6824466..cfb2758 100644 --- a/flake.lock +++ b/flake.lock @@ -277,11 +277,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742136038, - "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=", + "lastModified": 1742268799, + "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341", + "rev": "da044451c6a70518db5b730fe277b70f494188f1", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1741814789, - "narHash": "sha256-NbHsnnNwiYUcUaS4z8XK2tYpo3G8NXEKxaKkzMgMiLk=", + "lastModified": 1742255305, + "narHash": "sha256-XxygfriVXQt+5Iqh6AOjZL5Aes5dH2xzVKpHpL8pDQg=", "owner": "nix-community", "repo": "nixvim", - "rev": "33097dcf776d1fad0ff3842096c4e3546312f251", + "rev": "78f6166c23f80bdfbcc8c44b20f7f4132299a33f", "type": "github" }, "original": { @@ -459,11 +459,11 @@ ] }, "locked": { - "lastModified": 1739829690, - "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", + "lastModified": 1742303424, + "narHash": "sha256-2R7cGdcA2npQQcIWu2cTlU63veTzwVZe78BliIuJT00=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3d0579f5cc93436052d94b73925b48973a104204", + "rev": "b3b938ab8ba2e8a0ce9ee9b30ccfa5e903ae5753", "type": "github" }, "original": { diff --git a/scripts/audiomenu/Cargo.lock b/scripts/audiomenu/Cargo.lock index 94ca863..44304bb 100644 --- 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", diff --git a/scripts/jpassmenu/Cargo.lock b/scripts/jpassmenu/Cargo.lock index 233f069..a83122b 100644 --- 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", From bd970253f2e0435498b8ca99265bc3ab7ccb5063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 19 Mar 2025 18:52:30 +0100 Subject: [PATCH 04/10] chore: update flake inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index cfb2758..c572d7f 100644 --- a/flake.lock +++ b/flake.lock @@ -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": 1742255305, - "narHash": "sha256-XxygfriVXQt+5Iqh6AOjZL5Aes5dH2xzVKpHpL8pDQg=", + "lastModified": 1742396414, + "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=", "owner": "nix-community", "repo": "nixvim", - "rev": "78f6166c23f80bdfbcc8c44b20f7f4132299a33f", + "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80", "type": "github" }, "original": { @@ -459,11 +459,11 @@ ] }, "locked": { - "lastModified": 1742303424, - "narHash": "sha256-2R7cGdcA2npQQcIWu2cTlU63veTzwVZe78BliIuJT00=", + "lastModified": 1742370146, + "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "b3b938ab8ba2e8a0ce9ee9b30ccfa5e903ae5753", + "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", "type": "github" }, "original": { From 3838039ceecd6509218e0078bc97418ca750964d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Wed, 19 Mar 2025 19:11:16 +0100 Subject: [PATCH 05/10] chore: update nvim-silicon plugin Also fix `just update-vim-plugins` as it was broken by the recent refactor. --- justfile | 23 ++++++++++------------- modules/nixvim/extraPlugins/generated.nix | 6 +++--- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/justfile b/justfile index a88bd00..4021089 100644 --- a/justfile +++ b/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: diff --git a/modules/nixvim/extraPlugins/generated.nix b/modules/nixvim/extraPlugins/generated.nix index e4d204b..f0a2fcf 100644 --- 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/"; }; From 54fd5df1f8fbf7f3473eaf9f27de244aaa2cb8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Thu, 20 Mar 2025 18:34:20 +0100 Subject: [PATCH 06/10] fix(jj): update signing config Some options have changed so set them so that signing works properly. --- modules/hm/users.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/hm/users.nix b/modules/hm/users.nix index dc36346..acbf9a8 100644 --- 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; }; From 237a8f6ac5e3dbbafc880f0d9742deb42feea0e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Thu, 20 Mar 2025 18:41:24 +0100 Subject: [PATCH 07/10] fix(waybar): non-empty highlight missing Move the style to the bottom of the file with `lib.mkAfter`. --- modules/hm/gui/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/hm/gui/default.nix b/modules/hm/gui/default.nix index 10948b2..00d70ea 100644 --- 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 = { From 5359f13621cc74c4582ccc4fa7d08c950ec188c4 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 21 Mar 2025 00:00:29 +0100 Subject: [PATCH 08/10] chore(deps): lock file maintenance --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index c572d7f..84b6b4f 100644 --- a/flake.lock +++ b/flake.lock @@ -277,11 +277,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742268799, - "narHash": "sha256-IhnK4LhkBlf14/F8THvUy3xi/TxSQkp9hikfDZRD4Ic=", + "lastModified": 1742388435, + "narHash": "sha256-GheQGRNYAhHsvPxWVOhAmg9lZKkis22UPbEHlmZMthg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "da044451c6a70518db5b730fe277b70f494188f1", + "rev": "b75693fb46bfaf09e662d09ec076c5a162efa9f6", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "nuschtosSearch": [] }, "locked": { - "lastModified": 1742396414, - "narHash": "sha256-e9Uv44rVDAG2ohNejttl9Pq5r4dxIzWxt+1hvKTQK5E=", + "lastModified": 1742488644, + "narHash": "sha256-vXpu7G4aupNCPlv8kAo7Y/jocfSUwglkvNx5cR0XjBo=", "owner": "nix-community", "repo": "nixvim", - "rev": "d79c291d5d80d587d518e0f530cc55adb0638c80", + "rev": "d44b33a1ea1a3e584a8c93164dbe0ba2ad4f3a13", "type": "github" }, "original": { From 7f3aaed6ed30becd330fc00c5a33ded0fd1f043c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Fri, 21 Mar 2025 16:21:13 +0100 Subject: [PATCH 09/10] refactor: don't include the whole modules Instead only import the nixos/hm/nixvim module. This _should_ reduce rebuilds. --- example-vm/default.nix | 40 +++++++++++++++++ .../default.nix => example-vm/vm-config.nix | 43 +++++++++--------- flake-modules/example-vm.nix | 44 ++----------------- flake-modules/home-modules.nix | 5 +-- flake-modules/nixos-modules.nix | 18 +------- flake-modules/nixvim-modules.nix | 15 ++++--- 6 files changed, 78 insertions(+), 87 deletions(-) create mode 100644 example-vm/default.nix rename machines/vm/default.nix => example-vm/vm-config.nix (50%) diff --git a/example-vm/default.nix b/example-vm/default.nix new file mode 100644 index 0000000..305f847 --- /dev/null +++ b/example-vm/default.nix @@ -0,0 +1,40 @@ +{ + import = [ ./vm_config.nix ]; + + time.timeZone = "Europe/Berlin"; + i18n.defaultLocale = "en_US.UTF-8"; + users.users.jdoe = { + password = "example"; + isNormalUser = true; + extraGroups = [ + "wheel" + "video" + "networkmanager" + ]; + }; + home-manager.users.jdoe = { + home = { + username = "jdoe"; + homeDirectory = "/home/jdoe"; + }; + jhome = { + enable = true; + gui.enable = true; + dev = { + enable = true; + rust.enable = true; + }; + }; + }; + + # password is 'test' see module documentation for more options + services.jupyter.password = "'sha1:1b961dc713fb:88483270a63e57d18d43cf337e629539de1436ba'"; + jconfig = { + enable = true; + dev = { + enable = true; + jupyter.enable = true; + }; + gui.enable = true; + }; +} diff --git a/machines/vm/default.nix b/example-vm/vm-config.nix similarity index 50% rename from machines/vm/default.nix rename to example-vm/vm-config.nix index ced0faa..1b2b4d0 100644 --- a/machines/vm/default.nix +++ b/example-vm/vm-config.nix @@ -1,31 +1,34 @@ +## Default QEMU guest config { - services.qemuGuest.enable = true; + services = { + qemuGuest.enable = true; + openssh.enable = true; + }; - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ehci_pci" - "ahci" - "usbhid" - "usb_storage" - "sd_mod" - "virtio_balloon" - "virtio_blk" - "virtio_pci" - "virtio_ring" - # "virtio_vga" - "virtio_gpu" - ]; + boot = { + loader.systemd-boot.enable = true; + initrd.availableKernelModules = [ + "xhci_pci" + "ehci_pci" + "ahci" + "usbhid" + "usb_storage" + "sd_mod" + "virtio_balloon" + "virtio_blk" + "virtio_pci" + "virtio_ring" + # "virtio_vga" + "virtio_gpu" + ]; + }; fileSystems."/".device = "/dev/disk/by-label/nixos"; - boot.loader.systemd-boot.enable = true; - - services.openssh.enable = true; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "22.11"; # Did you read the comment? + system.stateVersion = "24.11"; # Did you read the comment? } diff --git a/flake-modules/example-vm.nix b/flake-modules/example-vm.nix index a8ce4b3..d6b88de 100644 --- a/flake-modules/example-vm.nix +++ b/flake-modules/example-vm.nix @@ -8,47 +8,11 @@ in { # Example vm configuration flake.nixosConfigurations.vm = lib.nixosSystem { - inherit system pkgs; + inherit pkgs; modules = [ - inputs.self.nixosModules.vm # import vm module - { - time.timeZone = "Europe/Berlin"; - i18n.defaultLocale = "en_US.UTF-8"; - users.users.jdoe = { - password = "example"; - isNormalUser = true; - extraGroups = [ - "wheel" - "video" - "networkmanager" - ]; - }; - home-manager.users.jdoe = { - home = { - username = "jdoe"; - homeDirectory = "/home/jdoe"; - }; - jhome = { - enable = true; - gui.enable = true; - dev = { - enable = true; - rust.enable = true; - }; - }; - }; - nix.registry.nixpkgs.flake = inputs.nixpkgs; - # password is 'test' see module documentation for more options - services.jupyter.password = "'sha1:1b961dc713fb:88483270a63e57d18d43cf337e629539de1436ba'"; - jconfig = { - enable = true; - dev = { - enable = true; - jupyter.enable = true; - }; - gui.enable = true; - }; - } + inputs.self.nixosModules.default + ../example-vm # import vm configuration + { nix.registry.nixpkgs.flake = inputs.nixpkgs; } ]; }; diff --git a/flake-modules/home-modules.nix b/flake-modules/home-modules.nix index 8d8ca71..54e348b 100644 --- a/flake-modules/home-modules.nix +++ b/flake-modules/home-modules.nix @@ -1,7 +1,4 @@ { self, inputs, ... }: -let - modules = ../modules; -in { # FIXME(25.05): this version of HM should have the flake module # imports = [ inputs.home-manager.flakeModules.home-manager ]; @@ -11,7 +8,7 @@ in defaultModules = [ inputs.nixvim.homeManagerModules.nixvim self.nixvimModules.homeManager - (modules + "/hm") + ../module/hm ]; nixos = { imports = defaultModules; diff --git a/flake-modules/nixos-modules.nix b/flake-modules/nixos-modules.nix index 41bd64f..ef8355e 100644 --- a/flake-modules/nixos-modules.nix +++ b/flake-modules/nixos-modules.nix @@ -4,9 +4,6 @@ lib, ... }: -let - modules = ../modules; -in { flake.nixosModules = let @@ -14,7 +11,7 @@ in imports = [ inputs.stylix.nixosModules.stylix inputs.home-manager.nixosModules.home-manager - (modules + "/nixos") + ../modules/nixos ] ++ lib.optional (inputs.lix-module != null) inputs.lix-module.nixosModules.default; home-manager = { useGlobalPkgs = true; @@ -24,20 +21,9 @@ in # Pin nixpkgs nix.registry.nixpkgs.flake = inputs.nixpkgs; }; - - machines = [ "vm" ]; - mkMachine = hostname: { - imports = [ - nixosModule - (import (../machines + "/${hostname}")) - ]; - home-manager.sharedModules = [ { jhome.hostName = hostname; } ]; - }; - machineModules = lib.genAttrs machines mkMachine; in { default = nixosModule; inherit nixosModule; - } - // machineModules; + }; } diff --git a/flake-modules/nixvim-modules.nix b/flake-modules/nixvim-modules.nix index 9841d46..1f8a395 100644 --- a/flake-modules/nixvim-modules.nix +++ b/flake-modules/nixvim-modules.nix @@ -1,7 +1,4 @@ { self, inputs, ... }: -let - modules = ../modules; -in { imports = [ inputs.nixvim.flakeModules.default ]; @@ -10,10 +7,14 @@ in checks.enable = false; # FIXME: borked due to nix-community/nixvim#3074 }; - flake.nixvimModules = { - standalone = modules + "/nixvim/standalone.nix"; - homeManager = modules + "/nixvim"; - }; + flake.nixvimModules = + let + module = ../modules/nixvim; + in + { + standalone = "${module}/standalone.nix"; + homeManager = module; + }; perSystem = { system, ... }: From 63f9776a318948fa1d9ed2508b026f74dc484211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sun, 16 Mar 2025 22:25:58 +0100 Subject: [PATCH 10/10] wip: niri take 2 [skip-ci] Take two, since one wasn't enough. --- flake-modules/nixos-modules.nix | 1 + flake.lock | 62 +++++++++++++++++++++++++++++++++ flake.nix | 11 ++++++ 3 files changed, 74 insertions(+) diff --git a/flake-modules/nixos-modules.nix b/flake-modules/nixos-modules.nix index ef8355e..44ec630 100644 --- a/flake-modules/nixos-modules.nix +++ b/flake-modules/nixos-modules.nix @@ -9,6 +9,7 @@ let nixosModule = { imports = [ + inputs.niri.nixosModules.niri inputs.stylix.nixosModules.stylix inputs.home-manager.nixosModules.home-manager ../modules/nixos diff --git a/flake.lock b/flake.lock index 84b6b4f..ba3e58a 100644 --- a/flake.lock +++ b/flake.lock @@ -275,6 +275,50 @@ "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": 1742388435, @@ -334,6 +378,7 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "lix-module": "lix-module", + "niri": "niri", "nixpkgs": "nixpkgs", "nixvim": "nixvim", "stylix": "stylix", @@ -471,6 +516,23 @@ "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", diff --git a/flake.nix b/flake.nix index 8c9a20b..6f6c265 100644 --- a/flake.nix +++ b/flake.nix @@ -43,6 +43,17 @@ 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";