diff options
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | home/desktops/hyprland/hyprland.lua | 2 | ||||
| -rw-r--r-- | hosts/kaworu/default.nix | 1 | ||||
| -rw-r--r-- | hosts/kaworu/hardware.nix | 23 |
4 files changed, 20 insertions, 10 deletions
@@ -71,7 +71,7 @@ }; mkHome = hostDir: system: let hostModule = mkSystem hostDir system; - lib = nixpkgs.lib.extend (_: _: self.lib); + lib = nixpkgs.lib.extend (_: _: self.lib // home-manager.lib); in home-manager.lib.homeManagerConfiguration { inherit (hostModule) pkgs; @@ -79,7 +79,7 @@ modules = [ ./home ./options.nix - (self.lib.homeConfig hostModule.config) + (lib.home.mkConfig hostModule.config) { programs.home-manager.enable = nixpkgs.lib.mkForce false; } diff --git a/home/desktops/hyprland/hyprland.lua b/home/desktops/hyprland/hyprland.lua index 8079bbc..54a61f4 100644 --- a/home/desktops/hyprland/hyprland.lua +++ b/home/desktops/hyprland/hyprland.lua @@ -294,7 +294,7 @@ hl.config({ key_press_enables_dpms = true, mouse_move_enables_dpms = true, enable_anr_dialog = false, - vrr = 1, + vrr = 0, }, ecosystem = { no_update_news = true, diff --git a/hosts/kaworu/default.nix b/hosts/kaworu/default.nix index 25c16c7..c608607 100644 --- a/hosts/kaworu/default.nix +++ b/hosts/kaworu/default.nix @@ -36,6 +36,7 @@ }; bootloader = { limine.enable = true; + plymouth.enable = true; }; # modules diff --git a/hosts/kaworu/hardware.nix b/hosts/kaworu/hardware.nix index 0f2d277..740baae 100644 --- a/hosts/kaworu/hardware.nix +++ b/hosts/kaworu/hardware.nix @@ -1,36 +1,45 @@ -_: { +{ + lib, + pkgs, + ... +}: { # kernel modules boot.initrd.availableKernelModules = [ + "nvme" "xhci_pci" "ahci" - "usb_storage" "usbhid" + "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = []; boot.kernelModules = ["kvm-amd"]; boot.extraModulePackages = []; + boot.kernelPackages = lib.mkForce pkgs.cachyosKernels.linuxPackages-cachyos-latest-lto-zen4; # firmware hardware.enableRedistributableFirmware = true; hardware.cpu.amd.updateMicrocode = true; # luks device - boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/89257280-202b-4565-b832-89f160d5e4e2"; + boot.initrd.luks.devices."root".device = "/dev/disk/by-uuid/694c8086-d64a-466a-a687-378412964867"; + boot.initrd.luks.devices."swap".device = "/dev/disk/by-uuid/1d90327c-fe57-4f02-97b7-14062b37429f"; # root fileSystems."/" = { - device = "/dev/disk/by-uuid/4906f0dd-b036-40fc-9a3f-0d031dbc2513"; + device = "/dev/disk/by-uuid/dee54096-49a6-45d9-a347-cbe13374f3b4"; fsType = "btrfs"; }; # boot - fileSystems."/boot/efi" = { - device = "/dev/disk/by-uuid/099A-D668"; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/CCD8-FD63"; fsType = "vfat"; options = ["fmask=0022" "dmask=0022"]; }; # swap - swapDevices = []; + swapDevices = [ + {device = "/dev/disk/by-uuid/24871700-814f-40d0-a3e2-8624f2e99f44";} + ]; } |