diff --git a/hardware/pilot1.nix b/hardware/pilot1.nix deleted file mode 100644 index aaa9e84..0000000 --- a/hardware/pilot1.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "usbhid" - "usb_storage" - "sd_mod" - "rtsx_pci_sdmmc" - ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/155b5acf-a0f8-4615-ae03-43a5c193f772"; - fsType = "ext4"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/31C7-CBD1"; - fsType = "vfat"; - }; - - swapDevices = [ { device = "/dev/disk/by-uuid/397a1a92-596f-421b-99e1-c9b2cb821309"; } ]; - - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/flake-module.nix b/hosts/flake-module.nix index 218e42f..ae3b4ec 100644 --- a/hosts/flake-module.nix +++ b/hosts/flake-module.nix @@ -40,31 +40,6 @@ inherit inputs; }; }; - pilot1 = inputs.nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - inputs.nixpkgs.nixosModules.notDetected - inputs.nixos-hardware.nixosModules.common-pc - inputs.nixos-hardware.nixosModules.common-pc-ssd - inputs.nixos-hardware.nixosModules.common-cpu-intel - (self.lib.createSystemModule "pilot1" { - hardwareConfig = ../hardware/pilot1.nix; - config = ../hosts/work-pc.nix; - }) - (self.lib.createUserModule "felschr" { - homeModule = self.homeModules.felschr-work; - user.extraGroups = [ - "wheel" - "audio" - "disk" - ]; - usesContainers = true; - }) - ]; - specialArgs = { - inherit inputs; - }; - }; home-server = inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ diff --git a/hosts/work-pc.nix b/hosts/work-pc.nix deleted file mode 100644 index 983f6a7..0000000 --- a/hosts/work-pc.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ ... }: - -{ - imports = [ - ../hardware/base.nix - ../hardware/bluetooth.nix - ../system/desktop.nix - ../system/printing/home.nix - ../desktop - ../virtualisation/containers.nix - ../virtualisation/podman.nix - ]; - - # replace with regenerated hardware-configuration.nix - boot.initrd.luks.devices = { - enc = { - device = "/dev/disk/by-partlabel/nixos"; - allowDiscards = true; - }; - }; - - nixpkgs.config.allowUnfree = true; - - hardware.logitech.wireless.enable = true; - hardware.logitech.wireless.enableGraphical = true; - - programs.adb.enable = true; - - programs.zsh.enable = true; - - services.openssh = { - enable = true; - settings = { - KbdInteractiveAuthentication = false; - PasswordAuthentication = false; - PermitRootLogin = "no"; - }; - }; - - # only change this when specified in release notes - system.stateVersion = "24.11"; -} diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 12acea1..624c028 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -6,11 +6,9 @@ let # `ssh-keygen -t ed25519 -N "" -f /etc/secrets/initrd/ssh_host_ed25519_key` home-pc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBFTQvIcSdhEKl/Kq+pcS/cPCyyZ1ygj+djfuaXzaRMx"; home-server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILO+OLPr8zdOMYyKtm98AFJai7zbaxw7JhVWgOwu7K3C"; - pilot1 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHEucfNzPbDRdDjTaLG3PzN4lAzDAq3QUkaLvaRjjsCY"; systems = [ home-pc home-server - pilot1 ]; in { @@ -18,13 +16,11 @@ in felschr home-pc home-server - pilot1 ]; "restic/password.age".publicKeys = [ felschr home-pc home-server - pilot1 ]; "smtp.age".publicKeys = [ felschr