From ecf6a19a928b57bb67822442f7ca0dcbbea42e98 Mon Sep 17 00:00:00 2001 From: David Crompton Date: Sat, 25 Jan 2025 22:29:11 -0500 Subject: [PATCH] universedesktop: nvidia beta, new dwl, back to dwl --- machines/universedesktop/desktop/default.nix | 4 +-- machines/universedesktop/desktop/dwl.nix | 12 ++++---- machines/universedesktop/desktop/plasma.nix | 6 +++- machines/universedesktop/desktop/sddm.nix | 1 + machines/universedesktop/desktop/wayland.nix | 32 +++++++++++--------- machines/universedesktop/programs/art.nix | 2 +- machines/universedesktop/programs/games.nix | 6 ++-- 7 files changed, 35 insertions(+), 28 deletions(-) diff --git a/machines/universedesktop/desktop/default.nix b/machines/universedesktop/desktop/default.nix index 7622ee7..31c1546 100644 --- a/machines/universedesktop/desktop/default.nix +++ b/machines/universedesktop/desktop/default.nix @@ -1,7 +1,7 @@ { config, pkgs, lib, ... }: { imports = [ ./audio.nix - ./displaymanager.nix - ./niri.nix + ./emptty.nix + ./dwl.nix ]; } diff --git a/machines/universedesktop/desktop/dwl.nix b/machines/universedesktop/desktop/dwl.nix index cd26c86..5220964 100644 --- a/machines/universedesktop/desktop/dwl.nix +++ b/machines/universedesktop/desktop/dwl.nix @@ -17,15 +17,15 @@ in { domain = "gitlab.freedesktop.org"; owner = "wlroots"; repo = "wlroots"; - rev = "47fb00f66d5a8367d0108bd960f99e51ab1a1318"; # 0.19-prev - hash = "sha256-HkpTML14tbYBLiHkqoFRSn/qKsVny/oso2TuG6LY/fk="; + rev = "fa97f7f1f0b27b6dbcf4636b892a6bb52a93d1e4"; # 0.19-prev # 25-01-25 + hash = "sha256-zUAELpyYEOtPaVMu9LMxTER4jLzQEnE3FNhYFOsOyp4="; }; }); dwl = (prev.dwl.override { wlroots = final.wlroots_0_19; }).overrideAttrs (old: let dwl-patches = pkgs.fetchgit { url = "https://codeberg.org/dwl/dwl-patches.git"; - rev = "8b1f9fbdb2c3394bc26a9ff0ac872f64c38e29f7"; - hash = "sha256-fW7cJC2uT9uV0fdB/5rjHOWnQHouvjJrcem1hENm6R0="; + rev = "4a869141fa643d9be792a9aa44a42cf7f7f882ad"; + hash = "sha256-xlaK9xMrc+KDNecsyByRIxXmPEZ2dmP4FQ0bMojsyws="; }; patches = let dwl-patch = p: "${dwl-patches}/patches/${p}/${p}.patch"; @@ -42,8 +42,8 @@ in { domain = "codeberg.org"; owner = "dwl"; repo = "dwl"; - rev = "002c7d22043da56a54511b5d234c2e3bd997d119"; - hash = "sha256-mgO+iTJmAM0N5Q+6fAfMAOU0O1T8xUWRdaIcbRX3Pa8="; + rev = "d1c2f434983562bd7d2ace15ab0c05155be603bc"; + hash = "sha256-SpfjQfzvbpDiihziyKGPoBwvp3evgCQQhhjldAE/MwY="; }; patches = (old.patches or []) ++ patches; diff --git a/machines/universedesktop/desktop/plasma.nix b/machines/universedesktop/desktop/plasma.nix index 2bdc483..c0366f7 100644 --- a/machines/universedesktop/desktop/plasma.nix +++ b/machines/universedesktop/desktop/plasma.nix @@ -1,8 +1,12 @@ { config, pkgs, lib, ... }: { imports = [ ./wayland.nix - ./sddm.nix + #./sddm.nix ]; + services.xserver.displayManager.lightdm.enable = true; + + # nVidia is broken with 6.12 currently + boot.kernelPackages = pkgs.linuxPackages_6_11; services.xserver.enable = true; services.desktopManager.plasma6.enable = true; diff --git a/machines/universedesktop/desktop/sddm.nix b/machines/universedesktop/desktop/sddm.nix index dd95645..7030a47 100644 --- a/machines/universedesktop/desktop/sddm.nix +++ b/machines/universedesktop/desktop/sddm.nix @@ -1,4 +1,5 @@ { config, pkgs, lib, ... }: { + services.xserver.enable = true; services.displayManager.sddm.enable = true; services.displayManager.sddm.wayland.enable = true; } diff --git a/machines/universedesktop/desktop/wayland.nix b/machines/universedesktop/desktop/wayland.nix index df89cb1..b5cd8c6 100644 --- a/machines/universedesktop/desktop/wayland.nix +++ b/machines/universedesktop/desktop/wayland.nix @@ -3,27 +3,29 @@ hardware = { graphics.enable = true; graphics.enable32Bit = true; + graphics.package = config.hardware.nvidia.package; nvidia = { modesetting.enable = true; powerManagement.enable = false; powerManagement.finegrained = false; nvidiaSettings = true; - open = false; - package = let - rcu_patch = pkgs.fetchpatch { - url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch"; - hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg="; - }; - in config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "535.154.05"; - sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg="; - sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k="; - openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo="; - settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10="; - persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE="; - patches = [ rcu_patch ]; - }; + open = true; + package = config.boot.kernelPackages.nvidiaPackages.beta; + #package = let + # rcu_patch = pkgs.fetchpatch { + # url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch"; + # hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg="; + # }; + #in config.boot.kernelPackages.nvidiaPackages.mkDriver { + # version = "535.154.05"; + # sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg="; + # sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k="; + # openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo="; + # settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10="; + # persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE="; + # patches = [ rcu_patch ]; + #}; }; }; programs.xwayland.enable = true; diff --git a/machines/universedesktop/programs/art.nix b/machines/universedesktop/programs/art.nix index caf552e..e11d8c4 100644 --- a/machines/universedesktop/programs/art.nix +++ b/machines/universedesktop/programs/art.nix @@ -89,7 +89,7 @@ # OpenCAMLib support shapely equation - opencamlib + #opencamlib # NeuroMorphoVis support matplotlib seaborn diff --git a/machines/universedesktop/programs/games.nix b/machines/universedesktop/programs/games.nix index 03a7d4c..2432518 100644 --- a/machines/universedesktop/programs/games.nix +++ b/machines/universedesktop/programs/games.nix @@ -2,9 +2,9 @@ # # For steam # services.flatpak.enable = true; # ## Flatpak requires this - # xdg.portal.enable = true; - # xdg.portal.wlr.enable = true; - # xdg.portal.config.common.default = "*"; + xdg.portal.enable = true; + xdg.portal.wlr.enable = true; + xdg.portal.config.common.default = "*"; programs.steam.enable = true; # Game compat programs.gamemode.enable = true;