chore: bump dependencies
This commit is contained in:
parent
11d0bc133f
commit
9ab64ca35f
5 changed files with 64 additions and 21 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
result
|
||||||
24
flake.lock
generated
24
flake.lock
generated
|
|
@ -52,11 +52,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755519972,
|
"lastModified": 1756115622,
|
||||||
"narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=",
|
"narHash": "sha256-iv8xVtmLMNLWFcDM/HcAPLRGONyTRpzL9NS09RnryRM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "4073ff2f481f9ef3501678ff479ed81402caae6d",
|
"rev": "bafad29f89e83b2d861b493aa23034ea16595560",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -88,11 +88,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755330281,
|
"lastModified": 1756245047,
|
||||||
"narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=",
|
"narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0",
|
"rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -104,11 +104,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755471983,
|
"lastModified": 1756469547,
|
||||||
"narHash": "sha256-axUoWcm4cNQ36jOlnkD9D40LTfSQgk8ExfHSRm3rTtg=",
|
"narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "48f4c982de68d966421d2b6f1ddbeb6227cc5ceb",
|
"rev": "41d292bfc37309790f70f4c120b79280ce40af16",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -120,11 +120,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755186698,
|
"lastModified": 1756542300,
|
||||||
"narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=",
|
"narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c",
|
"rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@
|
||||||
expect
|
expect
|
||||||
fzf
|
fzf
|
||||||
gum
|
gum
|
||||||
|
rsync
|
||||||
# mason needs stuff
|
# mason needs stuff
|
||||||
gcc
|
gcc
|
||||||
clang-tools
|
clang-tools
|
||||||
|
|
@ -30,6 +31,8 @@
|
||||||
nixd
|
nixd
|
||||||
nixfmt-rfc-style
|
nixfmt-rfc-style
|
||||||
inputs.agenix.packages.x86_64-linux.default
|
inputs.agenix.packages.x86_64-linux.default
|
||||||
|
nix-output-monitor
|
||||||
|
nvd
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,39 +30,77 @@
|
||||||
"${pkgs.eza}/bin/eza --group-directories-first --hyperlink --icons -la --tree";
|
"${pkgs.eza}/bin/eza --group-directories-first --hyperlink --icons -la --tree";
|
||||||
llt =
|
llt =
|
||||||
"${pkgs.expect}/bin/unbuffer ${pkgs.eza}/bin/eza --group-directories-first --hyperlink --icons -la --tree | ${pkgs.less}/bin/less -r";
|
"${pkgs.expect}/bin/unbuffer ${pkgs.eza}/bin/eza --group-directories-first --hyperlink --icons -la --tree | ${pkgs.less}/bin/less -r";
|
||||||
|
sa = ''
|
||||||
|
if ps -p $SSH_AGENT_PID > /dev/null 2>&1; then ${pkgs.gum}/bin/gum log -l info "ssh-agent is already running: pid: $SSH_AGENT_PID"; else eval $(ssh-agent); ssh-add ~/.ssh/id_ed25519; ${pkgs.gum}/bin/gum log -l info "ssh-agent started"; fi'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
(pkgs.writeShellScriptBin "n" ''
|
(pkgs.writeShellScriptBin "n" ''
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
action=$(${pkgs.gum}/bin/gum choose switch test clean)
|
|
||||||
target=$(${pkgs.gum}/bin/gum choose PABU APPA MOMO)
|
action=$(${pkgs.gum}/bin/gum choose --header "Choose action:" build clean)
|
||||||
|
target=$(${pkgs.gum}/bin/gum choose --header "Choose target:" PABU APPA MOMO)
|
||||||
|
|
||||||
|
case "$target" in
|
||||||
|
"PABU")
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
if ! ps -p $SSH_AGENT_PID > /dev/null; then
|
||||||
|
${pkgs.gum}/bin/gum log -t kitchen -l error "ssh-agent is not running! Please run \"sa\". Exiting ..."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
${pkgs.rsync}/bin/rsync -r . $target:/root/nix/
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
case "$action" in
|
case "$action" in
|
||||||
"clean")
|
"clean")
|
||||||
case "$target" in
|
case "$target" in
|
||||||
"PABU")
|
"PABU")
|
||||||
gum log -t kitchen -l info "Running: sudo nix-collect-garbage -d && nix store gc && nix-store --optimise"
|
${pkgs.gum}/bin/gum log -t kitchen -l info "Running: sudo nix-collect-garbage -d && nix store gc && nix-store --optimise"
|
||||||
sudo nix-collect-garbage -d && nix store gc && nix-store --optimise
|
sudo nix-collect-garbage -d && nix store gc && nix-store --optimise
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
gum log -t kitchen -l info "Running: ssh $target \"nix-collect-garbage -d && nix store gc && nix-store --optimise\""
|
${pkgs.gum}/bin/gum log -t kitchen -l info "Running: ssh $target \"nix-collect-garbage -d && nix store gc && nix-store --optimise\""
|
||||||
ssh $target "nix-collect-garbage -d && nix store gc && nix-store --optimise"
|
ssh $target "nix-collect-garbage -d && nix store gc && nix-store --optimise"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
*)
|
"build")
|
||||||
case "$target" in
|
case "$target" in
|
||||||
"PABU")
|
"PABU")
|
||||||
gum log -t kitchen -l info "Running: sudo nixos-rebuild $action --option sandbox false --flake .#PABU"
|
sudo nixos-rebuild build --option sandbox false --log-format internal-json -v --flake .#PABU |& ${pkgs.nix-output-monitor}/bin/nom --json
|
||||||
sudo nixos-rebuild $action --option sandbox false --flake .#PABU
|
${pkgs.nvd}/bin/nvd --color=always diff /run/current-system result
|
||||||
|
postBuildAction=$(${pkgs.gum}/bin/gum choose --header "Choose post-build-action" skip switch boot test )
|
||||||
|
case "$postBuildAction" in
|
||||||
|
"skip")
|
||||||
|
${pkgs.gum}/bin/gum log -t kitchen -l info "Skipping ..."
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
sudo ./result/bin/switch-to-configuration $postBuildAction
|
||||||
|
;;
|
||||||
|
esac
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
gum log -t kitchen -l info "Running: nixos-rebuild $action --build-host $target --target-host $target --flake .#$target"
|
ssh $target "cd /root/nix; nixos-rebuild build --log-format internal-json -v --flake .#$target" |& ${pkgs.nix-output-monitor}/bin/nom --json
|
||||||
nixos-rebuild $action --build-host $target --target-host $target --flake .#$target
|
ssh $target "cd /root/nix; nix run nixpkgs#nvd -- --color=always diff /run/current-system result"
|
||||||
|
postBuildAction=$(${pkgs.gum}/bin/gum choose --header "Choose post-build-action" skip switch boot test )
|
||||||
|
case "$postBuildAction" in
|
||||||
|
"skip")
|
||||||
|
${pkgs.gum}/bin/gum log -t kitchen -l info "Skipping ..."
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
ssh $target "cd /root/nix; ./result/bin/switch-to-configuration $postBuildAction"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
*)
|
||||||
|
${pkgs.gum}/bin/gum log -t kitchen -l error "Unkown action: $action. Exiting ..."
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
'')
|
'')
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -27,5 +27,6 @@
|
||||||
pkgs.hexedit
|
pkgs.hexedit
|
||||||
pkgs.gdu # fast disk usage analyzer with console interface written in go
|
pkgs.gdu # fast disk usage analyzer with console interface written in go
|
||||||
pkgs.duf # disk usage/free utility - a better 'df' alternative
|
pkgs.duf # disk usage/free utility - a better 'df' alternative
|
||||||
|
pkgs.nvd # Nix/NixOS package version diff tool
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue