From 0324f60ab14f8551b72ea6078562813befc72786 Mon Sep 17 00:00:00 2001 From: Emmet Date: Thu, 24 Oct 2024 07:06:40 -0500 Subject: [PATCH] Updated system + hyprlad + gpu drivers --- flake.lock | 140 +++++++++++++++++++----------- flake.nix | 11 +-- profiles/homelab/base.nix | 1 - profiles/work/configuration.nix | 1 - profiles/wsl/configuration.nix | 1 - system/hardware-configuration.nix | 23 ++++- user/wm/hyprland/hyprland.nix | 57 +----------- 7 files changed, 111 insertions(+), 123 deletions(-) diff --git a/flake.lock b/flake.lock index 9b3b191..a80dabf 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1725199881, - "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=", + "lastModified": 1729527199, + "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b", + "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1729258669, - "narHash": "sha256-e1t7Uqegsa14IIa880xx174Zsx1cSmg+nGx3xdfe8GY=", + "lastModified": 1729302358, + "narHash": "sha256-6bZhQRCGAeBzOXF8CRFDDG9fI0szycsR/6XDoFaYAjs=", "owner": "StevenBlack", "repo": "hosts", - "rev": "3eb62cf79953401fab84826491d2468bd8519487", + "rev": "48eb1cbb0b4a24984ab974268d32c185864b25f4", "type": "github" }, "original": { @@ -511,11 +511,11 @@ ] }, "locked": { - "lastModified": 1729260213, - "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", + "lastModified": 1729551526, + "narHash": "sha256-7LAGY32Xl14OVQp3y6M43/0AtHYYvV6pdyBcp3eoz0s=", "owner": "nix-community", "repo": "home-manager", - "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", + "rev": "5ec753a1fc4454df9285d8b3ec0809234defb975", "type": "github" }, "original": { @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1722623071, - "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", + "lastModified": 1728669738, + "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", + "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", "type": "github" }, "original": { @@ -579,6 +579,7 @@ "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", @@ -589,19 +590,18 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1725814101, - "narHash": "sha256-+wE97utoDfhQP6AMdZHUmBeL8grbce/Jv2i5M+6AbaE=", - "rev": "0f594732b063a90d44df8c5d402d658f27471dfe", - "revCount": 5196, - "submodules": true, - "type": "git", - "url": "https://code.hyprland.org/hyprwm/Hyprland.git" + "lastModified": 1728478479, + "narHash": "sha256-AbfdIlK92oWpI39xlIaUekPeL9u95sXzxVsSqhIMfIc=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "4520b30d498daca8079365bdb909a8dea38e8d55", + "type": "github" }, "original": { - "rev": "0f594732b063a90d44df8c5d402d658f27471dfe", - "submodules": true, - "type": "git", - "url": "https://code.hyprland.org/hyprwm/Hyprland.git" + "owner": "hyprwm", + "ref": "v0.44.1", + "repo": "Hyprland", + "type": "github" } }, "hyprland-plugins": { @@ -621,20 +621,46 @@ ] }, "locked": { - "lastModified": 1723143591, - "narHash": "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k=", - "rev": "b73d7b901d8cb1172dd25c7b7159f0242c625a77", - "revCount": 192, + "lastModified": 1729596320, + "narHash": "sha256-sBPr6O2Ad916f+L7biAjmJVx4TLDITC4joKgeOT47V8=", + "ref": "refs/heads/main", + "rev": "4d7f0b5d8b952f31f7d2e29af22ab0a55ca5c219", + "revCount": 198, "type": "git", "url": "https://code.hyprland.org/hyprwm/hyprland-plugins.git" }, "original": { - "rev": "b73d7b901d8cb1172dd25c7b7159f0242c625a77", + "rev": "4d7f0b5d8b952f31f7d2e29af22ab0a55ca5c219", "type": "git", "url": "https://code.hyprland.org/hyprwm/hyprland-plugins.git" } }, "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-protocols_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -677,11 +703,11 @@ ] }, "locked": { - "lastModified": 1725188252, - "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=", + "lastModified": 1728168612, + "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "c12ab785ce1982f82594aff03b3104c598186ddd", + "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "type": "github" }, "original": { @@ -754,11 +780,11 @@ ] }, "locked": { - "lastModified": 1724966483, - "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", + "lastModified": 1728941256, + "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", + "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", "type": "github" }, "original": { @@ -804,11 +830,11 @@ ] }, "locked": { - "lastModified": 1721324119, - "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", "type": "github" }, "original": { @@ -1019,11 +1045,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729070438, - "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5785b6bb5eaae44e627d541023034e1601455827", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -1066,11 +1092,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1729044727, - "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", + "lastModified": 1729449015, + "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", + "rev": "89172919243df199fe237ba0f776c3e3e3d72367", "type": "github" }, "original": { @@ -1476,11 +1502,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1729218602, - "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=", + "lastModified": 1729650555, + "narHash": "sha256-j8Sohst1TbQM6LqQKa/HRMfzsUwMhosuNMj2uOn9JOA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94", + "rev": "10c5eb61aaa32caddb9ecf0362a6eb9daeb08eab", "type": "github" }, "original": { @@ -1538,11 +1564,11 @@ "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1728900372, - "narHash": "sha256-hmG/u7qZEm7CTh1XPDi+pg4Oi0nNrv7sL8PgZDRe6wg=", + "lastModified": 1729380793, + "narHash": "sha256-TV6NYBUqTHI9t5fqNu4Qyr4BZUD2yGxAn3E+d5/mqaI=", "owner": "danth", "repo": "stylix", - "rev": "33a2eff15181e557bb6dd9d2073b90f7d218975d", + "rev": "fb9399b7e2c855f42dae76a363bab28d4f24aa8d", "type": "github" }, "original": { @@ -1709,11 +1735,19 @@ }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols", + "hyprland-protocols": "hyprland-protocols_2", "hyprlang": [ "hyprland", "hyprlang" ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -1724,11 +1758,11 @@ ] }, "locked": { - "lastModified": 1725203932, - "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=", + "lastModified": 1729674499, + "narHash": "sha256-XoOT0OsjH91t3JLSV0ka8iu58zC+Q1Sd+BA7M/vt5hw=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251", + "rev": "8f8619fe032b6250b061c75fc194658fc3bcf04f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 6fbf7c2..cd4b3bc 100644 --- a/flake.nix +++ b/flake.nix @@ -56,8 +56,8 @@ (import inputs.nixpkgs { system = systemSettings.system; rocmSupport = (if systemSettings.gpu == "amd" then true else false); }).applyPatches { name = "nixpkgs-patched"; src = inputs.nixpkgs; - patches = [ ./patches/emacs-no-version-check.patch - ./patches/nixpkgs-348697.patch + patches = [ #./patches/emacs-no-version-check.patch + #./patches/nixpkgs-348697.patch ]; }; @@ -230,16 +230,13 @@ }; hyprland = { - type = "git"; - url = "https://code.hyprland.org/hyprwm/Hyprland.git"; - submodules = true; - rev = "0f594732b063a90d44df8c5d402d658f27471dfe"; #v0.43.0 + url = "github:hyprwm/Hyprland/v0.44.1?submodules=true"; inputs.nixpkgs.follows = "nixpkgs"; }; hyprland-plugins = { type = "git"; url = "https://code.hyprland.org/hyprwm/hyprland-plugins.git"; - rev = "b73d7b901d8cb1172dd25c7b7159f0242c625a77"; #v0.43.0 + rev = "4d7f0b5d8b952f31f7d2e29af22ab0a55ca5c219"; #v0.44.1 inputs.hyprland.follows = "hyprland"; }; hyprlock = { diff --git a/profiles/homelab/base.nix b/profiles/homelab/base.nix index c0562a5..277c359 100644 --- a/profiles/homelab/base.nix +++ b/profiles/homelab/base.nix @@ -17,7 +17,6 @@ ]; # Ensure nix flakes are enabled - nix.package = pkgs.nixFlakes; nix.extraOptions = '' experimental-features = nix-command flakes ''; diff --git a/profiles/work/configuration.nix b/profiles/work/configuration.nix index 01dd174..f075b88 100644 --- a/profiles/work/configuration.nix +++ b/profiles/work/configuration.nix @@ -34,7 +34,6 @@ ]; # Ensure nix flakes are enabled - nix.package = pkgs.nixFlakes; nix.extraOptions = '' experimental-features = nix-command flakes ''; diff --git a/profiles/wsl/configuration.nix b/profiles/wsl/configuration.nix index 9d83988..2c8db3f 100644 --- a/profiles/wsl/configuration.nix +++ b/profiles/wsl/configuration.nix @@ -49,7 +49,6 @@ in nix.settings.experimental-features = [ "nix-command" "flakes" ]; # Ensure nix flakes are enabled - nix.package = pkgs.nixFlakes; nix.extraOptions = '' experimental-features = nix-command flakes ''; diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix index 35e0dd3..313c9f1 100644 --- a/system/hardware-configuration.nix +++ b/system/hardware-configuration.nix @@ -19,6 +19,9 @@ hardware.opengl.extraPackages = [ pkgs.rocmPackages.clr.icd ]; hardware.opengl.extraPackages32 = [ ]; + environment.systemPackages = with pkgs.rocmPackages; [ hipcc hip-common hiprand hipblas hipfft hipcub hipify ]; + + services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ]; hardware.graphics = { @@ -26,11 +29,23 @@ enable32Bit = lib.mkDefault true; }; - hardware.amdgpu.initrd.enable = lib.mkDefault true; + hardware.amdgpu.initrd.enable = true; + hardware.amdgpu.opencl.enable = true; + hardware.amdgpu.amdvlk.enable = true; - systemd.tmpfiles.rules = [ - "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" - ]; + systemd.tmpfiles.rules = + let + rocmEnv = pkgs.symlinkJoin { + name = "rocm-combined"; + paths = with pkgs.rocmPackages; [ + rocblas + hipblas + clr + ]; + }; + in [ + "L+ /opt/rocm - - - - ${rocmEnv}" + ]; # my stupid usb hub crashes systemct suspend half of the time now # https://wiki.archlinux.org/title/Power_management/Suspend_and_hibernate#Sleep_hooks diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index bd979b2..9198dad 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -25,11 +25,7 @@ in wayland.windowManager.hyprland = { enable = true; package = inputs.hyprland.packages.${pkgs.system}.hyprland; - plugins = [ - inputs.hyprland-plugins.packages.${pkgs.system}.hyprtrails - inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo - inputs.hyprgrass.packages.${pkgs.system}.default - ]; + plugins = [ ]; settings = { }; extraConfig = '' exec-once = dbus-update-activation-environment --systemd DISPLAY XAUTHORITY WAYLAND_DISPLAY XDG_SESSION_DESKTOP=Hyprland XDG_CURRENT_DESKTOP=Hyprland XDG_SESSION_TYPE=wayland @@ -100,43 +96,6 @@ in inactive_timeout = 30 } - plugin { - hyprtrails { - color = rgba(''+config.lib.stylix.colors.base08+''55) - } - hyprexpo { - columns = 3 - gap_size = 5 - bg_col = rgb(''+config.lib.stylix.colors.base00+'') - workspace_method = first 1 # [center/first] [workspace] e.g. first 1 or center m+1 - enable_gesture = false # laptop touchpad - } - touch_gestures { - sensitivity = 4.0 - long_press_delay = 260 - hyprgrass-bind = , edge:r:l, exec, hyprnome - hyprgrass-bind = , edge:l:r, exec, hyprnome --previous - hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper - - hyprgrass-bind = , swipe:3:u, hyprexpo:expo, toggleoverview - hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper - - hyprgrass-bind = , swipe:3:l, exec, hyprnome --previous - hyprgrass-bind = , swipe:3:r, exec, hyprnome - - hyprgrass-bind = , swipe:4:u, movewindow,u - hyprgrass-bind = , swipe:4:d, movewindow,d - hyprgrass-bind = , swipe:4:l, movewindow,l - hyprgrass-bind = , swipe:4:r, movewindow,r - - hyprgrass-bind = , tap:3, fullscreen,1 - hyprgrass-bind = , tap:4, fullscreen,0 - - hyprgrass-bindm = , longpress:2, movewindow - hyprgrass-bindm = , longpress:3, resizewindow - } - } - bind=SUPER,code:9,exec,nwggrid-wrapper bind=SUPER,code:66,exec,nwggrid-wrapper bind=SUPER,SPACE,fullscreen,1 @@ -146,7 +105,6 @@ in bind=ALT,TAB,bringactivetotop bind=ALTSHIFT,TAB,cyclenext,prev bind=ALTSHIFT,TAB,bringactivetotop - bind=SUPER,TAB,hyprexpo:expo, toggleoverview bind=SUPER,V,exec,wl-copy $(wl-paste | tr '\n' ' ') bind=SUPERSHIFT,T,exec,screenshot-ocr bind=CTRLALT,Delete,exec,hyprctl kill @@ -1308,19 +1266,6 @@ in border-color: #'' + config.lib.stylix.colors.base07 + ''; } ''; - home.file.".config/libinput-gestures.conf".text = '' - gesture swipe up 3 hyprctl dispatch hyprexpo:expo toggle - gesture swipe down 3 nwggrid-wrapper - - gesture swipe right 3 hyprnome - gesture swipe left 3 hyprnome --previous - gesture swipe up 4 hyprctl dispatch movewindow u - gesture swipe down 4 hyprctl dispatch movewindow d - gesture swipe left 4 hyprctl dispatch movewindow l - gesture swipe right 4 hyprctl dispatch movewindow r - gesture pinch in hyprctl dispatch fullscreen 1 - gesture pinch out hyprctl dispatch fullscreen 1 - ''; services.udiskie.enable = true; services.udiskie.tray = "always";