Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c1080783c6 | ||
|
|
a090dbe73e | ||
|
|
876a4f09b8 | ||
|
|
255b274d23 | ||
|
|
bff03e1d88 |
10 changed files with 46 additions and 38 deletions
39
flake.lock
generated
39
flake.lock
generated
|
|
@ -373,11 +373,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789071588,
|
"lastModified": 1789162365,
|
||||||
"narHash": "sha256-wpeAnGUy0xzkKwjG8xhS6pkuKKxsbFaKZxX3dJyoy1I=",
|
"narHash": "sha256-0EXUjmLSay0sjS0SmXD5DMPpxvMRyaN0rkadKLgVG+8=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "bf544369374eeb529d2e9049af24d569e4ae4a2d",
|
"rev": "1fb9e068eef964f5188c404aeb395bce0eeb5556",
|
||||||
"revCount": 4392,
|
"revCount": 4459,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://forge.darkest.space/hyperhive/hyperhive.git"
|
"url": "https://forge.darkest.space/hyperhive/hyperhive.git"
|
||||||
},
|
},
|
||||||
|
|
@ -503,11 +503,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1788667258,
|
"lastModified": 1789099545,
|
||||||
"narHash": "sha256-jG/2WyvvMluKcDXFofsNkTkAQcKTF2eo8tBCQSAwGHY=",
|
"narHash": "sha256-vvDF9c4zchR/DUgJCGOOck4WNiGmTDyBlJP3HuSTtLQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-vscode-extensions",
|
"repo": "nix-vscode-extensions",
|
||||||
"rev": "ce9c6c4fd4c31a88dec890aef858a0d6d632efcd",
|
"rev": "d6662f1a25b656814f73b4681b5d211b16f6f492",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -618,11 +618,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1788549839,
|
"lastModified": 1789073787,
|
||||||
"narHash": "sha256-kOrCcSIA6w9J1hX5DqHy2k9pDTJymExTsbV74U9UtCA=",
|
"narHash": "sha256-xfX/toC2QV707s06GbP4II/TxYF0fNQj7s5/LClNDKc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "17de0b976395537756f30a3e78f2f06e5cec89ed",
|
"rev": "aff8a0b28396750446e5537a96461bc4facdb287",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -634,11 +634,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1788584326,
|
"lastModified": 1789114715,
|
||||||
"narHash": "sha256-Fd3OB8J9JhgliQwOKcqx4M672CInxi1I5VnwsaXeSQo=",
|
"narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6713828a351efa628b025a1adf7f43cbf8597513",
|
"rev": "21a67dc470149f337cecafbe965d8d252a390518",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -679,11 +679,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1788723624,
|
"lastModified": 1789157924,
|
||||||
"narHash": "sha256-OnEh8fVJPfqtiIslWpUROvbQKHN+Z53/dB7BPWk6MMs=",
|
"narHash": "sha256-Fv++1V+mSmyJnyXbh+PLlO1m7qxZmcaGIQ1BCrFjZk0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "2a65aed7ed4bfac9c387b8a88c32d883df791edc",
|
"rev": "126a6f5ef07dad92e34d8b222e7834de14ebc5a4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1019,16 +1019,15 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789021019,
|
"lastModified": 1789158872,
|
||||||
"narHash": "sha256-yaOk8fAX+oapXNR2JapK7gHw2yegqqfi4YDXw1c4dz0=",
|
"narHash": "sha256-t+pbC+A3e3T5+WXxHu2WjUxTGUXPLXD7DL5cwHy+1+0=",
|
||||||
"owner": "vibec0re",
|
"owner": "vibec0re",
|
||||||
"repo": "trollshell",
|
"repo": "trollshell",
|
||||||
"rev": "72c287f0f37cb4b391627d5f60281863ec4c7ead",
|
"rev": "bac323829673c48ad529e22f56386804fc9cef35",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "vibec0re",
|
"owner": "vibec0re",
|
||||||
"ref": "feat/947-plugin-agents-p1",
|
|
||||||
"repo": "trollshell",
|
"repo": "trollshell",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
16
flake.nix
16
flake.nix
|
|
@ -82,7 +82,7 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
trollshell = {
|
trollshell = {
|
||||||
url = "github:vibec0re/trollshell/feat/947-plugin-agents-p1";
|
url = "github:vibec0re/trollshell";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.follows = "nixpkgs";
|
nixpkgs.follows = "nixpkgs";
|
||||||
treefmt-nix.follows = "treefmt-nix";
|
treefmt-nix.follows = "treefmt-nix";
|
||||||
|
|
@ -179,7 +179,19 @@
|
||||||
devShells = forAllSystems (
|
devShells = forAllSystems (
|
||||||
{ pkgs, ... }:
|
{ 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
|
||||||
|
'')
|
||||||
|
];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ let
|
||||||
hdr=${lib.escapeShellArg headerFile}
|
hdr=${lib.escapeShellArg headerFile}
|
||||||
if [ -r "$hdr" ]; then
|
if [ -r "$hdr" ]; then
|
||||||
${exports} export OTEL_EXPORTER_OTLP_HEADERS="$(cat "$hdr")"
|
${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
|
fi
|
||||||
|
|
||||||
exec ${claude-code}/bin/claude "$@"
|
exec ${claude-code}/bin/claude "$@"
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
home.file = {
|
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;
|
services.poweralertd.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -180,8 +180,8 @@
|
||||||
"Mod+Shift+Numbersign".action.show-hotkey-overlay = { };
|
"Mod+Shift+Numbersign".action.show-hotkey-overlay = { };
|
||||||
|
|
||||||
# Suggested binds for running programs: terminal, app launcher, screen locker.
|
# Suggested binds for running programs: terminal, app launcher, screen locker.
|
||||||
"Mod+T".action.spawn = "${lib.getBin pkgs.gnome-console}/bin/kgx";
|
"Mod+T".action.spawn = lib.getExe pkgs.gnome-console;
|
||||||
"Mod+D".action.spawn = "${lib.getBin config.programs.fuzzel.package}/bin/fuzzel";
|
"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.
|
# 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.
|
# Note: the entire command goes as a single argument in the end.
|
||||||
|
|
@ -430,7 +430,7 @@
|
||||||
"Mod+O".action.toggle-overview = { };
|
"Mod+O".action.toggle-overview = { };
|
||||||
|
|
||||||
"Super+Alt+L" = {
|
"Super+Alt+L" = {
|
||||||
action.spawn = "${pkgs.systemd}/bin/loginctl lock-session";
|
action.spawn = "${lib.getExe' pkgs.systemd "loginctl"} lock-session";
|
||||||
allow-when-locked = true;
|
allow-when-locked = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
{
|
{
|
||||||
services.swayidle =
|
services.swayidle =
|
||||||
let
|
let
|
||||||
lock-command = "${pkgs.systemd}/bin/loginctl lock-session";
|
lock-command = "${pkgs.lib.getExe' pkgs.systemd "loginctl"} lock-session";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
@ -14,11 +14,11 @@
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
timeout = 60 * 10;
|
timeout = 60 * 10;
|
||||||
command = "${pkgs.systemd}/bin/systemctl suspend";
|
command = "${pkgs.lib.getExe' pkgs.systemd "systemctl"} suspend";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
events = {
|
events = {
|
||||||
before-sleep = "${pkgs.playerctl}/bin/playerctl pause; ${lock-command}";
|
before-sleep = "${pkgs.lib.getExe pkgs.playerctl} pause; ${lock-command}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,6 @@
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
|
|
||||||
shellAliases = {
|
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";
|
s = "nix-shell -p";
|
||||||
|
|
||||||
my-direnvallow = "echo \"use nix\" > .envrc && direnv allow";
|
my-direnvallow = "echo \"use nix\" > .envrc && direnv allow";
|
||||||
|
|
|
||||||
|
|
@ -36,8 +36,8 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
shellAliases = {
|
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-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.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.lib.getExe pkgs.nix-output-monitor} --json'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ in
|
||||||
};
|
};
|
||||||
c0re = {
|
c0re = {
|
||||||
inherit adminUsers;
|
inherit adminUsers;
|
||||||
agentMemoryMax = "6G";
|
agentMemoryMax = "5G";
|
||||||
claudeCodePackage = pkgs.unstable.claude-code;
|
claudeCodePackage = pkgs.unstable.claude-code;
|
||||||
buildSlots = 2;
|
buildSlots = 2;
|
||||||
};
|
};
|
||||||
|
|
@ -91,7 +91,7 @@ in
|
||||||
set -eu
|
set -eu
|
||||||
umask 077
|
umask 077
|
||||||
for user in ${lib.escapeShellArgs adminUsers}; do
|
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"
|
${lib.escapeShellArg otelCredential} "$RUNTIME_DIRECTORY/$user"
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
PIDFILE="/run/ssh-inhibitor-''${PPID}.pid"
|
PIDFILE="/run/ssh-inhibitor-''${PPID}.pid"
|
||||||
case "''${PAM_TYPE:-}" in
|
case "''${PAM_TYPE:-}" in
|
||||||
open_session)
|
open_session)
|
||||||
${pkgs.systemd}/bin/systemd-inhibit \
|
${lib.getExe' pkgs.systemd "systemd-inhibit"} \
|
||||||
--what=sleep \
|
--what=sleep \
|
||||||
--who=sshd \
|
--who=sshd \
|
||||||
--why="SSH session active" \
|
--why="SSH session active" \
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue