diff options
Diffstat (limited to 'modules/desktop')
| -rw-r--r-- | modules/desktop/bspwm/default.nix | 6 | ||||
| -rw-r--r-- | modules/desktop/default.nix | 17 |
2 files changed, 15 insertions, 8 deletions
diff --git a/modules/desktop/bspwm/default.nix b/modules/desktop/bspwm/default.nix index d402035..2dc3f91 100644 --- a/modules/desktop/bspwm/default.nix +++ b/modules/desktop/bspwm/default.nix @@ -36,7 +36,11 @@ for monitor in $(xrandr -q | grep -w 'connected' | cut -d' ' -f1); do bspc monitor "$monitor" -d '1' '2' '3' '4' '5' '6' done -polybar-msg cmd restart + +${config.services.polybar.script} +${if config.tools.feh.enable then + "${pkgs.feh}/bin/feh --bg-scale ${../../../assets/skeleton-mage.png}" +else "xsetroot -solid \"${config.scheme.withHashtag.base00}\""} ''; }; } diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index dbb8087..bdf29ae 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -15,14 +15,17 @@ xdg.enable = true; xsession.enable = true; - xsession.windowManager.command = lib.mkForce " + home.file.".xinitrc" = { + text = '' #!/bin/sh -${if config.tools.feh.enable then - "${pkgs.feh}/bin/feh --bg-scale ${../../assets/skeleton-mage.png}" -else "xsetroot -solid \"${config.scheme.withHashtag.base00}\""} -pkill sxhkd -sxhkd & + +[ -f ~/.Xresources ] && xrdb -merge ~/.Xresources +[ -f ~/.profile ] && . ~/.profile +[ -f ~/.xsession ] && . ~/.xsession + exec ${pkgs.bspwm}/bin/bspwm -"; +''; + executable = true; + }; }; } |