|
|
|
@ -23,14 +23,10 @@ in |
|
|
|
|
|
|
|
|
|
extraConfig = with pkgs; |
|
|
|
|
let |
|
|
|
|
fehCmd = "${feh}/bin/feh --bg-fill ${cfg.wallpaper}"; |
|
|
|
|
picomCmd = ""; |
|
|
|
|
nmCmd = if cfg.networkmanager |
|
|
|
|
then "exec_always --no-startup-id ${networkmanagerapplet}/bin/nm-applet" |
|
|
|
|
else ""; |
|
|
|
|
fehCommand = "${feh}/bin/feh --bg-fill ${cfg.wallpaper}"; |
|
|
|
|
in |
|
|
|
|
'' |
|
|
|
|
# Setup compositor // TODO: gate this on the hm-module |
|
|
|
|
# Setup compositor |
|
|
|
|
exec_always --no-startup-id "${coreutils}/bin/pkill picom; ${picom}/bin/picom --config ~/.config/i3/picom.conf" |
|
|
|
|
|
|
|
|
|
# Make CAPSLOCK into ESC because it's 2018 |
|
|
|
@ -42,11 +38,8 @@ in |
|
|
|
|
exec_always --no-startup-id "${xorg.xmodmap}/bin/setxkbmap -layout us -variant altgr-intl -option caps:hyper" |
|
|
|
|
exec ${xcape}/bin/xcape -e "#66=Escape" -t 150 |
|
|
|
|
|
|
|
|
|
# Set the desired wallpaper |
|
|
|
|
exec_always --no-startup-id ${fehCmd} |
|
|
|
|
|
|
|
|
|
# Start nm-applet if networkmanager is enabled |
|
|
|
|
${nmCmd} |
|
|
|
|
# Always set a wallpaper |
|
|
|
|
exec_always --no-startup-id ${fehCommand} |
|
|
|
|
|
|
|
|
|
bar { |
|
|
|
|
status_command ${i3status}/bin/i3status -c ~/.config/i3/i3status.conf |
|
|
|
|