From 399417d93a83534d64fc191f4b94638942aba54a Mon Sep 17 00:00:00 2001 From: muon Date: Sun, 8 Mar 2026 10:21:06 +0000 Subject: [PATCH 1/3] Update nix --- flake.lock | 26 +++++++++++++------------- hosts/muon/home.nix | 8 ++++++++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index c309aae..7590793 100644 --- a/flake.lock +++ b/flake.lock @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1772516620, - "narHash": "sha256-2r4cKdqCVlQkvcTcLUMxmsmAYZZxCMd//w/PnDnukTE=", + "lastModified": 1772845525, + "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", "owner": "nix-community", "repo": "home-manager", - "rev": "2b9504d5a0169d4940a312abe2df2c5658db8de9", + "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", "type": "github" }, "original": { @@ -471,11 +471,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1772433332, - "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", - "owner": "nixos", + "lastModified": 1772793846, + "narHash": "sha256-Nobd52UJijiRrKNX3FkgwUGRMjQ6J5kWq/xSUnHbWR8=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", + "rev": "1a0fccf8299acc1a36f7154efd13f6d005533d09", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1772483693, - "narHash": "sha256-sOq/GUSR0uw1eQla0Wc5BKztPqBJBj3khd/GhaVg4xU=", + "lastModified": 1772875143, + "narHash": "sha256-ENBRe7vCCp/SIG2WRKI2pyAxwnrc9CPuwZ4CtMu4KU4=", "owner": "NotAShelf", "repo": "nvf", - "rev": "750dbfaf6eb62db8e67afc03a3ae3078bfd8f098", + "rev": "6681e33727409d4ccfa687de981b594110a735d6", "type": "github" }, "original": { @@ -794,11 +794,11 @@ ] }, "locked": { - "lastModified": 1772517053, - "narHash": "sha256-aBuL2TFnyBLR+t6iBlKnTWWzprXYKQQIaV0IuCSPPeE=", + "lastModified": 1772858378, + "narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "32e9673aee2ae994ced561247918952398a3e933", + "rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9", "type": "github" }, "original": { diff --git a/hosts/muon/home.nix b/hosts/muon/home.nix index 697dc7e..5a77333 100644 --- a/hosts/muon/home.nix +++ b/hosts/muon/home.nix @@ -68,6 +68,14 @@ in { input.sensitivity = -0.4; }; + # SSH: auto-add work key to gpg-agent on first use + programs.ssh = { + enable = true; + addKeysToAgent = "yes"; + matchBlocks."*".identityFile = "~/.ssh/work_ed25519"; + matchBlocks."muho".identityFile = "~/.ssh/id_ed25519"; + }; + # Version of first install home.stateVersion = "23.05"; } From 6c635de326bf88d0da4b8ea0a5352de290db8d36 Mon Sep 17 00:00:00 2001 From: muon Date: Sun, 8 Mar 2026 10:28:46 +0000 Subject: [PATCH 2/3] Fix waringings --- hosts/muon/home.nix | 8 ++++++-- modules/home/terminal/helix/default.nix | 2 +- modules/home/terminal/hr/default.nix | 2 +- modules/home/terminal/shell.nix | 1 + modules/home/terminal/yazi.nix | 1 + modules/nixos/flatpak/default.nix | 1 + 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/hosts/muon/home.nix b/hosts/muon/home.nix index 5a77333..101a66b 100644 --- a/hosts/muon/home.nix +++ b/hosts/muon/home.nix @@ -10,6 +10,8 @@ in { mods.xdg.enable = true; mods.social.enable = true; mods.i3.enable = true; + mods.terminal.wezterm.enable = true; + mods.terminal.nushell.enable = true; mods.terminal.zsh.enable = true; mods.terminal.emulator.enable = true; mods.terminal.development.enable = true; @@ -71,8 +73,10 @@ in { # SSH: auto-add work key to gpg-agent on first use programs.ssh = { enable = true; - addKeysToAgent = "yes"; - matchBlocks."*".identityFile = "~/.ssh/work_ed25519"; + matchBlocks."*" = { + identityFile = "~/.ssh/work_ed25519"; + addKeysToAgent = "yes"; + }; matchBlocks."muho".identityFile = "~/.ssh/id_ed25519"; }; diff --git a/modules/home/terminal/helix/default.nix b/modules/home/terminal/helix/default.nix index 36f2b17..9781b41 100644 --- a/modules/home/terminal/helix/default.nix +++ b/modules/home/terminal/helix/default.nix @@ -62,7 +62,7 @@ { name = "nix"; auto-format = true; - formatter.command = "${pkgs.nixfmt-classic}/bin/nixfmt"; + formatter.command = "${pkgs.nixfmt}/bin/nixfmt"; } { name = "rust"; diff --git a/modules/home/terminal/hr/default.nix b/modules/home/terminal/hr/default.nix index 887f9b7..53a6ea6 100644 --- a/modules/home/terminal/hr/default.nix +++ b/modules/home/terminal/hr/default.nix @@ -18,7 +18,7 @@ in { format = "on $output "; }; - programs.zsh.initExtra = + programs.zsh.initContent = '' export MK2_TEST_SQL_INSTANCE_USER=gijs export MK2_TEST_SQL_INSTANCE_PASSWORD="$(cat ${config.sops.secrets.google-db-test.path})" diff --git a/modules/home/terminal/shell.nix b/modules/home/terminal/shell.nix index b8ad4a0..bbb298d 100644 --- a/modules/home/terminal/shell.nix +++ b/modules/home/terminal/shell.nix @@ -23,6 +23,7 @@ in { programs.zsh = lib.mkIf cfg.zsh.enable { enable = true; + dotDir = "${config.xdg.configHome}/zsh"; enableCompletion = true; autosuggestion.enable = true; syntaxHighlighting.enable = true; diff --git a/modules/home/terminal/yazi.nix b/modules/home/terminal/yazi.nix index 160b944..e366d5d 100644 --- a/modules/home/terminal/yazi.nix +++ b/modules/home/terminal/yazi.nix @@ -5,6 +5,7 @@ in with lib; { config = mkIf cfg.tools.enable { programs.yazi = { enable = true; + shellWrapperName = "y"; settings = { manager = { ratio = [ 1 4 3 ]; diff --git a/modules/nixos/flatpak/default.nix b/modules/nixos/flatpak/default.nix index 2cabac2..27c2ed7 100644 --- a/modules/nixos/flatpak/default.nix +++ b/modules/nixos/flatpak/default.nix @@ -22,5 +22,6 @@ in xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal ]; + xdg.portal.config.common.default = "*"; }; } From 86c3dbfa88904ae86745a476b3d67ed2b63e0ae3 Mon Sep 17 00:00:00 2001 From: muon Date: Sun, 8 Mar 2026 11:02:50 +0000 Subject: [PATCH 3/3] Add activationPackage --- flake.nix | 11 +++++++++++ modules/nixos/core/nix.nix | 1 + 2 files changed, 12 insertions(+) diff --git a/flake.nix b/flake.nix index 4838c59..3a02e3e 100644 --- a/flake.nix +++ b/flake.nix @@ -78,6 +78,17 @@ homeManagerModules.default = ./modules/home; + # Expose each host's HM activation package so `home-manager switch --flake .#muon@` + # works without a full NixOS rebuild. Extracted from the already-evaluated + # nixosConfiguration, so osConfig remains fully populated. + homeConfigurations = nixpkgs.lib.mapAttrs' (host: nixos: + nixpkgs.lib.nameValuePair "muon@${host}" { + activationPackage = nixos.config.home-manager.users.muon.home.activationPackage; + } + ) (nixpkgs.lib.filterAttrs + (_: nixos: nixos.config.home-manager.users ? muon) + inputs.self.outputs.nixosConfigurations); + colmena = { meta = { nixpkgs = import inputs.nixpkgs {inherit system;}; diff --git a/modules/nixos/core/nix.nix b/modules/nixos/core/nix.nix index 697fed8..5d88a0c 100644 --- a/modules/nixos/core/nix.nix +++ b/modules/nixos/core/nix.nix @@ -51,6 +51,7 @@ environment.systemPackages = with pkgs; [ inputs.nix-alien.packages.${system}.nix-alien + inputs.home-manager.packages.${system}.home-manager colmena ]; programs.nix-ld.enable = true;