Include xorg as part of loadout, so it's not required on host system

Makefile

@@ -9,7 +9,7 @@ setup-pulseaudio:
 #      - use lsblk -o NAME,UUID to get UUID
 install-rm-keyfile:
 	sudo cp ./base/rm-keyfile.service /etc/systemd/system
-	sudo systemctl daemon-reload
+	sudo systemctl enable rm-keyfile.service
 
 install-pamd:
 	drv=$$(nix-instantiate -E '((import ./pkgs.nix).stable {}).i3lock'); \

awesome/default.nix

@@ -50,7 +50,6 @@
       pkgs.cbatticon
       pkgs.phwmon
 
-      pkgs.castor
       pkgs2305.libreoffice
       pkgs.gimp
       pkgs.inkscape
@@ -74,6 +73,8 @@
   awesome = pkgs.writeScriptBin "awesome" ''
     #!${pkgs.bash}/bin/bash
 
+    set -e -x
+
     export BROWSER=${browser}/bin/browser
 
     # Turn off powersaving (fuck the environment)
@@ -98,7 +99,7 @@
     # Init awesome
 
     data_dir="$HOME/.local/share/awesome";
-    mkdir -p "$dataDir"
+    mkdir -p "$data_dir"
 
     log_dir="$data_dir"/logs
     mkdir -p $log_dir

default.nix

@@ -48,6 +48,8 @@ in rec {
       pkgs.gawk
       pkgs.tree
       pkgs.pv
+      pkgs.less
+      pkgs.tmux
 
       git
       pkgs.mercurial
@@ -69,8 +71,6 @@ in rec {
       pkgs.sshfs
       pkgs.fuse3
 
-      pkgs.tmux
-
       pkgs.ncdu
       pkgs.htop
       pkgs.jnettop
@@ -91,6 +91,7 @@ in rec {
       zsh
       ((import ./alacritty) { inherit config zsh; }).alacritty
       ((import ./awesome) { inherit config; }).awesome
+      ((import ./x) { inherit config; }).startx
     ];
   };
 

x/default.nix

@@ -0,0 +1,41 @@
+{
+  config,
+}: rec {
+
+  pkgs = (import ../pkgs.nix).stable {};
+
+  innerEnv = pkgs.buildEnv {
+    name = "x-inner-env";
+    paths = [
+      pkgs.xorg.xorgserver
+      pkgs.xorg.xinit
+      pkgs.xorg.xauth
+      pkgs.xorg.xset
+      #pkgs.xorg.xf86inputevdev
+      pkgs.xorg.xf86inputlibinput
+
+      (pkgs.runCommand "xorg-conf-inner" {} ''
+         mkdir -p "$out"/share/X11/xorg.conf.d/
+         cp ${./xorg.conf} "$out"/share/X11/xorg.conf.d/99-loadout.conf
+       '')
+    ];
+  };
+
+  conf = pkgs.runCommand "xorg-conf" {} ''
+    cat >>"$out" <<EOF
+Section "Files"
+    ModulePath "${innerEnv}/lib/xorg/modules"
+EndSection
+EOF
+
+    for f in $(ls ${innerEnv}/share/X11/xorg.conf.d | sort); do
+      cat ${innerEnv}/share/X11/xorg.conf.d/"$f" >> "$out"
+    done
+  '';
+
+  startx = pkgs.writeShellScriptBin "startx" ''
+    export XORGCONFIG=${conf}
+    export PATH=${innerEnv}/bin:$PATH
+    exec startx
+  '';
+}

zsh/default.nix

@@ -25,6 +25,8 @@
   };
 
   zshrc = pkgs.writeTextDir ".zshrc" ''
+    # Import before anything else, so that we have the full PATH available for everything following
+    . ${pkgs.nix}/etc/profile.d/nix.sh
 
     # oh-my-zsh
     export ZSH=${pkgs.oh-my-zsh}/share/oh-my-zsh
@@ -44,7 +46,6 @@
 
     . ${./zshrc}
     . ${./aliases}
-    . ${pkgs.nix}/etc/profile.d/nix.sh
   '';
 
   zsh = pkgs.writeScriptBin "zsh" ''