From bff03e1d88c7f23ac1156cfa6ccc426f949d2826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=BCde?= Date: Fri, 11 Sep 2026 22:44:59 +0200 Subject: [PATCH 1/5] update hyperhive --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 7146c5b..642e384 100644 --- a/flake.lock +++ b/flake.lock @@ -373,11 +373,11 @@ ] }, "locked": { - "lastModified": 1789071588, - "narHash": "sha256-wpeAnGUy0xzkKwjG8xhS6pkuKKxsbFaKZxX3dJyoy1I=", + "lastModified": 1789133030, + "narHash": "sha256-y8qj/RSbv/douVnTfRrekHKetbNo5CypIBNmxZPLEvM=", "ref": "refs/heads/main", - "rev": "bf544369374eeb529d2e9049af24d569e4ae4a2d", - "revCount": 4392, + "rev": "0a80f21003c9bf73865eb8e84ae479d6aba2e100", + "revCount": 4420, "type": "git", "url": "https://forge.darkest.space/hyperhive/hyperhive.git" }, @@ -1019,11 +1019,11 @@ ] }, "locked": { - "lastModified": 1789021019, - "narHash": "sha256-yaOk8fAX+oapXNR2JapK7gHw2yegqqfi4YDXw1c4dz0=", + "lastModified": 1789115342, + "narHash": "sha256-/8ftDpFYvNRTTfWDA5YyN1NO1xvCW3ppx/szqtCqbG4=", "owner": "vibec0re", "repo": "trollshell", - "rev": "72c287f0f37cb4b391627d5f60281863ec4c7ead", + "rev": "c55d0a4f14c0cd10e5c5ab01106def4b0e5c9835", "type": "github" }, "original": { From 255b274d23cd8ba071191f5a1c4bf0cbabeaf2b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=BCde?= Date: Fri, 11 Sep 2026 22:45:09 +0200 Subject: [PATCH 2/5] lower agent mem --- nixosModules/constellation-swarm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixosModules/constellation-swarm.nix b/nixosModules/constellation-swarm.nix index e5cb1a9..4a1b453 100644 --- a/nixosModules/constellation-swarm.nix +++ b/nixosModules/constellation-swarm.nix @@ -65,7 +65,7 @@ in }; c0re = { inherit adminUsers; - agentMemoryMax = "6G"; + agentMemoryMax = "5G"; claudeCodePackage = pkgs.unstable.claude-code; buildSlots = 2; }; From 876a4f09b855efce8ac3acb69284cdb46825dbec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=BCde?= Date: Fri, 11 Sep 2026 22:58:17 +0200 Subject: [PATCH 3/5] move apply aliases to dev shell --- flake.nix | 14 +++++++++++++- homeConfigurations/muede/zsh.nix | 3 --- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 4e232c1..95483b5 100644 --- a/flake.nix +++ b/flake.nix @@ -179,7 +179,19 @@ devShells = forAllSystems ( { pkgs, ... }: { - default = pkgs.mkShellNoCC { packages = [ pkgs.shellcheck ]; }; + default = pkgs.mkShellNoCC { + packages = [ + pkgs.shellcheck + (pkgs.writeShellScriptBin "myos-rebuild-boot" '' + sudo echo "all your machines are belong to us" + sudo nixos-rebuild boot --flake .# --show-trace --log-format internal-json -v |& ${pkgs.lib.getExe pkgs.nix-output-monitor} --json + '') + (pkgs.writeShellScriptBin "myos-rebuild-switch" '' + sudo echo "all your machines are belong to us" + sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.lib.getExe pkgs.nix-output-monitor} --json + '') + ]; + }; } ); }; diff --git a/homeConfigurations/muede/zsh.nix b/homeConfigurations/muede/zsh.nix index c74b4d7..0fec7cb 100644 --- a/homeConfigurations/muede/zsh.nix +++ b/homeConfigurations/muede/zsh.nix @@ -10,9 +10,6 @@ enableCompletion = true; shellAliases = { - myos-rebuild-boot = "sudo echo \"all your machines are belong to us\" && (sudo nixos-rebuild boot --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json)"; - myos-rebuild-switch = "sudo echo \"all your machines are belong to us\" && (sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json)"; - s = "nix-shell -p"; my-direnvallow = "echo \"use nix\" > .envrc && direnv allow"; From a090dbe73ebace880bf55177d0dbbb3d47ce7681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=BCde?= Date: Fri, 11 Sep 2026 23:04:00 +0200 Subject: [PATCH 4/5] use getExe everywhere --- homeConfigurations/muede/claude.nix | 2 +- homeConfigurations/muede/default.nix | 2 +- homeConfigurations/muede/niri.nix | 6 +++--- homeConfigurations/muede/swayidle.nix | 6 +++--- homeConfigurations/ronja/default.nix | 4 ++-- nixosModules/constellation-swarm.nix | 2 +- nixosModules/openssh.nix | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/homeConfigurations/muede/claude.nix b/homeConfigurations/muede/claude.nix index 2185c77..6e6cd09 100644 --- a/homeConfigurations/muede/claude.nix +++ b/homeConfigurations/muede/claude.nix @@ -76,7 +76,7 @@ let hdr=${lib.escapeShellArg headerFile} if [ -r "$hdr" ]; then ${exports} export OTEL_EXPORTER_OTLP_HEADERS="$(cat "$hdr")" - export OTEL_RESOURCE_ATTRIBUTES=${lib.escapeShellArg resourceAttributes}",host.name=$(${pkgs.coreutils}/bin/uname -n)" + export OTEL_RESOURCE_ATTRIBUTES=${lib.escapeShellArg resourceAttributes}",host.name=$(${lib.getExe' pkgs.coreutils "uname"} -n)" fi exec ${claude-code}/bin/claude "$@" diff --git a/homeConfigurations/muede/default.nix b/homeConfigurations/muede/default.nix index 300d39e..07c120b 100644 --- a/homeConfigurations/muede/default.nix +++ b/homeConfigurations/muede/default.nix @@ -99,7 +99,7 @@ ]; home.file = { - "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier"; + "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.lib.getExe pkgs.fsnotifier}"; }; services.poweralertd.enable = true; diff --git a/homeConfigurations/muede/niri.nix b/homeConfigurations/muede/niri.nix index a1385c8..ffbc45c 100644 --- a/homeConfigurations/muede/niri.nix +++ b/homeConfigurations/muede/niri.nix @@ -180,8 +180,8 @@ "Mod+Shift+Numbersign".action.show-hotkey-overlay = { }; # Suggested binds for running programs: terminal, app launcher, screen locker. - "Mod+T".action.spawn = "${lib.getBin pkgs.gnome-console}/bin/kgx"; - "Mod+D".action.spawn = "${lib.getBin config.programs.fuzzel.package}/bin/fuzzel"; + "Mod+T".action.spawn = lib.getExe pkgs.gnome-console; + "Mod+D".action.spawn = lib.getExe config.programs.fuzzel.package; # You can also use a shell. Do this if you need pipes, multiple commands, etc. # Note: the entire command goes as a single argument in the end. @@ -430,7 +430,7 @@ "Mod+O".action.toggle-overview = { }; "Super+Alt+L" = { - action.spawn = "${pkgs.systemd}/bin/loginctl lock-session"; + action.spawn = "${lib.getExe' pkgs.systemd "loginctl"} lock-session"; allow-when-locked = true; }; }; diff --git a/homeConfigurations/muede/swayidle.nix b/homeConfigurations/muede/swayidle.nix index 166c471..7a7fdfb 100644 --- a/homeConfigurations/muede/swayidle.nix +++ b/homeConfigurations/muede/swayidle.nix @@ -2,7 +2,7 @@ { services.swayidle = let - lock-command = "${pkgs.systemd}/bin/loginctl lock-session"; + lock-command = "${pkgs.lib.getExe' pkgs.systemd "loginctl"} lock-session"; in { enable = true; @@ -14,11 +14,11 @@ } { timeout = 60 * 10; - command = "${pkgs.systemd}/bin/systemctl suspend"; + command = "${pkgs.lib.getExe' pkgs.systemd "systemctl"} suspend"; } ]; events = { - before-sleep = "${pkgs.playerctl}/bin/playerctl pause; ${lock-command}"; + before-sleep = "${pkgs.lib.getExe pkgs.playerctl} pause; ${lock-command}"; }; }; } diff --git a/homeConfigurations/ronja/default.nix b/homeConfigurations/ronja/default.nix index 8ef3e07..315d940 100644 --- a/homeConfigurations/ronja/default.nix +++ b/homeConfigurations/ronja/default.nix @@ -36,8 +36,8 @@ ]; }; shellAliases = { - myos-update = ''echo "Enter sudo password" && sudo nixos-rebuild boot --flake git+https://forge.darkest.space/mara/nixos-configs.git --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json''; - myos-apply = ''echo "Enter sudo password" && sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json''; + myos-update = ''echo "Enter sudo password" && sudo nixos-rebuild boot --flake git+https://forge.darkest.space/mara/nixos-configs.git --show-trace --log-format internal-json -v |& ${pkgs.lib.getExe pkgs.nix-output-monitor} --json''; + myos-apply = ''echo "Enter sudo password" && sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.lib.getExe pkgs.nix-output-monitor} --json''; }; }; diff --git a/nixosModules/constellation-swarm.nix b/nixosModules/constellation-swarm.nix index 4a1b453..1d9ad78 100644 --- a/nixosModules/constellation-swarm.nix +++ b/nixosModules/constellation-swarm.nix @@ -91,7 +91,7 @@ in set -eu umask 077 for user in ${lib.escapeShellArgs adminUsers}; do - ${pkgs.coreutils}/bin/install -m0400 -o "$user" -g root \ + ${lib.getExe' pkgs.coreutils "install"} -m0400 -o "$user" -g root \ ${lib.escapeShellArg otelCredential} "$RUNTIME_DIRECTORY/$user" done ''; diff --git a/nixosModules/openssh.nix b/nixosModules/openssh.nix index 92eb5f6..b1ef877 100644 --- a/nixosModules/openssh.nix +++ b/nixosModules/openssh.nix @@ -30,7 +30,7 @@ PIDFILE="/run/ssh-inhibitor-''${PPID}.pid" case "''${PAM_TYPE:-}" in open_session) - ${pkgs.systemd}/bin/systemd-inhibit \ + ${lib.getExe' pkgs.systemd "systemd-inhibit"} \ --what=sleep \ --who=sshd \ --why="SSH session active" \ From c1080783c6f0fa3eacd2bdc6c2d871de5c63deb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?m=C3=BCde?= Date: Sat, 12 Sep 2026 00:08:22 +0200 Subject: [PATCH 5/5] nix flake update --- flake.lock | 39 +++++++++++++++++++-------------------- flake.nix | 2 +- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 642e384..4201036 100644 --- a/flake.lock +++ b/flake.lock @@ -373,11 +373,11 @@ ] }, "locked": { - "lastModified": 1789133030, - "narHash": "sha256-y8qj/RSbv/douVnTfRrekHKetbNo5CypIBNmxZPLEvM=", + "lastModified": 1789162365, + "narHash": "sha256-0EXUjmLSay0sjS0SmXD5DMPpxvMRyaN0rkadKLgVG+8=", "ref": "refs/heads/main", - "rev": "0a80f21003c9bf73865eb8e84ae479d6aba2e100", - "revCount": 4420, + "rev": "1fb9e068eef964f5188c404aeb395bce0eeb5556", + "revCount": 4459, "type": "git", "url": "https://forge.darkest.space/hyperhive/hyperhive.git" }, @@ -503,11 +503,11 @@ ] }, "locked": { - "lastModified": 1788667258, - "narHash": "sha256-jG/2WyvvMluKcDXFofsNkTkAQcKTF2eo8tBCQSAwGHY=", + "lastModified": 1789099545, + "narHash": "sha256-vvDF9c4zchR/DUgJCGOOck4WNiGmTDyBlJP3HuSTtLQ=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "ce9c6c4fd4c31a88dec890aef858a0d6d632efcd", + "rev": "d6662f1a25b656814f73b4681b5d211b16f6f492", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1788549839, - "narHash": "sha256-kOrCcSIA6w9J1hX5DqHy2k9pDTJymExTsbV74U9UtCA=", + "lastModified": 1789073787, + "narHash": "sha256-xfX/toC2QV707s06GbP4II/TxYF0fNQj7s5/LClNDKc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17de0b976395537756f30a3e78f2f06e5cec89ed", + "rev": "aff8a0b28396750446e5537a96461bc4facdb287", "type": "github" }, "original": { @@ -634,11 +634,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1788584326, - "narHash": "sha256-Fd3OB8J9JhgliQwOKcqx4M672CInxi1I5VnwsaXeSQo=", + "lastModified": 1789114715, + "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6713828a351efa628b025a1adf7f43cbf8597513", + "rev": "21a67dc470149f337cecafbe965d8d252a390518", "type": "github" }, "original": { @@ -679,11 +679,11 @@ ] }, "locked": { - "lastModified": 1788723624, - "narHash": "sha256-OnEh8fVJPfqtiIslWpUROvbQKHN+Z53/dB7BPWk6MMs=", + "lastModified": 1789157924, + "narHash": "sha256-Fv++1V+mSmyJnyXbh+PLlO1m7qxZmcaGIQ1BCrFjZk0=", "owner": "nix-community", "repo": "NUR", - "rev": "2a65aed7ed4bfac9c387b8a88c32d883df791edc", + "rev": "126a6f5ef07dad92e34d8b222e7834de14ebc5a4", "type": "github" }, "original": { @@ -1019,16 +1019,15 @@ ] }, "locked": { - "lastModified": 1789115342, - "narHash": "sha256-/8ftDpFYvNRTTfWDA5YyN1NO1xvCW3ppx/szqtCqbG4=", + "lastModified": 1789158872, + "narHash": "sha256-t+pbC+A3e3T5+WXxHu2WjUxTGUXPLXD7DL5cwHy+1+0=", "owner": "vibec0re", "repo": "trollshell", - "rev": "c55d0a4f14c0cd10e5c5ab01106def4b0e5c9835", + "rev": "bac323829673c48ad529e22f56386804fc9cef35", "type": "github" }, "original": { "owner": "vibec0re", - "ref": "feat/947-plugin-agents-p1", "repo": "trollshell", "type": "github" } diff --git a/flake.nix b/flake.nix index 95483b5..c992c9e 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; trollshell = { - url = "github:vibec0re/trollshell/feat/947-plugin-agents-p1"; + url = "github:vibec0re/trollshell"; inputs = { nixpkgs.follows = "nixpkgs"; treefmt-nix.follows = "treefmt-nix";