awesome/default.nix

@@ -11,7 +11,12 @@
     name = "xorg-inner-env";
     paths = [
       pkgs.xorg.xorgserver
+      pkgs.xorg.xinit
+      pkgs.xorg.xauth
+      pkgs.xorg.xset
       pkgs.xorg.xf86inputlibinput
+      pkgs.xorg.xrandr
+      pkgs.xsel
 
       (pkgs.runCommand "xorg-conf-inner" {} ''
          mkdir -p "$out"/share/X11/xorg.conf.d/
@@ -34,6 +39,12 @@ EOF
     done
   '';
 
+  startx = pkgs.writeShellScriptBin "startx-awesome" ''
+    # TODO pass .xinitrc into here, somehow
+    export XORGCONFIG=${xorgConf}
+    exec startx
+  '';
+
   # nativeWrap is used for apps which are not installed via nix which don't play
   # nicely with it.
   nativeWrap = pkgs.writeScriptBin "native-wrap" ''
@@ -55,15 +66,14 @@ EOF
     wp_dir = "${wp}/"
   '';
 
-  # awesomeInner is what is started up by startx, within an X session.
-  awesomeInner = pkgs.writeScript "awesome" ''
+  awesome = pkgs.writeScriptBin "awesome" ''
     #!${pkgs.bash}/bin/bash
 
     set -e -x
 
     # Turn off powersaving (fuck the environment)
-    ${pkgs.xorg.xset}/bin/xset -dpms
-    ${pkgs.xorg.xset}/bin/xset s off
+    xset -dpms
+    xset s off
 
     ${config.awesome.startupExtra}
 
@@ -99,11 +109,6 @@ EOF
       2>&1 2>>$this_log
   '';
 
-  awesome = pkgs.writeShellScriptBin "awesome" ''
-    export XORGCONFIG=${xorgConf}
-    exec startx ${awesomeInner}
-  '';
-
   env = pkgs.buildEnv {
     name = "awesome-env";
     paths = [
@@ -111,7 +116,9 @@ EOF
 
       # We only include utilities in here which are directly used by awesome.
       # General purpose applications go in the root default.nix env.
-      pkgs.xorg.xinit
+      pkgs.pavucontrol
+      pkgs.xdg-utils
+      pkgs.arandr
       pkgs.scrot
       pkgs.feh
       pkgs.brightnessctl
@@ -121,6 +128,7 @@ EOF
       xorgInnerEnv
       nativeWrap
       awesome
+      startx
     ];
   };
 }

default.nix

@@ -114,11 +114,6 @@ in rec {
       pkgs.sylpheed
       pkgs.calibre
       pkgsEdge.lagrange
-      pkgs.pavucontrol
-      pkgs.xdg-utils
-      pkgs.arandr
-      pkgs.xsel
-      pkgs.xorg.xrandr
 
       bin
       ((import ./nvim) {}).nvim

zsh/default.nix

@@ -18,7 +18,7 @@
     plugins=(git vi-mode)
     source $ZSH/oh-my-zsh.sh
 
-    export BROWSER=${config.browser}
+    export BROWSER=${config.browser}/bin/browser
 
     . ${./zshrc}
     . ${./aliases}