Updates for new work computer

This commit is contained in:
Emmet
2025-08-20 20:51:23 -05:00
parent 23574a726e
commit fa16f0c327
3 changed files with 14 additions and 48 deletions

8
flake.lock generated
View File

@@ -990,11 +990,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1754756619, "lastModified": 1755740692,
"narHash": "sha256-T4AFB2+GTSyz72AaUwZY7aexhE5z6KaEaeEuBINZh5Q=", "narHash": "sha256-aEEDVUreWCXtgA7rtAM1llzjoRJS+jOnWKD8jP1KdiY=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "8a23fe152a3fea702159ad1680cb9083d20aacf6", "rev": "e3d9e1103df26dfd143f75913d33de55f5d59ae1",
"revCount": 33, "revCount": 34,
"type": "git", "type": "git",
"url": "file://path:/etc/nixos.secrets" "url": "file://path:/etc/nixos.secrets"
}, },

View File

@@ -8,49 +8,27 @@
[ (modulesPath + "/installer/scan/not-detected.nix") [ (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "ahci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ "i915" ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ];
services.fstrim.enable = true; services.fstrim.enable = true;
services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ]; 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"; powerManagement.cpuFreqGovernor = "performance";
services.thermald.enable = true; services.thermald.enable = true;
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/548f7030-af4c-412a-b2ed-d842337aa336"; { device = "/dev/disk/by-uuid/41b254d6-96aa-4498-91d3-939f1722fff1";
fsType = "ext4"; 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" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/F691-DA8C"; { device = "/dev/disk/by-uuid/3212-E58F";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [ "fmask=0077" "dmask=0077" ];
}; };
@@ -62,9 +40,9 @@
# still possible to use this option, but it's recommended to use it in conjunction # still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`. # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true; 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"; 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;
} }

View File

@@ -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 = [ monitor = [
"eDP-1,1920x1080,1536x0,1.25" "eDP-1,1920x1200,1536x0,1.25"
"HDMI-A-1,1920x1080,0x0,1.25" "HDMI-A-1,1920x1080,0x0,1.25"
]; ];