diff options
author | Minijackson <minijackson@riseup.net> | 2023-01-28 23:32:13 +0100 |
---|---|---|
committer | Minijackson <minijackson@riseup.net> | 2023-01-28 23:32:13 +0100 |
commit | d9ba0d35aa77f29acc049895e4a2da111f9d6176 (patch) | |
tree | cd878ddcf1f5b7c7c6c02fd744ad2cc72b29f542 | |
parent | 7063c86054d954a3464978162becab43e49a60c7 (diff) | |
download | nixos-config-reborn-d9ba0d35aa77f29acc049895e4a2da111f9d6176.tar.gz nixos-config-reborn-d9ba0d35aa77f29acc049895e4a2da111f9d6176.zip |
sway: use hm's osConfig, remove unneeded target
-rw-r--r-- | usecases/desktop/graphical/sway.nix | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/usecases/desktop/graphical/sway.nix b/usecases/desktop/graphical/sway.nix index 101c7cf..2586105 100644 --- a/usecases/desktop/graphical/sway.nix +++ b/usecases/desktop/graphical/sway.nix | |||
@@ -4,15 +4,17 @@ _inputs: { | |||
4 | pkgs, | 4 | pkgs, |
5 | system, | 5 | system, |
6 | ... | 6 | ... |
7 | }: let | 7 | }: { |
8 | globalConfig = config; | ||
9 | in { | ||
10 | services.greetd = { | 8 | services.greetd = { |
11 | enable = true; | 9 | enable = true; |
12 | settings.default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway"; | 10 | settings.default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway"; |
13 | }; | 11 | }; |
14 | 12 | ||
15 | home-manager.users.minijackson = {config, ...}: { | 13 | home-manager.users.minijackson = { |
14 | config, | ||
15 | osConfig, | ||
16 | ... | ||
17 | }: { | ||
16 | wayland.windowManager.sway = { | 18 | wayland.windowManager.sway = { |
17 | enable = true; | 19 | enable = true; |
18 | 20 | ||
@@ -40,7 +42,7 @@ in { | |||
40 | # Using waybar | 42 | # Using waybar |
41 | bars = []; | 43 | bars = []; |
42 | 44 | ||
43 | colors = with globalConfig.theme.colors; { | 45 | colors = with osConfig.theme.colors; { |
44 | focused = { | 46 | focused = { |
45 | border = lightBackground; | 47 | border = lightBackground; |
46 | background = lightBackground; | 48 | background = lightBackground; |
@@ -195,7 +197,7 @@ in { | |||
195 | }; | 197 | }; |
196 | 198 | ||
197 | # TODO: upstream a PR to beautify this | 199 | # TODO: upstream a PR to beautify this |
198 | xdg.configFile."swaylock/config".text = with globalConfig.theme.colors; '' | 200 | xdg.configFile."swaylock/config".text = with osConfig.theme.colors; '' |
199 | ignore-empty-password | 201 | ignore-empty-password |
200 | image=${../../../res/wallpapers/wallpaper-1920x1080-install-gentoo.png} | 202 | image=${../../../res/wallpapers/wallpaper-1920x1080-install-gentoo.png} |
201 | 203 | ||
@@ -246,16 +248,6 @@ in { | |||
246 | "XDG_CURRENT_DESKTOP" | 248 | "XDG_CURRENT_DESKTOP" |
247 | "XDG_SESSION_TYPE" | 249 | "XDG_SESSION_TYPE" |
248 | ]; | 250 | ]; |
249 | |||
250 | systemd.user.targets.sway-session = { | ||
251 | Unit = { | ||
252 | Description = "sway compositor session"; | ||
253 | Documentation = ["man:systemd.special(7)"]; | ||
254 | BindsTo = ["graphical-session.target"]; | ||
255 | Wants = ["graphical-session-pre.target"]; | ||
256 | After = ["graphical-session-pre.target"]; | ||
257 | }; | ||
258 | }; | ||
259 | }; | 251 | }; |
260 | 252 | ||
261 | # TODO: polkit gnome | 253 | # TODO: polkit gnome |