From b4ef01e1b734082f3ac3cb7bd3a4e88fc195740a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 17 Apr 2021 00:09:02 +0000 Subject: modules/sway: don't use default extraPackages By default, programs.sway.enable installs stuff like... urxvt?? --- modules/workstation/windowing/sway/default.nix | 3 ++- modules/workstation/windowing/sway/swaylock/default.nix | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) 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; -- cgit 1.4.1