diff --git a/config/apollo/default.nix b/config/apollo/default.nix index 6f095afe4e7fed79db874283978b6a5d605be93d..b98a74be7f29db0c3bb04c5a09a74c65de3e5122 100644 --- a/config/apollo/default.nix +++ b/config/apollo/default.nix @@ -1,6 +1,13 @@ -{config, pkgs, lib, inputs, modulesPath, flake, ...}: { - nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; + config, + pkgs, + lib, + inputs, + modulesPath, + flake, + ... +}: { + nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"]; imports = [ ./config.nix ../../pkgs/hardware/location/philadelphia @@ -15,34 +22,31 @@ networking.hostName = "apollo"; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" "v4l2loopback" ]; - boot.extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; + boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel" "v4l2loopback" "iptable_nat"]; + boot.extraModulePackages = with pkgs; [config.boot.kernelPackages.v4l2loopback.out]; # Setup keyfile boot.initrd.secrets = { "/crypto_keyfile.bin" = null; }; - fileSystems."/" = - { - device = "/dev/disk/by-uuid/641863a1-a7bf-4e95-bf1e-a7f15ac14440"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/641863a1-a7bf-4e95-bf1e-a7f15ac14440"; + fsType = "ext4"; + }; boot.initrd.luks.devices."luks-528409ee-b9ec-459c-a51e-431f68a0466c".device = "/dev/disk/by-uuid/528409ee-b9ec-459c-a51e-431f68a0466c"; - fileSystems."/boot/efi" = - { - device = "/dev/disk/by-uuid/C565-380B"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/C565-380B"; + fsType = "vfat"; + }; - swapDevices = - [ - { device = "/dev/disk/by-uuid/c65efc6d-eedb-4b47-9ccd-e3afe1c961bf"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/c65efc6d-eedb-4b47-9ccd-e3afe1c961bf";} + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; diff --git a/config/aynghazal/default.nix b/config/aynghazal/default.nix index 6832cb6f1828995bb781f6d442c220cefbc04438..20ee264a788daf20db3d9791913bdcf9e323192f 100644 --- a/config/aynghazal/default.nix +++ b/config/aynghazal/default.nix @@ -1,6 +1,13 @@ -{config, pkgs, lib, inputs, modulesPath, flake, ...}: { - nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; + config, + pkgs, + lib, + inputs, + modulesPath, + flake, + ... +}: { + nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"]; imports = [ ./config.nix ../../pkgs/hardware/location/germany @@ -26,30 +33,26 @@ }; }; - fileSystems."/" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; + fileSystems."/" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=root"]; + }; - fileSystems."/home" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; + fileSystems."/home" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=home"]; + }; - fileSystems."/boot/efi" = - { - device = "/dev/disk/by-uuid/4667-06C9"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/4667-06C9"; + fsType = "vfat"; + }; - swapDevices = - [ - { device = "/dev/mapper/vg_main-swap"; } - ]; + swapDevices = [ + {device = "/dev/mapper/vg_main-swap";} + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; @@ -58,7 +61,7 @@ # For secure boot boot = { - kernelModules = [ "kvm-amd" ]; + kernelModules = ["kvm-amd" "iptable_nat"]; #extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; #kernelParams = [ "nomodeset" ]; #kernelParams = [ "amdgpu.sg_display=0" ]; @@ -73,15 +76,15 @@ }; initrd = { - availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc" "usbhid" "usb_storage" ]; - kernelModules = [ "dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ]; + availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc" "usbhid" "usb_storage"]; + kernelModules = ["dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid"]; secrets = { "/crypto_keyfile.bin" = null; }; - luks = { + luks = { # Support for Yubikey PBA yubikeySupport = true; - + devices."pv_main" = { device = "/dev/disk/by-uuid/5c0270e0-dc0e-4500-b347-6a986e40a95f"; # nvme0n1p2 preLVM = true; # You may want to set this to false if you need to start a network service first @@ -100,7 +103,7 @@ }; }; }; - }; + }; }; #fixes secondary screen turning off when lid shut diff --git a/config/deepblue/default.nix b/config/deepblue/default.nix index f16b270e831fe3a7aad3f5319f01da84243ce7c1..aa0787a32c98a32426710c88773c18b87ff17141 100644 --- a/config/deepblue/default.nix +++ b/config/deepblue/default.nix @@ -1,6 +1,13 @@ -{config, pkgs, lib, inputs, modulesPath, flake, ...}: { - nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; + config, + pkgs, + lib, + inputs, + modulesPath, + flake, + ... +}: { + nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"]; imports = [ ./config.nix ../../pkgs/hardware/location/indonesia @@ -13,30 +20,26 @@ networking.hostName = "deepblue"; - fileSystems."/" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; + fileSystems."/" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=root"]; + }; - fileSystems."/home" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; + fileSystems."/home" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=home"]; + }; - fileSystems."/boot/efi" = - { - device = "/dev/disk/by-uuid/86D8-1C0B"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/86D8-1C0B"; + fsType = "vfat"; + }; - swapDevices = - [ - { device = "/dev/mapper/vg_main-swap"; } - ]; + swapDevices = [ + {device = "/dev/mapper/vg_main-swap";} + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; @@ -45,7 +48,7 @@ # For secure boot boot = { - kernelModules = [ "kvm-amd" ]; + kernelModules = ["kvm-amd" "iptable_nat"]; #extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; #kernelParams = [ "nomodeset" ]; #kernelParams = [ "amdgpu.sg_display=0" ]; @@ -58,15 +61,15 @@ }; initrd = { - availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc" "usbhid" "usb_storage" "sdhci_pci" ]; - kernelModules = [ "dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ]; + availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc" "usbhid" "usb_storage" "sdhci_pci"]; + kernelModules = ["dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid"]; secrets = { "/crypto_keyfile.bin" = null; }; - luks = { + luks = { # Support for Yubikey PBA yubikeySupport = true; - + devices."pv_main" = { device = "/dev/disk/by-uuid/5f61ab21-87c6-49d3-8a63-521b557f1f32"; # nvme0n1p2 preLVM = true; # You may want to set this to false if you need to start a network service first @@ -85,7 +88,6 @@ }; }; }; - }; + }; }; - } diff --git a/config/envy/default.nix b/config/envy/default.nix index 5f7597c5ff90b59b8cdf04bcbbff076a49a90afa..eec6e64d3ea69d0bfe94847f8caff6e34ed3be76 100644 --- a/config/envy/default.nix +++ b/config/envy/default.nix @@ -1,42 +1,48 @@ -{ config, pkgs, lib, inputs, modulesPath, flake, ... }: { - nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; - imports = - [ - ./config.nix - ../../pkgs/hardware/location/philadelphia - ../../pkgs/hardware/locale/en_us - ../../pkgs/hardware/common - ../../pkgs/hardware/common/desktop - #../../pkgs/hardware/common/amdgpu_proprietary - ]; + config, + pkgs, + lib, + inputs, + modulesPath, + flake, + ... +}: { + nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"]; + imports = [ + ./config.nix + ../../pkgs/hardware/location/philadelphia + ../../pkgs/hardware/locale/en_us + ../../pkgs/hardware/common + ../../pkgs/hardware/common/desktop + #../../pkgs/hardware/common/amdgpu_proprietary + ]; networking.hostName = "envy"; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" "v4l2loopback" ]; - boot.extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; + boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-amd" "v4l2loopback" "iptable_nat"]; + boot.extraModulePackages = with pkgs; [config.boot.kernelPackages.v4l2loopback.out]; # Setup keyfile boot.initrd.secrets = { "/crypto_keyfile.bin" = null; }; - fileSystems."/" = - { device = "/dev/disk/by-uuid/95ce58ab-1139-46cb-a458-ce64486b0862"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/95ce58ab-1139-46cb-a458-ce64486b0862"; + fsType = "btrfs"; + options = ["subvol=@"]; + }; boot.initrd.luks.devices."luks-b5823077-8599-4f26-ad83-d3c57a7b0c50".device = "/dev/disk/by-uuid/b5823077-8599-4f26-ad83-d3c57a7b0c50"; - fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/4B04-EAA6"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/4B04-EAA6"; + fsType = "vfat"; + }; - swapDevices = [ ]; + swapDevices = []; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/config/firecracker/default.nix b/config/firecracker/default.nix index 4ad17e7a5ca76ce7a8bed95af1e73241bd1144c8..07c0238751cd09bbeb3fa498d83743594f1fb49c 100644 --- a/config/firecracker/default.nix +++ b/config/firecracker/default.nix @@ -62,7 +62,7 @@ # For secure boot boot = { - kernelModules = ["kvm-amd"]; + kernelModules = ["kvm-amd" "iptable_nat"]; #extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; #kernelParams = [ "nomodeset" ]; #kernelParams = [ "amdgpu.sg_display=0" ]; diff --git a/config/hermes/default.nix b/config/hermes/default.nix index 16cb04309448f058c45f7f2fce2a483f78eab976..1ca3a4ab097edbf16e09c4d3bb75d487e2b1725c 100644 --- a/config/hermes/default.nix +++ b/config/hermes/default.nix @@ -1,41 +1,46 @@ -{ config, pkgs, lib, inputs, modulesPath, flake, ... }: - { - nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; - imports = - [ - ./config.nix - ../../pkgs/hardware/location/philadelphia - ../../pkgs/hardware/locale/en_us - ../../pkgs/hardware/common - ../../pkgs/hardware/common/laptop - ]; + config, + pkgs, + lib, + inputs, + modulesPath, + flake, + ... +}: { + nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"]; + imports = [ + ./config.nix + ../../pkgs/hardware/location/philadelphia + ../../pkgs/hardware/locale/en_us + ../../pkgs/hardware/common + ../../pkgs/hardware/common/laptop + ]; networking.hostName = "hermes"; - boot.kernelModules = [ "kvm-intel" "v4l2loopback" ]; - boot.extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; + boot.kernelModules = ["kvm-intel" "v4l2loopback" "iptable_nat"]; + boot.extraModulePackages = with pkgs; [config.boot.kernelPackages.v4l2loopback.out]; - fileSystems."/" = - { device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; + fileSystems."/" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=root"]; + }; - fileSystems."/home" = - { device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; + fileSystems."/home" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=home"]; + }; - fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/4CAA-0DA3"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/4CAA-0DA3"; + fsType = "vfat"; + }; - swapDevices = - [ { device = "/dev/mapper/vg_main-swap"; } - ]; + swapDevices = [ + {device = "/dev/mapper/vg_main-swap";} + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; @@ -43,10 +48,9 @@ system.stateVersion = "23.05"; boot.initrd = { - availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" ]; + availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod"]; # Required to open the EFI partition and Yubikey - kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" "dm-snapshot" ]; - + kernelModules = ["vfat" "nls_cp437" "nls_iso8859-1" "usbhid" "dm-snapshot"]; luks = { # Support for Yubikey PBA diff --git a/config/igman/default.nix b/config/igman/default.nix index f4547e5071f7865557bc0ea8b50cb853cc489334..9302a0a5316347b9a7bee10ee40af22158edecbe 100644 --- a/config/igman/default.nix +++ b/config/igman/default.nix @@ -1,6 +1,13 @@ -{config, pkgs, lib, inputs, modulesPath, flake, ...}: { - nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; + config, + pkgs, + lib, + inputs, + modulesPath, + flake, + ... +}: { + nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"]; imports = [ ./config.nix ./sway.nix @@ -28,30 +35,26 @@ }; }; - fileSystems."/" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; + fileSystems."/" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=root"]; + }; - fileSystems."/home" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; + fileSystems."/home" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=home"]; + }; - fileSystems."/boot/efi" = - { - device = "/dev/disk/by-uuid/7BA5-715B"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/7BA5-715B"; + fsType = "vfat"; + }; - swapDevices = - [ - { device = "/dev/mapper/vg_main-swap"; } - ]; + swapDevices = [ + {device = "/dev/mapper/vg_main-swap";} + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; @@ -60,7 +63,7 @@ # For secure boot boot = { - kernelModules = [ "kvm-amd" ]; + kernelModules = ["kvm-amd" "iptable_nat"]; #extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; #kernelParams = [ "nomodeset" ]; #kernelParams = [ "amdgpu.sg_display=0" ]; @@ -75,15 +78,15 @@ }; initrd = { - availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc" "usbhid" "usb_storage" ]; - kernelModules = [ "dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ]; + availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc" "usbhid" "usb_storage"]; + kernelModules = ["dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid"]; secrets = { "/crypto_keyfile.bin" = null; }; - luks = { + luks = { # Support for Yubikey PBA yubikeySupport = true; - + devices."pv_main" = { device = "/dev/disk/by-uuid/01a4fe4c-e8f6-46fe-82ac-8d84f57b18c3"; # nvme0n1p2 preLVM = true; # You may want to set this to false if you need to start a network service first @@ -102,7 +105,7 @@ }; }; }; - }; + }; }; #fixes secondary screen turning off when lid shut @@ -115,5 +118,4 @@ # LidSwitchIgnoreInhibited=yes #''; #services.upower.ignoreLid = true; - } diff --git a/config/kyle-cleverlaptop/default.nix b/config/kyle-cleverlaptop/default.nix index 839d6f85ea7c60b88a3154360ae7532772bff8d2..521388da59346304c9da62368c3630d7d6d90ed3 100644 --- a/config/kyle-cleverlaptop/default.nix +++ b/config/kyle-cleverlaptop/default.nix @@ -1,6 +1,13 @@ -{config, pkgs, lib, inputs, modulesPath, flake, ...}: { - nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; + config, + pkgs, + lib, + inputs, + modulesPath, + flake, + ... +}: { + nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"]; imports = [ ./config.nix ../../pkgs/hardware/location/ohio @@ -26,30 +33,26 @@ }; }; - fileSystems."/" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; + fileSystems."/" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=root"]; + }; - fileSystems."/home" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; + fileSystems."/home" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=home"]; + }; - fileSystems."/boot/efi" = - { - device = "/dev/disk/by-uuid/38B0-FDF8"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/38B0-FDF8"; + fsType = "vfat"; + }; - swapDevices = - [ - { device = "/dev/mapper/vg_main-swap"; } - ]; + swapDevices = [ + {device = "/dev/mapper/vg_main-swap";} + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; @@ -58,7 +61,7 @@ # For secure boot boot = { - kernelModules = [ "kvm-amd" ]; + kernelModules = ["kvm-amd" "iptable_nat"]; #extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; #kernelParams = [ "nomodeset" ]; #kernelParams = [ "amdgpu.sg_display=0" ]; @@ -73,15 +76,15 @@ }; initrd = { - availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc" "usbhid" "usb_storage" ]; - kernelModules = [ "dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ]; + availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc" "usbhid" "usb_storage"]; + kernelModules = ["dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid"]; secrets = { "/crypto_keyfile.bin" = null; }; - luks = { + luks = { # Support for Yubikey PBA yubikeySupport = true; - + devices."pv_main" = { device = "/dev/disk/by-uuid/8453673b-496b-4a84-94fd-3757216d165e"; # nvme0n1p2 preLVM = true; # You may want to set this to false if you need to start a network service first @@ -100,7 +103,7 @@ }; }; }; - }; + }; }; #fixes secondary screen turning off when lid shut diff --git a/config/neoteric/default.nix b/config/neoteric/default.nix index 6397d85249c59bd37abdd60db0ebc1e51474cfb3..f52bc6e5aed612a64580f5c5898a36515eee860b 100644 --- a/config/neoteric/default.nix +++ b/config/neoteric/default.nix @@ -1,6 +1,13 @@ -{config, pkgs, lib, inputs, modulesPath, flake, ...}: { - nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; + config, + pkgs, + lib, + inputs, + modulesPath, + flake, + ... +}: { + nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"]; imports = [ ./config.nix ../../pkgs/hardware/location/philadelphia @@ -15,30 +22,26 @@ networking.hostName = "neoteric"; - fileSystems."/" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; + fileSystems."/" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=root"]; + }; - fileSystems."/home" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; + fileSystems."/home" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=home"]; + }; - fileSystems."/boot/efi" = - { - device = "/dev/disk/by-uuid/509A-6D78"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/509A-6D78"; + fsType = "vfat"; + }; - swapDevices = - [ - { device = "/dev/mapper/vg_main-swap"; } - ]; + swapDevices = [ + {device = "/dev/mapper/vg_main-swap";} + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; @@ -47,8 +50,8 @@ # For secure boot boot = { - kernelModules = [ "kvm-amd" "v4l2loopback" ]; - extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; + kernelModules = ["kvm-amd" "v4l2loopback" "iptable_nat"]; + extraModulePackages = with pkgs; [config.boot.kernelPackages.v4l2loopback.out]; #kernelParams = [ "nomodeset" ]; #kernelParams = [ "amdgpu.sg_display=0" ]; @@ -60,15 +63,15 @@ }; initrd = { - availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc" "usbhid" "usb_storage" ]; - kernelModules = [ "dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" "amdgpu" ]; + availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc" "usbhid" "usb_storage"]; + kernelModules = ["dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" "amdgpu"]; secrets = { "/crypto_keyfile.bin" = null; }; - luks = { + luks = { # Support for Yubikey PBA yubikeySupport = true; - + devices."pv_main" = { device = "/dev/disk/by-uuid/d4100943-c355-4e4a-9d7a-bea1ef7afee8"; # nvme0n1p2 preLVM = true; # You may want to set this to false if you need to start a network service first @@ -87,7 +90,6 @@ }; }; }; - }; + }; }; - } diff --git a/config/phoenix/default.nix b/config/phoenix/default.nix index da2014515994942e07b2aa4efa05f8576ee70fc7..5fd6102efe2a1724a4637d2dd220ba332708cab0 100644 --- a/config/phoenix/default.nix +++ b/config/phoenix/default.nix @@ -1,42 +1,47 @@ -{ config, pkgs, lib, inputs, modulesPath, flake, ... }: - { - nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; - imports = - [ - ./config.nix - ../../pkgs/hardware/location/philadelphia - ../../pkgs/hardware/locale/en_us - ../../pkgs/hardware/common - ../../pkgs/hardware/common/desktop - ]; + config, + pkgs, + lib, + inputs, + modulesPath, + flake, + ... +}: { + nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"]; + imports = [ + ./config.nix + ../../pkgs/hardware/location/philadelphia + ../../pkgs/hardware/locale/en_us + ../../pkgs/hardware/common + ../../pkgs/hardware/common/desktop + ]; networking.hostName = "phoenix"; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" "v4l2loopback" ]; - boot.extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel" "v4l2loopback" "iptable_nat"]; + boot.extraModulePackages = with pkgs; [config.boot.kernelPackages.v4l2loopback.out]; # Setup keyfile boot.initrd.secrets = { "/crypto_keyfile.bin" = null; }; - fileSystems."/" = - { device = "/dev/disk/by-uuid/ff289406-033c-4393-817c-3a4784f181f6"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/ff289406-033c-4393-817c-3a4784f181f6"; + fsType = "btrfs"; + options = ["subvol=@"]; + }; boot.initrd.luks.devices."luks-c40b9a7f-e11d-4430-85c7-a35f2a0636a3".device = "/dev/disk/by-uuid/c40b9a7f-e11d-4430-85c7-a35f2a0636a3"; - fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/8FF9-ACEA"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/8FF9-ACEA"; + fsType = "vfat"; + }; - swapDevices = [ ]; + swapDevices = []; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/config/silversin/default.nix b/config/silversin/default.nix index 5864349322afb0352ce7e1fffadf59fa7c8151f8..47894470e7076bf15edf0a864151362bcb3a6b61 100644 --- a/config/silversin/default.nix +++ b/config/silversin/default.nix @@ -1,46 +1,51 @@ -{ config, pkgs, lib, inputs, modulesPath, flake, ... }: - { - nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; - imports = - [ - ./config.nix - ../../pkgs/hardware/location/philadelphia - ../../pkgs/hardware/locale/en_us - ../../pkgs/hardware/common - ../../pkgs/hardware/common/laptop - ]; + config, + pkgs, + lib, + inputs, + modulesPath, + flake, + ... +}: { + nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"]; + imports = [ + ./config.nix + ../../pkgs/hardware/location/philadelphia + ../../pkgs/hardware/locale/en_us + ../../pkgs/hardware/common + ../../pkgs/hardware/common/laptop + ]; networking.hostName = "silversin"; - boot.kernelModules = [ "kvm-intel" "v4l2loopback" ]; - boot.extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; + boot.kernelModules = ["kvm-intel" "v4l2loopback" "iptable_nat"]; + boot.extraModulePackages = with pkgs; [config.boot.kernelPackages.v4l2loopback.out]; # Setup keyfile boot.initrd.secrets = { "/crypto_keyfile.bin" = null; }; - fileSystems."/" = - { device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; + fileSystems."/" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=root"]; + }; - fileSystems."/home" = - { device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; + fileSystems."/home" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=home"]; + }; - fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/CCC2-5AFE"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/CCC2-5AFE"; + fsType = "vfat"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/cf0e3eb9-f7c4-426a-a8cf-66e7d4867def"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/cf0e3eb9-f7c4-426a-a8cf-66e7d4867def";} + ]; # 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 @@ -53,9 +58,9 @@ hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; boot.initrd = { - availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod" ]; + availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "usbhid" "sd_mod"]; # Required to open the EFI partition and Yubikey - kernelModules = [ "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" "dm-snapshot" ]; + kernelModules = ["vfat" "nls_cp437" "nls_iso8859-1" "usbhid" "dm-snapshot"]; luks = { # Support for Yubikey PBA diff --git a/config/toubkal/default.nix b/config/toubkal/default.nix index 17b54444975db972aa71d8b4d2a8797561c8221d..1b47572ce7e927dece370b1c6d6018f45a5e9054 100644 --- a/config/toubkal/default.nix +++ b/config/toubkal/default.nix @@ -1,6 +1,13 @@ -{config, pkgs, lib, inputs, modulesPath, flake, ...}: { - nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; + config, + pkgs, + lib, + inputs, + modulesPath, + flake, + ... +}: { + nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"]; imports = [ ./config.nix ../../pkgs/hardware/location/morocco @@ -26,30 +33,26 @@ }; }; - fileSystems."/" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; + fileSystems."/" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=root"]; + }; - fileSystems."/home" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; + fileSystems."/home" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=home"]; + }; - fileSystems."/boot/efi" = - { - device = "/dev/disk/by-uuid/6418-246B"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/6418-246B"; + fsType = "vfat"; + }; - swapDevices = - [ - { device = "/dev/mapper/vg_main-swap"; } - ]; + swapDevices = [ + {device = "/dev/mapper/vg_main-swap";} + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; @@ -58,7 +61,7 @@ # For secure boot boot = { - kernelModules = [ "kvm-amd" ]; + kernelModules = ["kvm-amd" "iptable_nat"]; #extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; #kernelParams = [ "nomodeset" ]; #kernelParams = [ "amdgpu.sg_display=0" ]; @@ -73,15 +76,15 @@ }; initrd = { - availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc" "usbhid" "usb_storage" ]; - kernelModules = [ "dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ]; + availableKernelModules = ["xhci_pci" "thunderbolt" "vmd" "nvme" "uas" "sd_mod" "rtsx_usb_sdmmc" "usbhid" "usb_storage"]; + kernelModules = ["dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid"]; secrets = { "/crypto_keyfile.bin" = null; }; - luks = { + luks = { # Support for Yubikey PBA yubikeySupport = true; - + devices."pv_main" = { device = "/dev/disk/by-uuid/c08e93e1-24c5-4a14-a76b-9d39ab0e6ece"; # nvme0n1p2 preLVM = true; # You may want to set this to false if you need to start a network service first @@ -100,7 +103,7 @@ }; }; }; - }; + }; }; #fixes secondary screen turning off when lid shut @@ -113,5 +116,4 @@ # LidSwitchIgnoreInhibited=yes #''; #services.upower.ignoreLid = true; - } diff --git a/config/vorlon/default.nix b/config/vorlon/default.nix index 658f5740fc0b8966a6d6306cc1feb21746dd2405..5b443ad30bfafcd14b76c989de32870c0fc9334f 100644 --- a/config/vorlon/default.nix +++ b/config/vorlon/default.nix @@ -1,6 +1,14 @@ -{config, pkgs, lib, inputs, modulesPath, flake, nixos-hardware, ...}: { - nixpkgs.config.permittedInsecurePackages = [ "olm-3.2.16" ]; + config, + pkgs, + lib, + inputs, + modulesPath, + flake, + nixos-hardware, + ... +}: { + nixpkgs.config.permittedInsecurePackages = ["olm-3.2.16"]; imports = [ ./config.nix @@ -13,31 +21,27 @@ ]; networking.hostName = "vorlon"; - - fileSystems."/" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=root" ]; - }; - fileSystems."/home" = - { - device = "/dev/mapper/vg_main-root"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; + fileSystems."/" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=root"]; + }; - fileSystems."/boot/efi" = - { - device = "/dev/disk/by-uuid/56BF-B52D"; - fsType = "vfat"; - }; + fileSystems."/home" = { + device = "/dev/mapper/vg_main-root"; + fsType = "btrfs"; + options = ["subvol=home"]; + }; - swapDevices = - [ - { device = "/dev/mapper/vg_main-swap"; } - ]; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/56BF-B52D"; + fsType = "vfat"; + }; + + swapDevices = [ + {device = "/dev/mapper/vg_main-swap";} + ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; @@ -46,7 +50,7 @@ # For secure boot boot = { - kernelModules = [ "kvm-amd" ]; + kernelModules = ["kvm-amd" "iptable_nat"]; #extraModulePackages = with pkgs; [ config.boot.kernelPackages.v4l2loopback.out ]; #kernelParams = [ "nomodeset" ]; #kernelParams = [ "amdgpu.sg_display=0" ]; @@ -59,15 +63,15 @@ }; initrd = { - availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "sd_mod" "usbhid" "usb_storage" ]; - kernelModules = [ "dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid" ]; + availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "sd_mod" "usbhid" "usb_storage"]; + kernelModules = ["dm-snapshot" "vfat" "nls_cp437" "nls_iso8859-1" "usbhid"]; secrets = { "/crypto_keyfile.bin" = null; }; - luks = { + luks = { # Support for Yubikey PBA yubikeySupport = true; - + devices."pv_main" = { device = "/dev/disk/by-uuid/63b9fac6-1773-404a-8c2a-9d3c109259b8"; # nvme0n1p2 preLVM = true; # You may want to set this to false if you need to start a network service first @@ -86,7 +90,6 @@ }; }; }; - }; + }; }; - } diff --git a/flake.lock b/flake.lock index 18d2e9c41ac4afd1eef1c5f1bbc517cadd13d9e1..3255c8a634f59193b0b9a6ecef07ccbd86ca2cbd 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ "coc-rust-analyzer": { "flake": false, "locked": { - "lastModified": 1738732870, - "narHash": "sha256-28XximhLiJD2dilgSwOIS+FNBzfw0BMvIoDFw8fMVPE=", + "lastModified": 1739262181, + "narHash": "sha256-75O0+8JB+UycqYuhDIEtZYDqwqzYAajIltTICfy+dmc=", "owner": "fannheyward", "repo": "coc-rust-analyzer", - "rev": "75a86269edd754cef2901a42e0d0bfcab1be5118", + "rev": "eb1f785d748ed52fb76b799e4c7676181cbdd91c", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1739007688, - "narHash": "sha256-vtSZo/L0J/VqrCzNUcdsQ1GNRFlINKJnX90KyyrjPCU=", + "lastModified": 1739294132, + "narHash": "sha256-TG0f3kbydzLERVmcRTzeWdo6oKOGOTPUZDfVrKvSjdc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5b1779b13077a122dba393d0b0c148a0e5bf16f6", + "rev": "096d802c6545f32eb718483ef66ae8013abf9a36", "type": "github" }, "original": { @@ -886,11 +886,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1737630279, + "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", "type": "github" }, "original": { @@ -1181,11 +1181,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738843498, - "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", + "lastModified": 1739055578, + "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", + "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", "type": "github" }, "original": { @@ -1213,11 +1213,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738961098, - "narHash": "sha256-yWNBf6VDW38tl179FEuJ0qukthVfB02kv+mRsfUsWC0=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3eaf5e8eca7cab680b964138fb79073704aca75", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -1292,11 +1292,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1739021622, - "narHash": "sha256-uiXBGkhA9nQFJHhWyhgp3NXRWqisUnJFO3/pa27Qe7E=", + "lastModified": 1739302810, + "narHash": "sha256-ik9mrnvytRdKxBOBP35YwpnepctlY5pyeApWHV+IBVk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fb4bbf7e6349850728cb519015f55ec5a0a481f9", + "rev": "c708711a1ce48b204e6de019d6bc2b59c7dafe91", "type": "github" }, "original": { @@ -1470,11 +1470,11 @@ ] }, "locked": { - "lastModified": 1738291974, - "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=", + "lastModified": 1739262228, + "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", "owner": "mic92", "repo": "sops-nix", - "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7", + "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", "type": "github" }, "original": { @@ -1503,11 +1503,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1739024984, - "narHash": "sha256-CI0pJwL5EJJHBh5GiMTwLmYvyfl3Yl8QZxteCwtJdcg=", + "lastModified": 1739215427, + "narHash": "sha256-1yIsiPwwxXal7+wkWogjPhsM5BjRlK61lAHQtlX8s04=", "owner": "danth", "repo": "stylix", - "rev": "87791e0665bd345127b7f35aca6e9195e74ef39c", + "rev": "4af2686c1c62176d0ce28c4d55e813ae5ed52b6f", "type": "github" }, "original": { @@ -1754,11 +1754,11 @@ "zk-nvim": { "flake": false, "locked": { - "lastModified": 1736003937, - "narHash": "sha256-i9UOny7vq3O+g0TnL1wwTGnw18g79CyZvOM0kGptt64=", + "lastModified": 1739122015, + "narHash": "sha256-DTpAe3ZgqFPGjUVjhPIl0w4MzjsOWA6Mac7vBPg7nr0=", "owner": "mickael-menu", "repo": "zk-nvim", - "rev": "10089c398df925b8db51fd659501d2cb044003b9", + "rev": "d113beebac48bf7ad7ce9fdb7f2ce43c90959677", "type": "github" }, "original": {