From 2033260b935d109acd32d55db773d8dd6c166629 Mon Sep 17 00:00:00 2001 From: fleaz Date: Sun, 6 Feb 2022 23:30:00 +0100 Subject: [PATCH] Reinstall jimbo --- machines/jimbo/configuration.nix | 6 +++-- machines/jimbo/hardware-configuration.nix | 31 +++++++++++------------ 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/machines/jimbo/configuration.nix b/machines/jimbo/configuration.nix index cfa811a..8dd8fb4 100644 --- a/machines/jimbo/configuration.nix +++ b/machines/jimbo/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: let home-manager = (import ./nix/sources.nix).home-manager; @@ -21,6 +21,7 @@ in { ../../users/fleaz.nix ]; + # Use the systemd-boot EFI boot loader. boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.efiSysMountPoint = "/boot/efi"; @@ -103,7 +104,8 @@ in { # services.xserver.libinput.enable = true; # List packages installed in system profile. To search, run: - environment.systemPackages = with pkgs; [ vim wget curl git + environment.systemPackages = with pkgs; [ + vim wget curl git ]; services.openssh.enable = true; diff --git a/machines/jimbo/hardware-configuration.nix b/machines/jimbo/hardware-configuration.nix index 9285a68..234eefb 100644 --- a/machines/jimbo/hardware-configuration.nix +++ b/machines/jimbo/hardware-configuration.nix @@ -4,33 +4,32 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = - [ "xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/5c29ff32-7186-4bfb-91ba-4bd14a72c7fa"; - fsType = "ext4"; - }; + fileSystems."/" = + { device = "/dev/disk/by-uuid/b9edb32f-fb40-4d59-8abe-b187c88667d6"; + fsType = "ext4"; + }; - boot.initrd.luks.devices."cryptroot".device = - "/dev/disk/by-uuid/55265801-0adc-4cde-9e88-a6c4a2a6c8c1"; + boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/e2d53876-3fdc-486a-a354-ec834b256e43"; - fileSystems."/boot/efi" = { - device = "/dev/disk/by-uuid/A809-ABDC"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = + { device = "/dev/disk/by-uuid/502E-A0DC"; + fsType = "vfat"; + }; swapDevices = [{ - device = "/dev/disk/by-partuuid/706747af-4066-461f-8eac-06339c68f0db"; + device = "/dev/disk/by-partuuid/c231f5ef-0f45-4e96-87e9-76ed935e8332"; randomEncryption = true; }]; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }