diff --git a/hosts/pi4/configuration.nix b/hosts/pi4/configuration.nix index 62af04b..c2901f2 100755 --- a/hosts/pi4/configuration.nix +++ b/hosts/pi4/configuration.nix @@ -5,7 +5,7 @@ { config, lib, pkgs, ... }: let user = "matt"; - password = config.sops.secrets."desktop/matt_password".path; +# password = config.sops.secrets."desktop/matt_password".path; # kernelBundle = pkgs.linuxAndFirmware.v6_6_31; in { @@ -16,7 +16,7 @@ in # ./hardware-configuration.nix # ../../share/disko/default-hardware-config.nix ./networking.nix - ./sops.nix +# ./sops.nix ../default.nix ]; programs.zsh.enable = true; @@ -79,7 +79,8 @@ in mutableUsers = false; users."${user}" = { isNormalUser = true; - hashedPasswordFile = password; + # hashedPasswordFile = password; + password = "BogieDudie1"; extraGroups = [ "wheel" "docker" diff --git a/hosts/pi4/home.nix b/hosts/pi4/home.nix index a2e89a8..e3061b5 100755 --- a/hosts/pi4/home.nix +++ b/hosts/pi4/home.nix @@ -26,40 +26,40 @@ in home.homeDirectory = "/home/matt"; home.stateVersion = "23.11"; - sops = { - age.keyFile = "/home/matt/.config/sops/age/keys.txt"; - defaultSopsFile = "/etc/nixos/secrets/secrets.yaml"; - validateSopsFiles = false; - secrets = { - "ssh-keys-public/pi4" = { - path = "/home/matt/.ssh/id_ed25519.pub"; - mode = "0644"; - }; - "ssh-keys-private/pi4" = { - path = "/home/matt/.ssh/id_ed25519"; - mode = "0600"; - }; - "ssh-keys-public/desktop-nixos" = { - path = "/home/matt/.ssh/authorized_keys"; - mode = "0600"; - }; +# sops = { +# age.keyFile = "/home/matt/.config/sops/age/keys.txt"; +# defaultSopsFile = "/etc/nixos/secrets/secrets.yaml"; +# validateSopsFiles = false; +# secrets = { +# "ssh-keys-public/pi4" = { +# path = "/home/matt/.ssh/id_ed25519.pub"; +# mode = "0644"; +# }; +# "ssh-keys-private/pi4" = { +# 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-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"; +# }; +# }; +# }; programs = { fish.enable = false; diff --git a/hosts/pi4/networking.nix b/hosts/pi4/networking.nix index 8b9da60..154b540 100755 --- a/hosts/pi4/networking.nix +++ b/hosts/pi4/networking.nix @@ -24,7 +24,7 @@ in settings.connectivity.uri = lib.mkDefault "http://nmcheck.gnome.org/check_network_status.txt"; ensureProfiles = { environmentFiles = [ - config.sops.secrets.wifi.path +# config.sops.secrets.wifi.path ]; profiles = { diff --git a/share/disko/pi-uefi-disko.nix b/share/disko/pi-uefi-disko.nix index f8a3b3b..3aa901d 100644 --- a/share/disko/pi-uefi-disko.nix +++ b/share/disko/pi-uefi-disko.nix @@ -1,6 +1,6 @@ { ... }: let - rootDisk = "/dev/nvme0n1"; + rootDisk = "/dev/mmcblk0"; in { disko.devices.disk.main.imageSize = "32G"; @@ -37,10 +37,11 @@ in }; # /boot ESP = { - priority = 1; + priority = 2; name = "ESP"; - start = "1G"; - end = "2G"; + # start = "1G"; + # end = "2G"; + size = "1G"; type = "EF00"; content = { type = "filesystem"; @@ -98,4 +99,4 @@ in }; }; }; -} \ No newline at end of file +}