diff options
| -rw-r--r-- | flake/nixosConfigurations/default.nix | 2 | ||||
| -rw-r--r-- | hosts/thinklappi.nix | 5 | ||||
| -rw-r--r-- | hosts/thinklappi/basesystem.nix | 109 | ||||
| -rw-r--r-- | hosts/thinklappi/default.nix | 19 |
4 files changed, 7 insertions, 128 deletions
diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix index e31513e..f7ffbc6 100644 --- a/flake/nixosConfigurations/default.nix +++ b/flake/nixosConfigurations/default.nix @@ -39,9 +39,11 @@ specialArgs = attrs // conf; modules = [ + (import ../../modules/nixos) (import ../../sys) (import ../../secrets) (import ./basesystem.nix) + (import ../../hosts/${hostname}.nix) {home-manager.extraSpecialArgs = attrs // conf;} ] ++ defaultModules; diff --git a/hosts/thinklappi.nix b/hosts/thinklappi.nix new file mode 100644 index 0000000..cc6172d --- /dev/null +++ b/hosts/thinklappi.nix @@ -0,0 +1,5 @@ +{...}: { + sils = { + plymouth.enable = true; + }; +} diff --git a/hosts/thinklappi/basesystem.nix b/hosts/thinklappi/basesystem.nix deleted file mode 100644 index b718c44..0000000 --- a/hosts/thinklappi/basesystem.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot = { - initrd = { - systemd.enable = true; - availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"]; - kernelModules = []; - luks.devices."cryptroot" = { - crypttabExtraOpts = ["fido2-device=auto"]; - device = "/dev/disk/by-uuid/6700d662-29a9-4ea5-8ca6-85d42550b3ab"; - }; - }; - kernelModules = ["kvm-intel"]; - extraModulePackages = []; - kernelPackages = pkgs.linuxPackages_latest; - lanzaboote = { - enable = true; - configurationLimit = 10; - pkiBundle = "/etc/secureboot"; - }; - resumeDevice = "/dev/disk/by-uuid/68da1329-f5ea-4f2c-a38e-faffaaaa6b5a"; - kernelParams = ["resume_offset=369403136"]; - }; - - fileSystems = { - "/" = { - device = "tmpfs"; - fsType = "tmpfs"; - options = ["defaults" "size=2G" "mode=755"]; - }; - "/tmp" = { - device = "tmpfs"; - fsType = "tmpfs"; - options = ["defaults" "size=5G" "mode=755"]; - }; - "/nix" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=nix" "compress-force=zstd"]; - }; - "/etc/NetworkManager" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=networkmanagerconfig" "compress-force=zstd"]; - }; - "/etc/secureboot" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=secureboot" "compress-force=zstd"]; - }; - "/etc/nixos" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=nixconfig" "compress-force=zstd"]; - }; - "/srv" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=srv" "compress-force=zstd"]; - neededForBoot = true; - }; - "/swap" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=swap" "noatime"]; - }; - "/home" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=home" "compress-force=zstd"]; - }; - "/srv/snapshots" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=snapshots" "compress-force=zstd"]; - }; - "/boot" = { - device = "/dev/disk/by-uuid/4064-2D6C"; - fsType = "vfat"; - }; - }; - - swapDevices = [ - { - device = "/swap/swapfile"; - } - ]; - - # 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.<interface>.useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/thinklappi/default.nix b/hosts/thinklappi/default.nix deleted file mode 100644 index 66fcd7d..0000000 --- a/hosts/thinklappi/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - pkgs, - ... -}: { - imports = [ - ./basesystem.nix - ../../sys - ../../secrets - ]; - - i18n.defaultLocale = "en_US.UTF-8"; - - networking.hostName = "thinklappi"; - - time.timeZone = "Europe/Berlin"; - - system.stateVersion = "23.05"; -} |