about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-04-17 00:09:02 +0000
committerAlyssa Ross <hi@alyssa.is>2021-06-09 14:50:49 +0000
commitb4ef01e1b734082f3ac3cb7bd3a4e88fc195740a (patch)
tree56d5a72a4c0d7dd7244d3f2def7dad356581f978
parent2f53a8b049234f14d5e698ca5aefdc06a3270383 (diff)
downloadnixlib-b4ef01e1b734082f3ac3cb7bd3a4e88fc195740a.tar
nixlib-b4ef01e1b734082f3ac3cb7bd3a4e88fc195740a.tar.gz
nixlib-b4ef01e1b734082f3ac3cb7bd3a4e88fc195740a.tar.bz2
nixlib-b4ef01e1b734082f3ac3cb7bd3a4e88fc195740a.tar.lz
nixlib-b4ef01e1b734082f3ac3cb7bd3a4e88fc195740a.tar.xz
nixlib-b4ef01e1b734082f3ac3cb7bd3a4e88fc195740a.tar.zst
nixlib-b4ef01e1b734082f3ac3cb7bd3a4e88fc195740a.zip
modules/sway: don't use default extraPackages
By default, programs.sway.enable installs stuff like... urxvt??
-rw-r--r--modules/workstation/windowing/sway/default.nix3
-rw-r--r--modules/workstation/windowing/sway/swaylock/default.nix2
2 files changed, 4 insertions, 1 deletions
diff --git a/modules/workstation/windowing/sway/default.nix b/modules/workstation/windowing/sway/default.nix
index 22de51a801be..ecd0a004a051 100644
--- a/modules/workstation/windowing/sway/default.nix
+++ b/modules/workstation/windowing/sway/default.nix
@@ -26,10 +26,11 @@ in
   };
 
   config = {
-    environment.systemPackages = with pkgs; [ bemenu choose ];
+    environment.systemPackages = with pkgs; [ bemenu choose swayidle ];
 
     programs.sway.enable = true;
     programs.sway.wallpaper = callPackage ./wallpaper.nix { };
+    programs.sway.extraPackages = []; # extra packages can go in systemPackages.
 
     programs.swayidle.enable = true;
 
diff --git a/modules/workstation/windowing/sway/swaylock/default.nix b/modules/workstation/windowing/sway/swaylock/default.nix
index ac556643f795..be15c87ade32 100644
--- a/modules/workstation/windowing/sway/swaylock/default.nix
+++ b/modules/workstation/windowing/sway/swaylock/default.nix
@@ -3,6 +3,8 @@
 {
   imports = [ ../../../../xdg ];
 
+  environment.systemPackages = with pkgs; [ swaylock ];
+
   users.users.qyliss.xdg.config.paths."swaylock/config" = pkgs.substituteAll {
     src = ./config.in;
     wallpaper = config.programs.sway.wallpaper;