diff --git a/nixos/boxes/skinnyv/default.nix b/nixos/boxes/skinnyv/default.nix index 05495bd5..ac0f2551 100644 --- a/nixos/boxes/skinnyv/default.nix +++ b/nixos/boxes/skinnyv/default.nix @@ -15,35 +15,20 @@ ../../git ]; - boot = { - kernelPackages = pkgs.linuxPackages_latest; - initrd.luks.devices = { - root = - { - device = "/dev/disk/by-uuid/ef6e91d9-c477-4ab7-ae39-4a0ee413cebe"; - preLVM = true; - allowDiscards = true; - }; - }; - loader.grub = { - device = "nodev"; - efiSupport = true; - }; - loader.efi.canTouchEfiVariables = true; - }; - time.timeZone = "Europe/London"; + boot.kernelPackages = pkgs.linuxPackages_latest_hardened; + time.timeZone = "Europe/London"; - fonts.fontconfig.enable = true; - home-manager.users.cyryl = {...}: { - imports = [ - ../../home-manager - ]; - home.stateVersion = config.system.stateVersion; + fonts.fontconfig.enable = true; + home-manager.users.cyryl = {...}: { + imports = [ + ../../home-manager + ]; + home.stateVersion = config.system.stateVersion; - nixpkgs.overlays = config.nixpkgs.overlays; - nixpkgs.config = config.nixpkgs.config; + nixpkgs.overlays = config.nixpkgs.overlays; + nixpkgs.config = config.nixpkgs.config; - home.file.".config/i3/status.toml".source = ../../../.config/i3/status-single-bat.toml; - }; + home.file.".config/i3/status.toml".source = ../../../.config/i3/status-single-bat.toml; + }; - } +} diff --git a/nixos/boxes/skinnyv/hardware-configuration.nix b/nixos/boxes/skinnyv/hardware-configuration.nix index ce6aac18..246e3ba0 100644 --- a/nixos/boxes/skinnyv/hardware-configuration.nix +++ b/nixos/boxes/skinnyv/hardware-configuration.nix @@ -6,27 +6,40 @@ { imports = [ - ]; + ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + boot.initrd.luks.devices = { + root = + { + device = "/dev/disk/by-uuid/ef6e91d9-c477-4ab7-ae39-4a0ee413cebe"; + preLVM = true; + allowDiscards = true; + }; + }; + boot.loader.grub = { + device = "nodev"; + efiSupport = true; + }; + boot.loader.efi.canTouchEfiVariables = true; - fileSystems."/" = - { device = "/dev/disk/by-uuid/0c1df18e-df45-4290-8887-6529d00ccb9d"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/0c1df18e-df45-4290-8887-6529d00ccb9d"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/3246-8612"; - fsType = "vfat"; - }; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/3246-8612"; + fsType = "vfat"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/e2b3e3b9-aa1f-47dc-8585-f8e035590c41"; } - ]; + swapDevices = + [ { device = "/dev/disk/by-uuid/e2b3e3b9-aa1f-47dc-8585-f8e035590c41"; } + ]; - nix.maxJobs = lib.mkDefault 4; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; -} + nix.maxJobs = lib.mkDefault 4; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + }