summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-06-30 17:24:50 +0200
committerlassulus <lass@aidsballs.de>2016-06-30 17:24:50 +0200
commite63519c6cc5c85642cb3fb6b4ad81ef8ba3c8d3f (patch)
treedefa466cc903959b45f8669ca37bd3a68398f198
parent6a1619fafd6b5dac51fc44b4ebd8261286b7aa27 (diff)
l: get xmonad script not by path
-rw-r--r--lass/2configs/xserver/default.nix3
-rw-r--r--lass/5pkgs/xmonad-lass.nix12
2 files changed, 6 insertions, 9 deletions
diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index 80c947a7b..73b148bf7 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -91,9 +91,6 @@ let
set -efu
export PATH; PATH=${makeSearchPath "bin" ([
pkgs.rxvt_unicode
- pkgs.i3lock
- pkgs.pulseaudioLight
- pkgs.xorg.xbacklight
] ++ config.environment.systemPackages)}:/var/setuid-wrappers
settle() {(
# Use PATH for a clean journal
diff --git a/lass/5pkgs/xmonad-lass.nix b/lass/5pkgs/xmonad-lass.nix
index 841821a7a..c07bd2b83 100644
--- a/lass/5pkgs/xmonad-lass.nix
+++ b/lass/5pkgs/xmonad-lass.nix
@@ -46,7 +46,7 @@ import XMonad.Util.EZConfig (additionalKeysP)
myTerm :: String
-myTerm = "urxvtc"
+myTerm = "${pkgs.rxvt_unicode}/bin/urxvtc"
myFont :: String
myFont = "-schumacher-*-*-*-*-*-*-*-*-*-*-*-iso10646-*"
@@ -108,11 +108,11 @@ displaySomeException = displayException
myKeyMap :: [([Char], X ())]
myKeyMap =
[ ("M4-<F11>", spawn "i3lock -i /var/lib/wallpaper/wallpaper -f")
- , ("M4-p", spawn "passmenu --type")
- , ("<XF86AudioRaiseVolume>", spawn "pactl -- set-sink-volume 0 +4%")
- , ("<XF86AudioLowerVolume>", spawn "pactl -- set-sink-volume 0 -4%")
- , ("<XF86AudioMute>", spawn "pactl -- set-sink-mute 0 toggle")
- , ("<XF86AudioMicMute>", spawn "pactl -- set-source-mute 1 toggle")
+ , ("M4-p", spawn "${pkgs.pass}/bin/passmenu --type")
+ , ("<XF86AudioRaiseVolume>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume 0 +4%")
+ , ("<XF86AudioLowerVolume>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume 0 -4%")
+ , ("<XF86AudioMute>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-mute 0 toggle")
+ , ("<XF86AudioMicMute>", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-source-mute 1 toggle")
, ("<XF86Launch1>", gridselectWorkspace gridConfig W.view)
, ("<XF86MonBrightnessUp>", spawn "xbacklight -steps 1 -time 1 -inc 3")
, ("<XF86MonBrightnessDown>", spawn "xbacklight -steps 1 -time 1 -dec 3")