From be562f8ec3e8bc4cbe159d4c1564d0e5102555c1 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 24 Mar 2025 18:48:46 +0100 Subject: [PATCH] wms: remove xfce and niri --- modules/wms/wayland/niri/module.nix | 49 ----------------------------- modules/wms/xfce/module.nix | 23 -------------- 2 files changed, 72 deletions(-) delete mode 100644 modules/wms/wayland/niri/module.nix delete mode 100644 modules/wms/xfce/module.nix diff --git a/modules/wms/wayland/niri/module.nix b/modules/wms/wayland/niri/module.nix deleted file mode 100644 index 1512a30..0000000 --- a/modules/wms/wayland/niri/module.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let - cfg = config.programs.niri; - inherit (pkgs) xdg-desktop-portal-gtk xdg-desktop-portal-gnome; -in { - programs.niri = { - enable = true; - }; - programs.xwayland.enable = lib.mkForce false; - services.gnome.gnome-keyring.enable = true; - environment.systemPackages = builtins.attrValues { - inherit (pkgs) wmenu swaylock avizo playerctl xwayland-satellite; - }; - - systemd.user.services.niri-polkit = { - description = "PolicyKit Authentication Agent for niri"; - wantedBy = ["niri.service"]; - after = ["graphical-session.target"]; - partOf = ["graphical-session.target"]; - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"; - Restart = "on-failure"; - RestartSec = 1; - TimeoutStopSec = 10; - }; - }; - - services.displayManager.sessionPackages = [ - cfg.package - ]; - - xdg.portal = { - enable = true; - - configPackages = [cfg.package]; - - # Recommended by upstream, required for screencast support - # https://github.com/YaLTeR/niri/wiki/Important-Software#portals - extraPortals = [ - xdg-desktop-portal-gnome - xdg-desktop-portal-gtk - ]; - }; -} diff --git a/modules/wms/xfce/module.nix b/modules/wms/xfce/module.nix deleted file mode 100644 index 51703f1..0000000 --- a/modules/wms/xfce/module.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: let -in { - services.xserver = { - enable = true; - desktopManager = { - xterm.enable = false; - xfce = { - enable = true; - enableWaylandSession = true; - waylandSessionCompositor = lib.getExe pkgs.niri; - - noDesktop = false; - enableXfwm = false; - }; - }; - }; - services.displayManager.defaultSession = "xfce"; -}