diff --git a/flake.lock b/flake.lock index 11c2477..022af88 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1733050161, - "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { @@ -172,6 +172,7 @@ "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", @@ -185,11 +186,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1733266710, - "narHash": "sha256-8v/A7AVDqGp7iY32YCtgcjJ0WhJlj6q+wuMUXbGWpK0=", + "lastModified": 1733683959, + "narHash": "sha256-hUgv2XxOZu0XFVtwmovS3kplxAt+Jv+CXSxNnSiAtFo=", "ref": "refs/heads/main", - "rev": "3c617ce33c64cb43049489598b6391911eed7070", - "revCount": 5512, + "rev": "0a27af8cd190315c1f13363ebd11e83d30455d48", + "revCount": 5525, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -225,6 +226,35 @@ "type": "github" } }, + "hyprland-qtutils": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1733472316, + "narHash": "sha256-PvXiFLIExJEJj+goLbIuXLTN5CSDSAUsAfiYSdbbWg0=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "969427419276c7ee170301ef1ebe0f68eb6eb2e2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -311,11 +341,11 @@ ] }, "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -326,11 +356,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1733228754, - "narHash": "sha256-Jbt4imHmz5Z0jdaW7RrwAO1HYCmPs3XCt4j86jkG0b4=", + "lastModified": 1733345341, + "narHash": "sha256-8S58zrdpzGhax6tmn1i+R3AA0N9DJMu5FQI8JkA0NNU=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "2880dc44fc8c450b4ffe1609a4bccd19ef759f5c", + "rev": "ebb0be49fc381112ff37726c6dd6df4df2ef5a1b", "type": "github" }, "original": { @@ -350,11 +380,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1733265593, - "narHash": "sha256-sMd0QBqmH68O2N7DAfz7WtCTPzgY2MWjAIw18dUgNcg=", + "lastModified": 1733621779, + "narHash": "sha256-oeBPiHmg8T/Qsf4qMkUqOrn6/xkJwREGo1jA+4xDssk=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "e1b76524988d600dcf415ec5355a727ca2c5debe", + "rev": "b9ec66ed4e1430061ca044e938bb10f3ab629ba3", "type": "github" }, "original": { @@ -365,11 +395,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -381,11 +411,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733120037, - "narHash": "sha256-En+gSoVJ3iQKPDU1FHrR6zIxSLXKjzKY+pnh9tt+Yts=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9f0d5c5380be0a599b1fb54641fa99af8281539", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { @@ -413,11 +443,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1732981179, - "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { @@ -438,11 +468,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -473,11 +503,11 @@ ] }, "locked": { - "lastModified": 1732933841, - "narHash": "sha256-dge02pUSe2QeC/B3PriA0R8eAX+EU3aDoXj9FcS3XDw=", + "lastModified": 1733538766, + "narHash": "sha256-FEDfBpM82XGdHDbLDJC4lV+QXSVN1rERt1MqtBGJZds=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c65e91d4a33abc3bc4a892d3c5b5b378bad64ea1", + "rev": "66526479b295ad238843a8a7367d2da7ec102757", "type": "github" }, "original": { @@ -503,11 +533,11 @@ }, "unstable": { "locked": { - "lastModified": 1733272025, - "narHash": "sha256-CPewGtIGmy/CyTwU81AQfdUvXF3w4kCWanA9w/gehfw=", + "lastModified": 1733682815, + "narHash": "sha256-8DFHnrHprF8u95VOFgMAgJe2OBD70pd1g0NFtIEElAY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5cfe3df29c23318a43a837e0859daa5976d0cc55", + "rev": "73b9f2d20bea97d5bd6c8158f3a388ef40ac97c5", "type": "github" }, "original": { @@ -524,11 +554,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -566,11 +596,11 @@ ] }, "locked": { - "lastModified": 1731703417, - "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", + "lastModified": 1733157064, + "narHash": "sha256-NetqJHAN4bbZDQADvpep+wXk2AbMZ2bN6tINz8Kpz6M=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "8070f36deec723de71e7557441acb17e478204d3", + "rev": "fd85ef39369f95eed67fdf3f025e86916edeea2f", "type": "github" }, "original": { diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 6dd8f9e..e94834c 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -19,6 +19,7 @@ in common.hardware = { sound.enable = true; laptop-power-mgr.enable = true; + hardware.amdgpu.enable = true; }; desktop = { enable = true; @@ -32,7 +33,7 @@ in }; }; }; - services.displayManager.defaultSession = "plasmax11"; + services.displayManager.defaultSession = "plasma"; # Firmware updater services.fwupd.enable = true; services.fwupd.package = (import @@ -57,15 +58,6 @@ in boot.tmp.useTmpfs = true; # Packages environment.systemPackages = (with pkgs; [ - # Amd GPU Support - rocmPackages.rocm-smi - rocmPackages.rpp - rocmPackages.rocm-core - rocmPackages.rocm-runtime - rocmPackages.hipblas - rocmPackages.llvm.clang - amdgpu_top - amdctl # python python312 # Work @@ -76,11 +68,6 @@ in # Util libusb1 ]); - # # Opengl - hardware.graphics = { - extraPackages = [ pkgs.amdvlk ]; - extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; - }; # # Gaming programs.steam = { enable = true; @@ -108,10 +95,9 @@ in hardware.sane.brscan5.enable = true; # # Display Managers services.xserver.videoDrivers = - [ "modesetting" "amdgpu" "fbdev" ]; + [ "modesetting" "fbdev" ]; # Kernel boot.kernelPackages = pkgs.linuxPackages_zen; - boot.initrd.kernelModules = [ "amdgpu" ]; # Add Functions home-manager.users.${user.name}.programs.zsh.initExtra = '' source ${zshFunctions} diff --git a/hosts/hl-bigbox1.hardware-configuration.nix b/hosts/hl-bigbox1.hardware-configuration.nix index 42b8c6b..aad5f16 100644 --- a/hosts/hl-bigbox1.hardware-configuration.nix +++ b/hosts/hl-bigbox1.hardware-configuration.nix @@ -11,7 +11,7 @@ boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - # boot.kernelModules = [ "kvm-amd" ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index e22c4de..c6d14bf 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -1,5 +1,5 @@ { ... }: -{ pkgs, config, ... }: +{ pkgs, ... }: { imports = [ ./hl-bigbox1.hardware-configuration.nix ]; skyg = { @@ -9,6 +9,10 @@ nixos = { common.ssh-server.enable = true; common.containers.openMetricsPort = true; + common.hardware = { + nvidia.enable = true; + amdgpu.enable = true; + }; server.services = { ai.enable = true; jellyfin.enable = false; @@ -22,7 +26,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.tmp.useTmpfs = true; - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_hardened; # Wake on Lan networking.interfaces.enp4s0.wakeOnLan.enable = true; networking.interfaces.lo.wakeOnLan.enable = true; @@ -30,20 +34,7 @@ # Suspend services.autosuspend.enable = false; services.xserver.displayManager.gdm.autoSuspend = false; - # Nvidia Settings - # hardware.nvidia-container-toolkit.enable = true; - virtualisation.docker.enableNvidia = true; - hardware.graphics.enable32Bit = true; - hardware.graphics.enable = true; - hardware.nvidia = { - # datacenter.enable = true; - modesetting.enable = true; - powerManagement.enable = false; - powerManagement.finegrained = false; - open = false; - nvidiaSettings = true; - package = config.boot.kernelPackages.nvidiaPackages.stable; - }; + environment.systemPackages = with pkgs; [ # steam-tui # steam-run diff --git a/modules/nixos/common/hardware/amdgpu.nix b/modules/nixos/common/hardware/amdgpu.nix new file mode 100644 index 0000000..2729e91 --- /dev/null +++ b/modules/nixos/common/hardware/amdgpu.nix @@ -0,0 +1,32 @@ +{ lib +, config +, pkgs +, ... +}: +let + cfg = config.skyg.nixos.common.hardware.amdgpu; +in +{ + options.skyg.nixos.common.hardware.amdgpu = with lib; { + enable = mkEnableOption "amdgpu"; + }; + + config = lib.mkIf cfg.enable { + boot.initrd.kernelModules = [ "amdgpu" ]; + services.xserver.videoDrivers = [ "amdgpu" ]; + hardware.graphics = { + extraPackages = [ pkgs.amdvlk ]; + extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; + }; + environment.systemPackages = (with pkgs; [ + rocmPackages.rocm-smi + rocmPackages.rpp + rocmPackages.rocm-core + rocmPackages.rocm-runtime + rocmPackages.hipblas + rocmPackages.llvm.clang + amdgpu_top + amdctl + ]); + }; +} diff --git a/modules/nixos/common/hardware/default.nix b/modules/nixos/common/hardware/default.nix index a7a8a0d..093477a 100644 --- a/modules/nixos/common/hardware/default.nix +++ b/modules/nixos/common/hardware/default.nix @@ -5,6 +5,8 @@ ./fancontrol.nix ./sound.nix ./laptop-power.nix + ./nvidia.nix + ./amdgpu.nix ]; # Firmware Updater services.fwupd.enable = true; diff --git a/modules/nixos/common/hardware/nvidia.nix b/modules/nixos/common/hardware/nvidia.nix new file mode 100644 index 0000000..4845747 --- /dev/null +++ b/modules/nixos/common/hardware/nvidia.nix @@ -0,0 +1,30 @@ +{ lib +, config +, ... +}: +let + cfg = config.skyg.nixos.common.hardware.nvidia; +in +{ + options.skyg.nixos.common.hardware.nvidia = with lib; { + enable = mkEnableOption "nvidia"; + }; + + config = lib.mkIf cfg.enable { + # Nvidia Settings + services.xserver.videoDrivers = [ "nvidia" ]; + hardware.nvidia-container-toolkit.enable = true; + virtualisation.docker.enableNvidia = true; + hardware.graphics.enable32Bit = true; + hardware.graphics.enable = true; + hardware.nvidia = { + # datacenter.enable = true; + modesetting.enable = true; + powerManagement.enable = false; + powerManagement.finegrained = false; + open = false; + nvidiaSettings = true; + # package = config.boot.kernelPackages.nvidiaPackages.stable; + }; + }; +}