summaryrefslogtreecommitdiff
path: root/x
diff options
context:
space:
mode:
Diffstat (limited to 'x')
-rw-r--r--x/default.nix43
-rw-r--r--x/xorg.conf6
2 files changed, 0 insertions, 49 deletions
diff --git a/x/default.nix b/x/default.nix
deleted file mode 100644
index a060701..0000000
--- a/x/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
- 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.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
-
-${config.xorgConfExtra}
-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
- '';
-}
diff --git a/x/xorg.conf b/x/xorg.conf
deleted file mode 100644
index 04f72e6..0000000
--- a/x/xorg.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "InputClass"
- Identifier "system-keyboard"
- MatchIsKeyboard "on"
- Option "XkbLayout" "us"
- Option "XkbOptions" "caps:swapescape"
-EndSection