colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[NixOS] Make the unencrypted ryzen-shine permanent

Browse Source
This commit is contained in:
Ivan Malison
2024-12-29 15:40:59 -07:00
parent 95bd8dd280
commit c697b5684a
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nixos/machines/ryzen-shine-unencrypted.nix → nixos/machines/ryzen-shine-original.nix
View File

@@ -20,7 +20,6 @@
enable = true; enable = true;
# extraFlags = ["--node-taint preferNoSchedule=true:NoSchedule"]; # extraFlags = ["--node-taint preferNoSchedule=true:NoSchedule"];
}; };
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.loader.systemd-boot.configurationLimit = 5; boot.loader.systemd-boot.configurationLimit = 5;
@@ -48,6 +47,15 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.luks.devices."cryptroot".device = "/dev/nvme0n1p5";
boot.initrd.kernelModules = [ "dm-snapshot" ];
# install nvidia drivers in addition to intel one
hardware.graphics.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
hardware.graphics.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
services.xserver = {
videoDrivers = [ "nvidia" ];
};
hardware.nvidia.modesetting.enable = true; hardware.nvidia.modesetting.enable = true;
@@ -57,12 +65,12 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/9bd06145-8151-4f7b-bcfe-f1809e0db1ea"; device = "/dev/disk/by-uuid/356173ab-d076-43e0-aeb6-6a6829c4402b";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/E1E1-909E"; device = "/dev/disk/by-uuid/B270-C7E6";
fsType = "vfat"; fsType = "vfat";
}; };
@@ -72,6 +80,10 @@
options = [ "nofail" "uid=0" "gid=users" "umask=002" ]; options = [ "nofail" "uid=0" "gid=users" "umask=002" ];
}; };
swapDevices = [
{ device = "/dev/disk/by-uuid/f719b44e-295a-4909-9a60-84f87acb7f77"; }
];
# nix.settings.maxJobs = lib.mkDefault 16; # nix.settings.maxJobs = lib.mkDefault 16;
# High-DPI console # High-DPI console
console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz"; console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";

18
nixos/machines/ryzen-shine.nix
View File

@@ -20,6 +20,7 @@
enable = true; enable = true;
# extraFlags = ["--node-taint preferNoSchedule=true:NoSchedule"]; # extraFlags = ["--node-taint preferNoSchedule=true:NoSchedule"];
}; };
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.loader.systemd-boot.configurationLimit = 5; boot.loader.systemd-boot.configurationLimit = 5;
@@ -47,15 +48,6 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.luks.devices."cryptroot".device = "/dev/nvme0n1p5";
boot.initrd.kernelModules = [ "dm-snapshot" ];
# install nvidia drivers in addition to intel one
hardware.graphics.extraPackages = [ pkgs.linuxPackages.nvidia_x11.out ];
hardware.graphics.extraPackages32 = [ pkgs.linuxPackages.nvidia_x11.lib32 ];
services.xserver = {
videoDrivers = [ "nvidia" ];
};
hardware.nvidia.modesetting.enable = true; hardware.nvidia.modesetting.enable = true;
@@ -65,12 +57,12 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/356173ab-d076-43e0-aeb6-6a6829c4402b"; device = "/dev/disk/by-uuid/9bd06145-8151-4f7b-bcfe-f1809e0db1ea";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/B270-C7E6"; device = "/dev/disk/by-uuid/E1E1-909E";
fsType = "vfat"; fsType = "vfat";
}; };
@@ -80,10 +72,6 @@
options = [ "nofail" "uid=0" "gid=users" "umask=002" ]; options = [ "nofail" "uid=0" "gid=users" "umask=002" ];
}; };
swapDevices = [
{ device = "/dev/disk/by-uuid/f719b44e-295a-4909-9a60-84f87acb7f77"; }
];
# nix.settings.maxJobs = lib.mkDefault 16; # nix.settings.maxJobs = lib.mkDefault 16;
# High-DPI console # High-DPI console
console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz"; console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";