Compare commits

...

2 Commits

6 changed files with 22 additions and 6 deletions

View File

@ -291,7 +291,7 @@
sopp = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au nixld intel cuda p1005 ]; sopp = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au nixld intel cuda p1005 ];
bjarte = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ nixld intel hw.lenovo-thinkpad-x1-7th-gen ]; bjarte = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ nixld intel hw.lenovo-thinkpad-x1-7th-gen ];
bolle = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au dns64 intel ]; bolle = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au dns64 intel ];
eple = mk "pbsds.net" "x86_64-linux" inputs-2311 "23.11" [ au dns64 intel rocm_ ]; eple = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au dns64 intel rocm ];
garp = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au dns64 intel-novga cuda ]; garp = mk "pbsds.net" "x86_64-linux" inputs-2405 "23.11" [ au dns64 intel-novga cuda ];
hasselknippe= mk "pbsds.net" "aarch64-linux" inputs-2311 "23.11" [ hw.pine64-pinebook-pro ]; hasselknippe= mk "pbsds.net" "aarch64-linux" inputs-2311 "23.11" [ hw.pine64-pinebook-pro ];
#gomperud smattkuken skrytebiffen skalkesnerken balleby bingus skjrlaltatjlstad #gomperud smattkuken skrytebiffen skalkesnerken balleby bingus skjrlaltatjlstad
@ -320,7 +320,7 @@
in { in {
# TODO: get faketty to work ${expect}/bin/unbuffer is bad # TODO: get faketty to work ${expect}/bin/unbuffer is bad
nixos-rebuild-nom = pkgs.writeScriptBin "nixos-rebuild" '' nixos-rebuild-nom = pkgs.writeScriptBin "nixos-rebuild" ''
if test -t 1 || test -z "''${NIX_NO_NOM-}"; then if test -t 1 && test -z "''${NIX_NO_NOM-}"; then
exec ${lib.getExe pkgs.nixos-rebuild} "$@" -L |& ${lib.getExe pkgs.nix-output-monitor} exec ${lib.getExe pkgs.nixos-rebuild} "$@" -L |& ${lib.getExe pkgs.nix-output-monitor}
else else
exec ${lib.getExe pkgs.nixos-rebuild} "$@" -L exec ${lib.getExe pkgs.nixos-rebuild} "$@" -L

View File

@ -23,6 +23,8 @@
]; ];
#services.domeneshop-updater.targets = [ config.networking.fqdn ]; #services.domeneshop-updater.targets = [ config.networking.fqdn ];
nix.settings.max-jobs = 0; # remotes only lol, nspawn container has broken sandbox
services.openssh.enable = true; services.openssh.enable = true;
services.openssh.ports = lib.mkForce [ 2222 ]; services.openssh.ports = lib.mkForce [ 2222 ];
networking.firewall.allowedTCPPorts = [ 2222 ]; networking.firewall.allowedTCPPorts = [ 2222 ];

View File

@ -81,6 +81,12 @@ ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDuWdqEQ5mmVjuKi6f/Q
["bjarte.pbsds.net"] ["bjarte.pbsds.net"]
ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF4v1+FbiEa6Mohpf3/Una5ahKeKSG9yZ9iU5TC7ddL5 root@bjarte" ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF4v1+FbiEa6Mohpf3/Una5ahKeKSG9yZ9iU5TC7ddL5 root@bjarte"
["brumlebasse.pbsds.net"]
ssh.listenUser = "root"
ssh.listenPort = 2222
ssh.listenPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILD7+tE6rm742fz+nqa3+zlglMuzCzOQlc0OSJssvgVL"
ssh.userPublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJVohqGMKp/UEZtb71RSBBXOEGX4o3lN5GYBlP7HEKbs root@brumlebasse"
["isvegg.pvv.ntnu.no"] ["isvegg.pvv.ntnu.no"]
# maxJobs = 1 # 4 threads 16GB # maxJobs = 1 # 4 threads 16GB
speedFactor = 1 speedFactor = 1

View File

@ -40,13 +40,18 @@ switch:
boot: boot:
sudo nixos-rebuild boot --accept-flake-config --show-trace --flake . sudo nixos-rebuild boot --accept-flake-config --show-trace --flake .
boot-and-reboot:
sudo nixos-rebuild boot --accept-flake-config --show-trace --flake .
sudo reboot
build-vm: build-vm:
sudo nixos-rebuild build-vm --accept-flake-config --show-trace --flake . sudo nixos-rebuild build-vm --accept-flake-config --show-trace --flake .
push hostname=`just _a_host` cmd=`gum choose test switch boot --header "Select mode..."`: push hostname=`just _a_host` cmd=`gum choose test switch boot --header "Select mode..."`:
nixos-rebuild build --flake .#{{hostname}} nixos-rebuild build --flake .#{{hostname}}
@echo pushing... @echo pushing...
NIX_NO_NOM=1 NIX_SSHOPTS="-tt" nixos-rebuild {{cmd}} --flake .#{{hostname}} --use-remote-sudo --target-host $(nix eval .#nixosReports.{{hostname}}.fqdn --json | jq . -r) --use-substitutes NIX_NO_NOM=1 nixos-rebuild {{cmd}} --flake .#{{hostname}} --target-host root@$(nix eval .#nixosConfigurations.{{hostname}}.config.networking.fqdn --json | jq . -r) --use-substitutes
#NIX_NO_NOM=1 NIX_SSHOPTS="-tt" nixos-rebuild {{cmd}} --flake .#{{hostname}} --use-remote-sudo --target-host $(nix eval .#nixosReports.{{hostname}}.fqdn --json | jq . -r) --use-substitutes
inspect: inspect:
nix run -- nixpkgs#nix-inspect -p . nix run -- nixpkgs#nix-inspect -p .

View File

@ -80,16 +80,17 @@
librespeed-cli librespeed-cli
cachix /* cachix */
#nix-template /* nix-template */
nix-output-monitor nix-output-monitor
(pkgs.nix-inspect or unstable.nix-inspect)
unstable.nixpkgs-review unstable.nixpkgs-review
unstable.nixpkgs-hammering unstable.nixpkgs-hammering
unstable.nix-update unstable.nix-update
unstable.nix-init unstable.nix-init
unstable.deadnix unstable.deadnix
unstable.statix unstable.statix
unstable.nixtract /* unstable.nixtract */
unstable.nixfmt-rfc-style unstable.nixfmt-rfc-style
nurl nurl
manix manix

View File

@ -30,6 +30,8 @@
libreoffice libreoffice
gitg
remote-exec remote-exec
(pkgs.zxtune or unstable.zxtune or null) (pkgs.zxtune or unstable.zxtune or null)