From 44a2ce6475bcbac549a4ec5457549af1fae05d1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 11 Apr 2021 12:15:39 +0100 Subject: [PATCH] reinstall skinny --- nixos/boxes/skinnyv/default.nix | 2 + .../boxes/skinnyv/hardware-configuration.nix | 48 +++++++------------ 2 files changed, 19 insertions(+), 31 deletions(-) diff --git a/nixos/boxes/skinnyv/default.nix b/nixos/boxes/skinnyv/default.nix index 5dee9b03..5f6f6000 100644 --- a/nixos/boxes/skinnyv/default.nix +++ b/nixos/boxes/skinnyv/default.nix @@ -17,6 +17,8 @@ ]; boot.kernelPackages = pkgs.linuxPackages_latest_hardened; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; time.timeZone = "Europe/London"; fonts.fontconfig.enable = true; diff --git a/nixos/boxes/skinnyv/hardware-configuration.nix b/nixos/boxes/skinnyv/hardware-configuration.nix index 246e3ba0..d0136636 100644 --- a/nixos/boxes/skinnyv/hardware-configuration.nix +++ b/nixos/boxes/skinnyv/hardware-configuration.nix @@ -1,45 +1,31 @@ # 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, ... }: +{ config, lib, pkgs, modulesPath, ... }: { imports = - [ - ]; + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ "dm-snapshot" ]; + boot.initrd.kernelModules = [ ]; 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/9dba116f-c9fe-403a-a8e2-f9fdab23f1f1"; + fsType = "btrfs"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/3246-8612"; - fsType = "vfat"; - }; + boot.initrd.luks.devices."crypt".device = "/dev/disk/by-uuid/0c192a18-178f-4598-a1ed-5295ef2abdc4"; - swapDevices = - [ { device = "/dev/disk/by-uuid/e2b3e3b9-aa1f-47dc-8585-f8e035590c41"; } - ]; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/0A6A-AAFC"; + fsType = "vfat"; + }; - nix.maxJobs = lib.mkDefault 4; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - } + swapDevices = [ ]; + + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; +}