diff options
Diffstat (limited to 'nixos/modules/services/x11')
5 files changed, 21 insertions, 12 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index a734bc288c9f..bee627ec76c0 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -237,6 +237,11 @@ in { budgie.budgie-control-center ]; + # Register packages for udev. + services.udev.packages = with pkgs; [ + budgie.magpie + ]; + # Shell integration for MATE Terminal. programs.bash.vteIntegration = true; programs.zsh.vteIntegration = true; diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index b3cbe4c324df..bb42c52b69ca 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -212,10 +212,12 @@ in programs.bash.vteIntegration = mkDefault true; programs.zsh.vteIntegration = mkDefault true; - # Harmonize Qt applications under Cinnamon - qt.enable = true; - qt.platformTheme = "gnome"; - qt.style = "adwaita"; + # Qt application style + qt = { + enable = mkDefault true; + style = mkDefault "gtk2"; + platformTheme = mkDefault "gtk2"; + }; # Default Fonts fonts.packages = with pkgs; [ diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index d8a47e93afc7..eef7aa14057e 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -200,7 +200,6 @@ in gtk3.out # for gtk-launch program onboard orca # elementary/greeter#668 - qgnomeplatform sound-theme-freedesktop xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ ]) ++ (with pkgs.pantheon; [ @@ -260,10 +259,10 @@ in programs.bash.vteIntegration = mkDefault true; programs.zsh.vteIntegration = mkDefault true; - # Harmonize Qt applications under Pantheon - qt.enable = true; - qt.platformTheme = "gnome"; - qt.style = "adwaita"; + # Use native GTK file chooser on Qt apps. This is because Qt does not know Pantheon. + # https://invent.kde.org/qt/qt/qtbase/-/blob/6.6/src/gui/platform/unix/qgenericunixthemes.cpp#L1312 + # https://github.com/elementary/default-settings/blob/7.0.2/profile.d/qt-qpa-platformtheme.sh + environment.variables.QT_QPA_PLATFORMTHEME = mkDefault "gtk3"; # Default Fonts fonts.packages = with pkgs; [ diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index 1d6f3daa4022..3df0ea9e60bb 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -61,6 +61,8 @@ in { ''; }; + package = mkPackageOptionMD pkgs "picom" { }; + fade = mkOption { type = types.bool; default = false; @@ -301,13 +303,13 @@ in { }; serviceConfig = { - ExecStart = "${pkgs.picom}/bin/picom --config ${configFile}"; + ExecStart = "${getExe cfg.package} --config ${configFile}"; RestartSec = 3; Restart = "always"; }; }; - environment.systemPackages = [ pkgs.picom ]; + environment.systemPackages = [ cfg.package ]; }; meta.maintainers = with lib.maintainers; [ rnhmjoj ]; diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix index 1881826944aa..82900fd30540 100644 --- a/nixos/modules/services/x11/window-managers/dwm.nix +++ b/nixos/modules/services/x11/window-managers/dwm.nix @@ -24,7 +24,7 @@ in patches = [ (super.fetchpatch { url = "https://dwm.suckless.org/patches/steam/dwm-steam-6.2.diff"; - sha256 = "1ld1z3fh6p5f8gr62zknx3axsinraayzxw3rz1qwg73mx2zk5y1f"; + sha256 = "sha256-f3lffBjz7+0Khyn9c9orzReoLTqBb/9gVGshYARGdVc="; }) ]; }) @@ -45,6 +45,7 @@ in { name = "dwm"; start = '' + export _JAVA_AWT_WM_NONREPARENTING=1 dwm & waitPID=$! ''; |