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-", spawn "i3lock -i /var/lib/wallpaper/wallpaper -f") - , ("M4-p", spawn "passmenu --type") - , ("", spawn "pactl -- set-sink-volume 0 +4%") - , ("", spawn "pactl -- set-sink-volume 0 -4%") - , ("", spawn "pactl -- set-sink-mute 0 toggle") - , ("", spawn "pactl -- set-source-mute 1 toggle") + , ("M4-p", spawn "${pkgs.pass}/bin/passmenu --type") + , ("", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume 0 +4%") + , ("", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-volume 0 -4%") + , ("", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-sink-mute 0 toggle") + , ("", spawn "${pkgs.pulseaudioLight.out}/bin/pactl -- set-source-mute 1 toggle") , ("", gridselectWorkspace gridConfig W.view) , ("", spawn "xbacklight -steps 1 -time 1 -inc 3") , ("", spawn "xbacklight -steps 1 -time 1 -dec 3")