diff --git a/flake.lock b/flake.lock index 43ce9fd..2e14740 100755 --- a/flake.lock +++ b/flake.lock @@ -196,16 +196,16 @@ }, "desktop-nixpkgs": { "locked": { - "lastModified": 1747327360, - "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/hosts/pi4/configuration.nix b/hosts/pi4/configuration.nix index db21923..ca2d6df 100755 --- a/hosts/pi4/configuration.nix +++ b/hosts/pi4/configuration.nix @@ -19,9 +19,17 @@ in ]; programs.zsh.enable = true; - services.hardware.argonone = { - enable = true; - package = pkgs.argononed; + services = { + hardware.argonone = { + enable = true; + package = pkgs.argononed; + }; + openssh = { + enable = true; + authorizedKeysFiles = [ + config.sops.secrets."ssh-keys-public/pi5".path + ]; + }; }; systemd.services.btattach = { diff --git a/hosts/pi4/home.nix b/hosts/pi4/home.nix index f836324..4cabae2 100755 --- a/hosts/pi4/home.nix +++ b/hosts/pi4/home.nix @@ -39,25 +39,25 @@ in path = "/home/matt/.ssh/id_ed25519"; mode = "0600"; }; - "ssh-keys-public/desktop-nixos" = { - path = "/home/matt/.ssh/authorized_keys"; - mode = "0600"; - }; +# "ssh-keys-public/desktop-nixos" = { +# path = "/home/matt/.ssh/authorized_keys"; +# mode = "0600"; +# }; - "ssh-keys-public/desktop-nixos-root" = { - path = "/home/matt/.ssh/authorized_keys2"; - mode = "0600"; - }; +# "ssh-keys-public/desktop-nixos-root" = { +# path = "/home/matt/.ssh/authorized_keys2"; +# mode = "0600"; +# }; - "ssh-keys-public/desktop-windows" = { - path = "/home/matt/.ssh/authorized_keys3"; - mode = "0600"; - }; +# "ssh-keys-public/desktop-windows" = { +# path = "/home/matt/.ssh/authorized_keys3"; +# mode = "0600"; +# }; - "ssh-keys-public/macbook-macos" = { - path = "/home/matt/.ssh/authorized_keys4"; - mode = "0600"; - }; +# "ssh-keys-public/macbook-macos" = { +# path = "/home/matt/.ssh/authorized_keys4"; +# mode = "0600"; +# }; }; }; diff --git a/hosts/pi4/impermanence.nix b/hosts/pi4/impermanence.nix index a119696..6dff37e 100755 --- a/hosts/pi4/impermanence.nix +++ b/hosts/pi4/impermanence.nix @@ -24,7 +24,7 @@ ]; files = [ "/etc/machine-id" - { file = "/etc/nix/id_rsa"; parentDirectory = { mode = "u=rwx,g=,o="; }; } + #{ file = "/etc/nix/id_rsa"; parentDirectory = { mode = "u=rwx,g=,o="; }; } ]; }; diff --git a/hosts/pi4/sops.nix b/hosts/pi4/sops.nix index 9f83aa7..4ca93cd 100755 --- a/hosts/pi4/sops.nix +++ b/hosts/pi4/sops.nix @@ -35,6 +35,9 @@ in group = config.users.users."${user}".group; restartUnits = [ "sshd.service" ]; }; + "ssh-keys-public/pi5" = { + neededForUsers = true; + }; }; }; } diff --git a/share/disko/disko.nix b/share/disko/disko.nix index 364fbc8..f11eeab 100644 --- a/share/disko/disko.nix +++ b/share/disko/disko.nix @@ -1,6 +1,6 @@ { ... }: let - rootDisk = "/dev/nvme0n1"; + rootDisk = "/dev/sda"; in { disko.devices.disk.main.imageSize = "32G"; @@ -84,4 +84,4 @@ in }; }; }; -} \ No newline at end of file +}