|
|
|
@ -11,12 +11,7 @@ |
|
|
|
|
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/ |
|
|
|
@ -39,12 +34,6 @@ 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" '' |
|
|
|
@ -66,14 +55,15 @@ EOF |
|
|
|
|
wp_dir = "${wp}/" |
|
|
|
|
''; |
|
|
|
|
|
|
|
|
|
awesome = pkgs.writeScriptBin "awesome" '' |
|
|
|
|
# awesomeInner is what is started up by startx, within an X session. |
|
|
|
|
awesomeInner = pkgs.writeScript "awesome" '' |
|
|
|
|
#!${pkgs.bash}/bin/bash |
|
|
|
|
|
|
|
|
|
set -e -x |
|
|
|
|
|
|
|
|
|
# Turn off powersaving (fuck the environment) |
|
|
|
|
xset -dpms |
|
|
|
|
xset s off |
|
|
|
|
${pkgs.xorg.xset}/bin/xset -dpms |
|
|
|
|
${pkgs.xorg.xset}/bin/xset s off |
|
|
|
|
|
|
|
|
|
${config.awesome.startupExtra} |
|
|
|
|
|
|
|
|
@ -109,6 +99,11 @@ EOF |
|
|
|
|
2>&1 2>>$this_log |
|
|
|
|
''; |
|
|
|
|
|
|
|
|
|
awesome = pkgs.writeShellScriptBin "awesome" '' |
|
|
|
|
export XORGCONFIG=${xorgConf} |
|
|
|
|
exec startx ${awesomeInner} |
|
|
|
|
''; |
|
|
|
|
|
|
|
|
|
env = pkgs.buildEnv { |
|
|
|
|
name = "awesome-env"; |
|
|
|
|
paths = [ |
|
|
|
@ -116,9 +111,7 @@ EOF |
|
|
|
|
|
|
|
|
|
# We only include utilities in here which are directly used by awesome. |
|
|
|
|
# General purpose applications go in the root default.nix env. |
|
|
|
|
pkgs.pavucontrol |
|
|
|
|
pkgs.xdg-utils |
|
|
|
|
pkgs.arandr |
|
|
|
|
pkgs.xorg.xinit |
|
|
|
|
pkgs.scrot |
|
|
|
|
pkgs.feh |
|
|
|
|
pkgs.brightnessctl |
|
|
|
@ -128,7 +121,6 @@ EOF |
|
|
|
|
xorgInnerEnv |
|
|
|
|
nativeWrap |
|
|
|
|
awesome |
|
|
|
|
startx |
|
|
|
|
]; |
|
|
|
|
}; |
|
|
|
|
} |
|
|
|
|