Merge master into staging-next

2021-01-14 18:54:05 +00:00
parent 730ff71234 8a4b39330f
commit 183b673b64
60 changed files with 971 additions and 330 deletions
--- 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 ];
  };
 }
--- 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