From 2545200539d30b079db5add2ff1834c98c8b448c Mon Sep 17 00:00:00 2001 From: Shahab Dogar Date: Mon, 18 Nov 2024 13:03:58 +0500 Subject: [PATCH] feat: add gpu and luks swap, add k9s --- home-manager/home.nix | 2 ++ nixos/configuration.nix | 6 +++++- nixos/hardware-configuration.nix | 10 ++++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/home-manager/home.nix b/home-manager/home.nix index 1c37cbe..b57dcdb 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -84,6 +84,8 @@ in protonvpn-gui cloudflare-warp kubectl + gparted + k9s (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) ]; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index b607644..f968f6c 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -47,6 +47,7 @@ # Enable the X11 windowing system. services.xserver.enable = true; + services.xserver.videoDrivers = [ "amdgpu" ]; # Enable the GNOME Desktop Environment. services.xserver.displayManager.gdm.enable = true; @@ -64,7 +65,10 @@ # Enable sound with pipewire. hardware = { pulseaudio.enable = false; - graphics.enable = true; + graphics = { + enable = true; + extraPackages = with pkgs; [ amdvlk ]; + }; }; security.rtkit.enable = true; diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix index f4e319e..37291cb 100644 --- a/nixos/hardware-configuration.nix +++ b/nixos/hardware-configuration.nix @@ -9,7 +9,7 @@ ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "ohci_pci" "ehci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - boot.initrd.kernelModules = [ ]; + boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; @@ -18,7 +18,10 @@ fsType = "ext4"; }; - boot.initrd.luks.devices."luks-d46e7453-8b08-4865-9bfe-51230af5eef0".device = "/dev/disk/by-uuid/d46e7453-8b08-4865-9bfe-51230af5eef0"; + boot.initrd.luks.devices = { + "luks-d46e7453-8b08-4865-9bfe-51230af5eef0".device = "/dev/disk/by-uuid/d46e7453-8b08-4865-9bfe-51230af5eef0"; + "luks-4cf4d583-f6d7-4535-aa83-4e292c8af9f5".device = "/dev/disk/by-uuid/4cf4d583-f6d7-4535-aa83-4e292c8af9f5"; + }; fileSystems."/boot" = { device = "/dev/disk/by-uuid/9CC6-6F83"; @@ -27,8 +30,7 @@ }; swapDevices = - [ { device = "/dev/disk/by-uuid/24c8f921-3929-4f70-a4d4-7a25256c33cc"; } - ]; + [ { device = "/dev/disk/by-uuid/24c8f921-3929-4f70-a4d4-7a25256c33cc"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's