aboutsummaryrefslogtreecommitdiffstats
path: root/modules/desktop/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'modules/desktop/default.nix')
-rw-r--r--modules/desktop/default.nix17
1 files changed, 10 insertions, 7 deletions
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;
+ };
};
}