From d2769c314a18a181a21e16e2687defccf09e1d44 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Mon, 24 Feb 2025 21:02:14 -0500 Subject: [PATCH] Change external to ISO, the most likely way I'll use it --- flake.nix | 2 +- hosts/extern/boot/default.nix | 12 --- hosts/extern/default.nix | 20 ---- hosts/extern/disko/default.nix | 97 ------------------- hosts/extern/modules/default.nix | 7 -- hosts/extern/users/main/default.nix | 6 -- hosts/iso/default.nix | 21 ++++ hosts/{extern => iso}/filesystems/default.nix | 0 hosts/{extern => iso}/hardware/default.nix | 9 +- hosts/{extern => iso}/users/default.nix | 0 hosts/iso/users/main/default.nix | 10 ++ 11 files changed, 37 insertions(+), 147 deletions(-) delete mode 100644 hosts/extern/boot/default.nix delete mode 100644 hosts/extern/default.nix delete mode 100644 hosts/extern/disko/default.nix delete mode 100644 hosts/extern/modules/default.nix delete mode 100644 hosts/extern/users/main/default.nix create mode 100644 hosts/iso/default.nix rename hosts/{extern => iso}/filesystems/default.nix (100%) rename hosts/{extern => iso}/hardware/default.nix (51%) rename hosts/{extern => iso}/users/default.nix (100%) create mode 100644 hosts/iso/users/main/default.nix diff --git a/flake.nix b/flake.nix index c5033b6..33a2b6f 100644 --- a/flake.nix +++ b/flake.nix @@ -60,7 +60,7 @@ envy = mkNix [ ./hosts/envy ]; # HP Convertable lacros = mkNix [ ./hosts/lacros ]; # HP ChromeBook redmond = mkNix [ ./hosts/redmond ]; # Lenovo Dual-Boot - extern = mkNix [ ./hosts/extern ]; # External Drive/USB + iso = mkNix [ ./hosts/extern ]; # ISO File kitty = mkNix [ ./hosts/kitty ]; # Dell Optiplex 7010 midas = mkNix [ ./hosts/midas ]; # Dell Optiplex 5040 diff --git a/hosts/extern/boot/default.nix b/hosts/extern/boot/default.nix deleted file mode 100644 index 177034c..0000000 --- a/hosts/extern/boot/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, lib, ... }: -{ - boot = { - kernelPackages = pkgs.unstable.linuxPackages_latest; - blacklistedKernelModules = [ "pcspkr" ]; - }; - - # Kernel that won't explode the MacBook Air - specialisation.oldkernel.configuration.config = { - boot.kernelPackages = lib.mkForce pkgs.linuxPackages_5_10; - }; -} diff --git a/hosts/extern/default.nix b/hosts/extern/default.nix deleted file mode 100644 index afffadf..0000000 --- a/hosts/extern/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ ... }: -{ - imports = [ - ./boot - ./disko - ./filesystems - ./hardware - ./modules - ./users - ../../modules/system - ]; - - networking.enableB43Firmware = true; - - system.wireguard.client.enable = true; - networking.wireguard.interfaces.wgc.ips = [ "10.100.0.21/24" ]; - - system.stateVersion = "24.11"; - networking.hostName = "extern"; -} diff --git a/hosts/extern/disko/default.nix b/hosts/extern/disko/default.nix deleted file mode 100644 index aef6eca..0000000 --- a/hosts/extern/disko/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ disko, config, ... }: -{ - imports = [ disko.nixosModules.disko ]; - - disko.devices = { - disk = { - "${config.networking.hostName}" = { - type = "disk"; - device = "/dev/nvme0n1"; - content = { - type = "gpt"; - partitions = { - ESP = { - priority = 1; - size = "2G"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "umask=0077" ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "${config.networking.hostName}-disk"; - settings.allowDiscards = true; - passwordFile = "/tmp/secret.key"; - content = { - type = "lvm_pv"; - vg = "${config.networking.hostName}"; - }; - }; - }; - }; - }; - }; - }; - - lvm_vg = { - "${config.networking.hostName}" = { - type = "lvm_vg"; - lvs = { - root = { - size = "100%"; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/root" = { - mountpoint = "/"; - mountOptions = [ "compress=zstd" "noatime" "ssd" ]; - }; - "/prev" = { - mountpoint = "/prev"; - mountOptions = [ "compress=zstd" "noatime" "ssd" ]; - }; - "/nix" = { - mountpoint = "/nix"; - mountOptions = [ "compress=zstd" "noatime" "ssd" ]; - }; - - # Impermanence - "/persist" = { - mountpoint = "/persist"; - mountOptions = [ "compress=zstd" "noatime" "ssd" ]; - }; - "/persist/.snapshots" = { }; - - "/${config.sysusers.main}" = { - mountpoint = "/persist/home/${config.sysusers.main}"; - mountOptions = [ "compress=zstd" "noatime" "ssd" ]; - }; - "/${config.sysusers.main}/.snapshots" = { }; - }; - }; - }; - swap = { - size = "4G"; - content = { - type = "swap"; - discardPolicy = "both"; - }; - }; - }; - }; - }; - }; - - # Needed for impermanence - fileSystems = { - "/persist".neededForBoot = true; - "/persist/home/${config.sysusers.main}".neededForBoot = true; - }; -} diff --git a/hosts/extern/modules/default.nix b/hosts/extern/modules/default.nix deleted file mode 100644 index 468ad95..0000000 --- a/hosts/extern/modules/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ modulesPath, ... }: -{ - imports = [ - (modulesPath + "/profiles/all-hardware.nix") - #(modulesPath + "/profiles/qemu-guest.nix") - ]; -} diff --git a/hosts/extern/users/main/default.nix b/hosts/extern/users/main/default.nix deleted file mode 100644 index 55a283a..0000000 --- a/hosts/extern/users/main/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, ... }: -{ - home-manager.users.${config.sysusers.main} = { - home.stateVersion = "24.11"; - }; -} diff --git a/hosts/iso/default.nix b/hosts/iso/default.nix new file mode 100644 index 0000000..738fc65 --- /dev/null +++ b/hosts/iso/default.nix @@ -0,0 +1,21 @@ +{ ... }: +{ + imports = [ + ./filesystems + ./hardware + ./users + ../../modules/system + ]; + + networking = { + hostName = "extern"; + wireguard.interfaces.wgc.ips = [ "10.100.0.21/24" ]; + }; + + system = { + desktop.enable = true; + wireless.enable = true; + wireguard.client.enable = true; + stateVersion = "24.11"; + }; +} diff --git a/hosts/extern/filesystems/default.nix b/hosts/iso/filesystems/default.nix similarity index 100% rename from hosts/extern/filesystems/default.nix rename to hosts/iso/filesystems/default.nix diff --git a/hosts/extern/hardware/default.nix b/hosts/iso/hardware/default.nix similarity index 51% rename from hosts/extern/hardware/default.nix rename to hosts/iso/hardware/default.nix index b67f311..2b718c0 100644 --- a/hosts/extern/hardware/default.nix +++ b/hosts/iso/hardware/default.nix @@ -1,8 +1,9 @@ -# nixos-generate-config --root ./ --no-filesystems -{ config, lib, ... }: +{ config, lib, modulesPath, ... }: { - boot.initrd.availableKernelModules = [ "xhci_pci" "sr_mod" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; + imports = [ + (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix") + (modulesPath + "/installer/cd-dvd/channel.nix") + ]; networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/hosts/extern/users/default.nix b/hosts/iso/users/default.nix similarity index 100% rename from hosts/extern/users/default.nix rename to hosts/iso/users/default.nix diff --git a/hosts/iso/users/main/default.nix b/hosts/iso/users/main/default.nix new file mode 100644 index 0000000..d8b8d24 --- /dev/null +++ b/hosts/iso/users/main/default.nix @@ -0,0 +1,10 @@ +{ config, lib, ... }: +{ + home-manager.users."${config.sysusers.main}" = { + home = { + desktop.enable = true; + remote-desktop.enable = true; + stateVersion = lib.mkForce "24.11"; + }; + }; +}