summaryrefslogtreecommitdiffstats
path: root/nixos
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2021-01-14 14:14:56 +0000
committerGitHub <noreply@github.com>2021-01-14 14:14:56 +0000
commit01372e6624e52746c2403f762b44514d936eb46f (patch)
treee912353ff1a1ae99284f5e0786458e09812f51b7 /nixos
parent195c3acf8f846b9b28f75690062d7a284e754bd4 (diff)
parentd405d8972720750dc61befe96bc4c90a96ad774c (diff)
Merge pull request #109066 from michael-p-m-white/reenable-working-clfswm
Reenable working clfswm
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/module-list.nix1
-rw-r--r--nixos/modules/services/x11/window-managers/clfswm.nix4
-rw-r--r--nixos/modules/services/x11/window-managers/default.nix1
3 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 953aeda568f1..a71c804428da 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -956,6 +956,7 @@
./services/x11/urxvtd.nix
./services/x11/window-managers/awesome.nix
./services/x11/window-managers/default.nix
+ ./services/x11/window-managers/clfswm.nix
./services/x11/window-managers/fluxbox.nix
./services/x11/window-managers/icewm.nix
./services/x11/window-managers/bspwm.nix
diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixos/modules/services/x11/window-managers/clfswm.nix
index 176c1f461271..171660c53ac3 100644
--- a/nixos/modules/services/x11/window-managers/clfswm.nix
+++ b/nixos/modules/services/x11/window-managers/clfswm.nix
@@ -15,10 +15,10 @@ in
services.xserver.windowManager.session = singleton {
name = "clfswm";
start = ''
- ${pkgs.clfswm}/bin/clfswm &
+ ${pkgs.lispPackages.clfswm}/bin/clfswm &
waitPID=$!
'';
};
- environment.systemPackages = [ pkgs.clfswm ];
+ environment.systemPackages = [ pkgs.lispPackages.clfswm ];
};
}
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 87702c58727a..9ca24310e567 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -13,6 +13,7 @@ in
./berry.nix
./bspwm.nix
./cwm.nix
+ ./clfswm.nix
./dwm.nix
./evilwm.nix
./exwm.nix