From fa16f0c327b05f7b99bb9a4560e3d1f09a4e11fb Mon Sep 17 00:00:00 2001 From: Emmet Date: Wed, 20 Aug 2025 20:51:23 -0500 Subject: [PATCH] Updates for new work computer --- flake.lock | 8 ++--- hosts/zenith/hardware-configuration.nix | 40 ++++++------------------- hosts/zenith/home.nix | 14 +-------- 3 files changed, 14 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 6f399de8..b242238f 100644 --- a/flake.lock +++ b/flake.lock @@ -990,11 +990,11 @@ ] }, "locked": { - "lastModified": 1754756619, - "narHash": "sha256-T4AFB2+GTSyz72AaUwZY7aexhE5z6KaEaeEuBINZh5Q=", + "lastModified": 1755740692, + "narHash": "sha256-aEEDVUreWCXtgA7rtAM1llzjoRJS+jOnWKD8jP1KdiY=", "ref": "refs/heads/main", - "rev": "8a23fe152a3fea702159ad1680cb9083d20aacf6", - "revCount": 33, + "rev": "e3d9e1103df26dfd143f75913d33de55f5d59ae1", + "revCount": 34, "type": "git", "url": "file://path:/etc/nixos.secrets" }, diff --git a/hosts/zenith/hardware-configuration.nix b/hosts/zenith/hardware-configuration.nix index 0aac4c5a..5b2342a8 100644 --- a/hosts/zenith/hardware-configuration.nix +++ b/hosts/zenith/hardware-configuration.nix @@ -8,49 +8,27 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "ahci" "nvme" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ "i915" ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; services.fstrim.enable = true; services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ]; - hardware.graphics = { - enable = lib.mkDefault true; - enable32Bit = lib.mkDefault true; - extraPackages = with pkgs; [ - vpl-gpu-rt - intel-media-driver - intel-vaapi-driver - vaapiIntel - vaapiVdpau - libvdpau-va-gl - ]; - extraPackages32 = with pkgs.driversi686Linux; [ - intel-media-driver - intel-vaapi-driver - libvdpau-va-gl - ]; - }; - - environment.sessionVariables = { - LIBVA_DRIVER_NAME = "iHD"; - }; - powerManagement.cpuFreqGovernor = "performance"; services.thermald.enable = true; fileSystems."/" = - { device = "/dev/disk/by-uuid/548f7030-af4c-412a-b2ed-d842337aa336"; + { device = "/dev/disk/by-uuid/41b254d6-96aa-4498-91d3-939f1722fff1"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-50f310ae-545b-4f09-84b6-e69b5ecacaae".device = "/dev/disk/by-uuid/50f310ae-545b-4f09-84b6-e69b5ecacaae"; + boot.initrd.luks.devices."luks-759bd464-2cda-4c25-b7c0-800d4265314b".device = "/dev/disk/by-uuid/759bd464-2cda-4c25-b7c0-800d4265314b"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/F691-DA8C"; + { device = "/dev/disk/by-uuid/3212-E58F"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; @@ -62,9 +40,9 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; + # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/zenith/home.nix b/hosts/zenith/home.nix index a7c9225c..9954ab16 100644 --- a/hosts/zenith/home.nix +++ b/hosts/zenith/home.nix @@ -62,20 +62,8 @@ }; }; - bind = [ - ''SUPER,E,exec,if hyprctl clients | grep qutegmail; then echo "scratch_mail respawn not needed"; else qutebrowser --qt-flag enable-gpu-rasterization --qt-flag enable-native-gpu-memory-buffers --qt-flag num-raster-threads=4 -B ~/.browser/Teaching :'set input.mode_override passthrough -u mail.google.com' :'set window.title_format qutegmail' :'set tabs.show never' :'set statusbar.show never' https://mail.google.com; fi'' - "SUPER,E,togglespecialworkspace,scratch_email" - ]; - - windowrulev2 = [ - "float,title:^(qutegmail)$" - "size 80% 85%,title:^(qutegmail)$" - "workspace special:scratch_email ,title:^(qutegmail)$" - "center,title:^(qutegmail)$" - ]; - monitor = [ - "eDP-1,1920x1080,1536x0,1.25" + "eDP-1,1920x1200,1536x0,1.25" "HDMI-A-1,1920x1080,0x0,1.25" ];