From a1d5509ab6bedbbb6e725913e100504653473396 Mon Sep 17 00:00:00 2001 From: mehbark Date: Tue, 15 Aug 2023 13:22:30 -0400 Subject: [PATCH] xmonad kind of sucks --- build.conf.nix | 4 ++-- configuration.nix | 4 ++-- home.nix | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/build.conf.nix b/build.conf.nix index 1320de9..a7594e3 100644 --- a/build.conf.nix +++ b/build.conf.nix @@ -1,8 +1,8 @@ with builtins; { - wm = "xmonad"; + wm = "plasma"; # very, very non-exhaustive of course - is-x11 = wm: elem wm ["kde" "xmonad"]; + is-x11 = wm: elem wm ["plasma" "xmonad"]; is-wayland = wm: elem wm ["hyprland" "sway"]; } diff --git a/configuration.nix b/configuration.nix index 4ec4f9a..6a64792 100644 --- a/configuration.nix +++ b/configuration.nix @@ -61,8 +61,8 @@ in services.xserver.enable = x11; # Enable the KDE Plasma Desktop Environment. - services.xserver.displayManager.sddm.enable = conf.wm == "kde"; - services.xserver.desktopManager.plasma5.enable = conf.wm == "kde"; + services.xserver.displayManager.sddm.enable = conf.wm == "plasma" || conf.wm == "xmonad"; + services.xserver.desktopManager.plasma5.enable = conf.wm == "plasma"; # Configure keymap in X11 services.xserver = { diff --git a/home.nix b/home.nix index 522d0b7..37a4bec 100644 --- a/home.nix +++ b/home.nix @@ -134,7 +134,8 @@ in enable = true; config = pkgs.writeText "xmonad.hs" '' import XMonad - main = xmonad def + import XMonad.Config.Kde + main = xmonad kde4Config { terminal = "kitty" , modMask = mod4Mask , borderWidth = 1