diff --git a/flake.nix b/flake.nix index a4a5f4dd..350653c5 100644 --- a/flake.nix +++ b/flake.nix @@ -38,7 +38,6 @@ firefly = mkNixos [ ./hosts/firefly/system ]; cyberspark = mkNixos [ ./hosts/cyberspark/system ]; shuttleworth = mkNixos [ ./hosts/shuttleworth/system ]; - lacros = mkNixos [ ./hosts/lacros/system ]; }; # home-manager switch --flake .#username@hostname @@ -46,7 +45,6 @@ "jimbo@firefly" = mkHome [ ./hosts/firefly/home ] nixpkgs.legacyPackages.x86_64-linux; "jimbo@cyberspark" = mkHome [ ./hosts/cyberspark/home ] nixpkgs.legacyPackages.x86_64-linux; "jimbo@shuttleworth" = mkHome [ ./hosts/shuttleworth/home ] nixpkgs.legacyPackages.aarch64-linux; - "jimbo@lacros" = mkHome [ ./hosts/lacros/home ] nixpkgs.legacyPackages.x86_64-linux; }; }; } diff --git a/hosts/firefly/home/default.nix b/hosts/firefly/home/default.nix index d6d513d2..4bd077bd 100644 --- a/hosts/firefly/home/default.nix +++ b/hosts/firefly/home/default.nix @@ -8,9 +8,9 @@ ../../../modules/home/settings ../../../modules/home/programs ../../../modules/home/programs/misc/production + ../../../modules/home/programs/misc/school ../../../modules/home/programs/misc/gaming/launchers ../../../modules/home/programs/misc/gaming/xash3d - ../../../modules/home/programs/misc/school ../../../modules/home/sway ../../../modules/home/utils diff --git a/hosts/firefly/system/default.nix b/hosts/firefly/system/default.nix index 652005e3..343e7f97 100644 --- a/hosts/firefly/system/default.nix +++ b/hosts/firefly/system/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ lanzaboote, ... }: { imports = [ ./hardware @@ -21,6 +21,9 @@ # Misc ../../../overlays ../../../variables + + # Imports + lanzaboote.nixosModules.lanzaboote ]; networking.hostName = "firefly"; diff --git a/hosts/lacros/home/default.nix b/hosts/lacros/home/default.nix deleted file mode 100644 index 75cd42ea..00000000 --- a/hosts/lacros/home/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, nur, ... }: -{ - imports = [ - # Apps and programs - ../../../modules/home - ../../../modules/home/users - ../../../modules/home/files - ../../../modules/home/settings - ../../../modules/home/programs - ../../../modules/home/programs/misc/remote-desktop - ../../../modules/home/sway - ../../../modules/home/utils - - # Misc - ../../../overlays - ../../../variables - ../../../variables/look/colors/purple - - # Imports - nur.nixosModules.nur - ]; -} diff --git a/hosts/lacros/id_ed25519.pub b/hosts/lacros/id_ed25519.pub deleted file mode 100644 index 84c223ca..00000000 --- a/hosts/lacros/id_ed25519.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBk6ALxn+zKrRys6/c1oYSoWJaUUEo3nAM224ElhjJQR jimbo@lacros diff --git a/hosts/lacros/system/boot/default.nix b/hosts/lacros/system/boot/default.nix deleted file mode 100644 index c3276717..00000000 --- a/hosts/lacros/system/boot/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: -{ - boot.initrd = { - systemd.enable = true; - luks.devices = { - crypt-mmc = { - device = "/dev/disk/by-uuid/5906e176-7ad3-41e5-bc45-ae65664eb10c"; - preLVM = true; - allowDiscards = true; - }; - }; - }; -} diff --git a/hosts/lacros/system/default.nix b/hosts/lacros/system/default.nix deleted file mode 100644 index 8ceb231f..00000000 --- a/hosts/lacros/system/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, ... }: -{ - imports = [ - ./hardware - ./boot - - # Apps and programs - ../../../modules/system - ../../../modules/system/accounts - ../../../modules/system/desktop - ../../../modules/system/programs - ../../../modules/system/services - - # Devices and hardware - ../../../modules/system/devices - ../../../modules/system/devices/boot/lanzaboote - ../../../modules/system/devices/networking/wireless - ../../../modules/system/devices/networking/firewall/pc - ../../../modules/system/devices/networking/wireguard/pc - - # Extras - ../../../overlays - ../../../variables - ]; - - networking.hostName = "lacros"; - networking.wireguard.interfaces."${config.ips.wgInt}".ips = [ "${config.ips.wgSpan}.18/24" ]; -} diff --git a/hosts/lacros/system/hardware/default.nix b/hosts/lacros/system/hardware/default.nix deleted file mode 100644 index 8b8c8891..00000000 --- a/hosts/lacros/system/hardware/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "sdhci_pci" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/e8c9c5a8-4df0-4100-8de6-f08a1a774fad"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; - - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/e8c9c5a8-4df0-4100-8de6-f08a1a774fad"; - fsType = "btrfs"; - options = [ "subvol=@nix" ]; - }; - - fileSystems."/var" = - { device = "/dev/disk/by-uuid/e8c9c5a8-4df0-4100-8de6-f08a1a774fad"; - fsType = "btrfs"; - options = [ "subvol=@var" ]; - }; - - fileSystems."/.snapshots" = - { device = "/dev/disk/by-uuid/e8c9c5a8-4df0-4100-8de6-f08a1a774fad"; - fsType = "btrfs"; - options = [ "subvol=@snapshots" ]; - }; - - fileSystems."/home" = - { device = "/dev/disk/by-uuid/e8c9c5a8-4df0-4100-8de6-f08a1a774fad"; - fsType = "btrfs"; - options = [ "subvol=@home" ]; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/1C76-1006"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/54a9cc22-4a2c-4e04-a968-313c34481489"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wg0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlan0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/modules/system/devices/boot/lanzaboote/default.nix b/modules/system/devices/boot/lanzaboote/default.nix index 9ba80ba1..7a622270 100644 --- a/modules/system/devices/boot/lanzaboote/default.nix +++ b/modules/system/devices/boot/lanzaboote/default.nix @@ -1,9 +1,5 @@ -{ lanzaboote, ... }: +{ ... }: { - imports = [ - lanzaboote.nixosModules.lanzaboote - ]; - boot.lanzaboote = { enable = true; pkiBundle = "/etc/secureboot"; diff --git a/variables/secrets/default.nix b/variables/secrets/default.nix new file mode 100644 index 00000000..38b50a76 Binary files /dev/null and b/variables/secrets/default.nix differ