diff --git a/flake.lock b/flake.lock index 4201036..7146c5b 100644 --- a/flake.lock +++ b/flake.lock @@ -373,11 +373,11 @@ ] }, "locked": { - "lastModified": 1789162365, - "narHash": "sha256-0EXUjmLSay0sjS0SmXD5DMPpxvMRyaN0rkadKLgVG+8=", + "lastModified": 1789071588, + "narHash": "sha256-wpeAnGUy0xzkKwjG8xhS6pkuKKxsbFaKZxX3dJyoy1I=", "ref": "refs/heads/main", - "rev": "1fb9e068eef964f5188c404aeb395bce0eeb5556", - "revCount": 4459, + "rev": "bf544369374eeb529d2e9049af24d569e4ae4a2d", + "revCount": 4392, "type": "git", "url": "https://forge.darkest.space/hyperhive/hyperhive.git" }, @@ -503,11 +503,11 @@ ] }, "locked": { - "lastModified": 1789099545, - "narHash": "sha256-vvDF9c4zchR/DUgJCGOOck4WNiGmTDyBlJP3HuSTtLQ=", + "lastModified": 1788667258, + "narHash": "sha256-jG/2WyvvMluKcDXFofsNkTkAQcKTF2eo8tBCQSAwGHY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "d6662f1a25b656814f73b4681b5d211b16f6f492", + "rev": "ce9c6c4fd4c31a88dec890aef858a0d6d632efcd", "type": "github" }, "original": { @@ -618,11 +618,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1789073787, - "narHash": "sha256-xfX/toC2QV707s06GbP4II/TxYF0fNQj7s5/LClNDKc=", + "lastModified": 1788549839, + "narHash": "sha256-kOrCcSIA6w9J1hX5DqHy2k9pDTJymExTsbV74U9UtCA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aff8a0b28396750446e5537a96461bc4facdb287", + "rev": "17de0b976395537756f30a3e78f2f06e5cec89ed", "type": "github" }, "original": { @@ -634,11 +634,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1789114715, - "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=", + "lastModified": 1788584326, + "narHash": "sha256-Fd3OB8J9JhgliQwOKcqx4M672CInxi1I5VnwsaXeSQo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21a67dc470149f337cecafbe965d8d252a390518", + "rev": "6713828a351efa628b025a1adf7f43cbf8597513", "type": "github" }, "original": { @@ -679,11 +679,11 @@ ] }, "locked": { - "lastModified": 1789157924, - "narHash": "sha256-Fv++1V+mSmyJnyXbh+PLlO1m7qxZmcaGIQ1BCrFjZk0=", + "lastModified": 1788723624, + "narHash": "sha256-OnEh8fVJPfqtiIslWpUROvbQKHN+Z53/dB7BPWk6MMs=", "owner": "nix-community", "repo": "NUR", - "rev": "126a6f5ef07dad92e34d8b222e7834de14ebc5a4", + "rev": "2a65aed7ed4bfac9c387b8a88c32d883df791edc", "type": "github" }, "original": { @@ -1019,15 +1019,16 @@ ] }, "locked": { - "lastModified": 1789158872, - "narHash": "sha256-t+pbC+A3e3T5+WXxHu2WjUxTGUXPLXD7DL5cwHy+1+0=", + "lastModified": 1789021019, + "narHash": "sha256-yaOk8fAX+oapXNR2JapK7gHw2yegqqfi4YDXw1c4dz0=", "owner": "vibec0re", "repo": "trollshell", - "rev": "bac323829673c48ad529e22f56386804fc9cef35", + "rev": "72c287f0f37cb4b391627d5f60281863ec4c7ead", "type": "github" }, "original": { "owner": "vibec0re", + "ref": "feat/947-plugin-agents-p1", "repo": "trollshell", "type": "github" } diff --git a/flake.nix b/flake.nix index c992c9e..4e232c1 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; trollshell = { - url = "github:vibec0re/trollshell"; + url = "github:vibec0re/trollshell/feat/947-plugin-agents-p1"; inputs = { nixpkgs.follows = "nixpkgs"; treefmt-nix.follows = "treefmt-nix"; @@ -179,19 +179,7 @@ devShells = forAllSystems ( { pkgs, ... }: { - 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 - '') - ]; - }; + default = pkgs.mkShellNoCC { packages = [ pkgs.shellcheck ]; }; } ); }; diff --git a/homeConfigurations/muede/claude.nix b/homeConfigurations/muede/claude.nix index 6e6cd09..2185c77 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=$(${lib.getExe' pkgs.coreutils "uname"} -n)" + export OTEL_RESOURCE_ATTRIBUTES=${lib.escapeShellArg resourceAttributes}",host.name=$(${pkgs.coreutils}/bin/uname -n)" fi exec ${claude-code}/bin/claude "$@" diff --git a/homeConfigurations/muede/default.nix b/homeConfigurations/muede/default.nix index 07c120b..300d39e 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.lib.getExe pkgs.fsnotifier}"; + "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier"; }; services.poweralertd.enable = true; diff --git a/homeConfigurations/muede/niri.nix b/homeConfigurations/muede/niri.nix index ffbc45c..a1385c8 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.getExe pkgs.gnome-console; - "Mod+D".action.spawn = lib.getExe config.programs.fuzzel.package; + "Mod+T".action.spawn = "${lib.getBin pkgs.gnome-console}/bin/kgx"; + "Mod+D".action.spawn = "${lib.getBin config.programs.fuzzel.package}/bin/fuzzel"; # 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 = "${lib.getExe' pkgs.systemd "loginctl"} lock-session"; + action.spawn = "${pkgs.systemd}/bin/loginctl lock-session"; allow-when-locked = true; }; }; diff --git a/homeConfigurations/muede/swayidle.nix b/homeConfigurations/muede/swayidle.nix index 7a7fdfb..166c471 100644 --- a/homeConfigurations/muede/swayidle.nix +++ b/homeConfigurations/muede/swayidle.nix @@ -2,7 +2,7 @@ { services.swayidle = let - lock-command = "${pkgs.lib.getExe' pkgs.systemd "loginctl"} lock-session"; + lock-command = "${pkgs.systemd}/bin/loginctl lock-session"; in { enable = true; @@ -14,11 +14,11 @@ } { timeout = 60 * 10; - command = "${pkgs.lib.getExe' pkgs.systemd "systemctl"} suspend"; + command = "${pkgs.systemd}/bin/systemctl suspend"; } ]; events = { - before-sleep = "${pkgs.lib.getExe pkgs.playerctl} pause; ${lock-command}"; + before-sleep = "${pkgs.playerctl}/bin/playerctl pause; ${lock-command}"; }; }; } diff --git a/homeConfigurations/muede/zsh.nix b/homeConfigurations/muede/zsh.nix index 0fec7cb..c74b4d7 100644 --- a/homeConfigurations/muede/zsh.nix +++ b/homeConfigurations/muede/zsh.nix @@ -10,6 +10,9 @@ 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"; diff --git a/homeConfigurations/ronja/default.nix b/homeConfigurations/ronja/default.nix index 315d940..8ef3e07 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.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''; + 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''; }; }; diff --git a/nixosModules/constellation-swarm.nix b/nixosModules/constellation-swarm.nix index 1d9ad78..e5cb1a9 100644 --- a/nixosModules/constellation-swarm.nix +++ b/nixosModules/constellation-swarm.nix @@ -65,7 +65,7 @@ in }; c0re = { inherit adminUsers; - agentMemoryMax = "5G"; + agentMemoryMax = "6G"; claudeCodePackage = pkgs.unstable.claude-code; buildSlots = 2; }; @@ -91,7 +91,7 @@ in set -eu umask 077 for user in ${lib.escapeShellArgs adminUsers}; do - ${lib.getExe' pkgs.coreutils "install"} -m0400 -o "$user" -g root \ + ${pkgs.coreutils}/bin/install -m0400 -o "$user" -g root \ ${lib.escapeShellArg otelCredential} "$RUNTIME_DIRECTORY/$user" done ''; diff --git a/nixosModules/openssh.nix b/nixosModules/openssh.nix index b1ef877..92eb5f6 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) - ${lib.getExe' pkgs.systemd "systemd-inhibit"} \ + ${pkgs.systemd}/bin/systemd-inhibit \ --what=sleep \ --who=sshd \ --why="SSH session active" \