From 3634c8b3be2375999bb8065b5d96129a8afa653d Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Thu, 5 Dec 2024 09:55:52 +0000 Subject: [PATCH] Add eirene windows partition Signed-off-by: Nikolaos Karaolidis --- hosts/eirene/default.nix | 51 ++++++++++++++++++------- hosts/eirene/hardware-configuration.nix | 15 -------- 2 files changed, 37 insertions(+), 29 deletions(-) delete mode 100644 hosts/eirene/hardware-configuration.nix diff --git a/hosts/eirene/default.nix b/hosts/eirene/default.nix index 2db844c..49a16b7 100644 --- a/hosts/eirene/default.nix +++ b/hosts/eirene/default.nix @@ -9,7 +9,6 @@ ../../lib inputs.disko.nixosModules.disko (import ./format.nix { device = "/dev/disk/by-id/nvme-SAMSUNG_MZVL22T0HBLB-00BL2_S64RNE0R602762"; }) - ./hardware-configuration.nix ../common/system/configs/bluetooth ../common/system/configs/boot ../common/system/configs/brightnessctl @@ -88,6 +87,43 @@ }; }; + boot = { + kernelParams = [ + "amd_pstate=active" + "video=eDP-1:2560x1600@165" + ]; + + kernelModules = [ "kvm-amd" ]; + + initrd.kernelModules = [ + "nvme" + "ahci" + "usbhid" + "amdgpu" + ]; + }; + + nixpkgs = { + hostPlatform = "x86_64-linux"; + + config = { + cudaSupport = true; + rocmSupport = true; + }; + }; + + fileSystems."/mnt/windows" = { + device = "/dev/disk/by-id/nvme-Samsung_SSD_980_PRO_2TB_S69ENF0R841140X-part3"; + fsType = "ntfs3"; + noCheck = true; + options = [ + "users" + "nofail" + "sys_immutable" + "windows_names" + ]; + }; + powerManagement.enable = true; systemd.services.powertop.postStart = builtins.readFile ./scripts/mouse.sh; @@ -98,19 +134,6 @@ tlp.settings.DISK_DEVICES = "nvme0n1 nvme1n1"; }; - boot = { - kernelParams = [ - "amd_pstate=active" - "video=eDP-1:2560x1600@165" - ]; - initrd.kernelModules = [ "amdgpu" ]; - }; - - nixpkgs.config = { - cudaSupport = true; - rocmSupport = true; - }; - programs = { steam.package = pkgs.steam.override { extraEnv.STEAM_FORCE_DESKTOPUI_SCALING = 1.25; diff --git a/hosts/eirene/hardware-configuration.nix b/hosts/eirene/hardware-configuration.nix deleted file mode 100644 index 9eeb2cd..0000000 --- a/hosts/eirene/hardware-configuration.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ lib, modulesPath, ... }: -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot = { - initrd.availableKernelModules = [ - "nvme" - "ahci" - "usbhid" - ]; - kernelModules = [ "kvm-amd" ]; - }; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; -}