Syzygial/NixMachines
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

universedesktop: nvidia beta, new dwl, back to dwl

Browse Source
This commit is contained in:
David Crompton
2025-01-25 22:29:11 -05:00
parent 3304fba25b
commit ecf6a19a92
7 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
machines/universedesktop/desktop/default.nix
View File

@@ -1,7 +1,7 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
imports = [ imports = [
./audio.nix ./audio.nix
./displaymanager.nix ./emptty.nix
./niri.nix ./dwl.nix
]; ];
} }

12
machines/universedesktop/desktop/dwl.nix
View File

@@ -17,15 +17,15 @@ in {
domain = "gitlab.freedesktop.org"; domain = "gitlab.freedesktop.org";
owner = "wlroots"; owner = "wlroots";
repo = "wlroots"; repo = "wlroots";
rev = "47fb00f66d5a8367d0108bd960f99e51ab1a1318"; # 0.19-prev rev = "fa97f7f1f0b27b6dbcf4636b892a6bb52a93d1e4"; # 0.19-prev # 25-01-25
hash = "sha256-HkpTML14tbYBLiHkqoFRSn/qKsVny/oso2TuG6LY/fk="; hash = "sha256-zUAELpyYEOtPaVMu9LMxTER4jLzQEnE3FNhYFOsOyp4=";
}; };
}); });
dwl = (prev.dwl.override { wlroots = final.wlroots_0_19; }).overrideAttrs (old: let dwl = (prev.dwl.override { wlroots = final.wlroots_0_19; }).overrideAttrs (old: let
dwl-patches = pkgs.fetchgit { dwl-patches = pkgs.fetchgit {
url = "https://codeberg.org/dwl/dwl-patches.git"; url = "https://codeberg.org/dwl/dwl-patches.git";
rev = "8b1f9fbdb2c3394bc26a9ff0ac872f64c38e29f7"; rev = "4a869141fa643d9be792a9aa44a42cf7f7f882ad";
hash = "sha256-fW7cJC2uT9uV0fdB/5rjHOWnQHouvjJrcem1hENm6R0="; hash = "sha256-xlaK9xMrc+KDNecsyByRIxXmPEZ2dmP4FQ0bMojsyws=";
}; };
patches = let patches = let
dwl-patch = p: "${dwl-patches}/patches/${p}/${p}.patch"; dwl-patch = p: "${dwl-patches}/patches/${p}/${p}.patch";
@@ -42,8 +42,8 @@ in {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "dwl"; owner = "dwl";
repo = "dwl"; repo = "dwl";
rev = "002c7d22043da56a54511b5d234c2e3bd997d119"; rev = "d1c2f434983562bd7d2ace15ab0c05155be603bc";
hash = "sha256-mgO+iTJmAM0N5Q+6fAfMAOU0O1T8xUWRdaIcbRX3Pa8="; hash = "sha256-SpfjQfzvbpDiihziyKGPoBwvp3evgCQQhhjldAE/MwY=";
}; };
patches = (old.patches or []) ++ patches; patches = (old.patches or []) ++ patches;

6
machines/universedesktop/desktop/plasma.nix
View File

@@ -1,8 +1,12 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
imports = [ imports = [
./wayland.nix ./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.xserver.enable = true;
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;

1
machines/universedesktop/desktop/sddm.nix
View File

@@ -1,4 +1,5 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
services.xserver.enable = true;
services.displayManager.sddm.enable = true; services.displayManager.sddm.enable = true;
services.displayManager.sddm.wayland.enable = true; services.displayManager.sddm.wayland.enable = true;
} }

32
machines/universedesktop/desktop/wayland.nix
View File

@@ -3,27 +3,29 @@
hardware = { hardware = {
graphics.enable = true; graphics.enable = true;
graphics.enable32Bit = true; graphics.enable32Bit = true;
graphics.package = config.hardware.nvidia.package;
nvidia = { nvidia = {
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = false; powerManagement.enable = false;
powerManagement.finegrained = false; powerManagement.finegrained = false;
nvidiaSettings = true; nvidiaSettings = true;
open = false; open = true;
package = let package = config.boot.kernelPackages.nvidiaPackages.beta;
rcu_patch = pkgs.fetchpatch { #package = let
url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch"; # rcu_patch = pkgs.fetchpatch {
hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg="; # 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"; #in config.boot.kernelPackages.nvidiaPackages.mkDriver {
sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg="; # version = "535.154.05";
sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k="; # sha256_64bit = "sha256-fpUGXKprgt6SYRDxSCemGXLrEsIA6GOinp+0eGbqqJg=";
openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo="; # sha256_aarch64 = "sha256-G0/GiObf/BZMkzzET8HQjdIcvCSqB1uhsinro2HLK9k=";
settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10="; # openSha256 = "sha256-wvRdHguGLxS0mR06P5Qi++pDJBCF8pJ8hr4T8O6TJIo=";
persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE="; # settingsSha256 = "sha256-9wqoDEWY4I7weWW05F4igj1Gj9wjHsREFMztfEmqm10=";
patches = [ rcu_patch ]; # persistencedSha256 = "sha256-d0Q3Lk80JqkS1B54Mahu2yY/WocOqFFbZVBh+ToGhaE=";
}; # patches = [ rcu_patch ];
#};
}; };
}; };
programs.xwayland.enable = true; programs.xwayland.enable = true;

2
machines/universedesktop/programs/art.nix
View File

@@ -89,7 +89,7 @@
# OpenCAMLib support # OpenCAMLib support
shapely shapely
equation equation
opencamlib #opencamlib
# NeuroMorphoVis support # NeuroMorphoVis support
matplotlib matplotlib
seaborn seaborn

6
machines/universedesktop/programs/games.nix
View File

@@ -2,9 +2,9 @@
# # For steam # # For steam
# services.flatpak.enable = true; # services.flatpak.enable = true;
# ## Flatpak requires this # ## Flatpak requires this
# xdg.portal.enable = true; xdg.portal.enable = true;
# xdg.portal.wlr.enable = true; xdg.portal.wlr.enable = true;
# xdg.portal.config.common.default = "*"; xdg.portal.config.common.default = "*";
programs.steam.enable = true; programs.steam.enable = true;
# Game compat # Game compat
programs.gamemode.enable = true; programs.gamemode.enable = true;