1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-29 20:45:29 +03:00

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2021-01-14 18:54:05 +00:00 committed by GitHub
commit 183b673b64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
60 changed files with 971 additions and 330 deletions

View file

@ -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

View file

@ -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 ];
};
}

View file

@ -13,6 +13,7 @@ in
./berry.nix
./bspwm.nix
./cwm.nix
./clfswm.nix
./dwm.nix
./evilwm.nix
./exwm.nix