git-crypt: setup

[julm/julm-nix.git] / home-manager / profiles / xmonad / xmonad.hs

diff --git a/home-manager/profiles/xmonad/xmonad.hs b/home-manager/profiles/xmonad/xmonad.hs
index 83e87dabafd8c6859aa103797898966741144d60..f0f92b0fcddcfd3587597a4502468c245886ef70 100644 (file)
--- a/home-manager/profiles/xmonad/xmonad.hs
+++ b/home-manager/profiles/xmonad/xmonad.hs
@@ -45,8 +45,6 @@ import XMonad.Util.Run(spawnPipe)
 import XMonad.Util.SpawnOnce
 import qualified XMonad.StackSet as W
 
-doSink = doF . W.sink =<< ask
-
 myKeys
  conf@XConfig{XMonad.modMask} =
   Map.fromList $
@@ -58,23 +56,20 @@ myKeys
   -- Launch a program
   , ((modMask, xK_Menu), spawn "exec gmrun")
   -- Browse the filesystem
-  , ((modMask, xK_BackSpace), spawn "caja")
+  , ((modMask, xK_BackSpace), spawn "nautilus")
 
   -- Lock the screen
-  , ((0, xK_Pause), spawn "xset s activate dpms force off")
+  , ((0, xK_Pause), spawn "systemctl --user start xss-lock.service; xset s activate dpms force off")
 
   -- Take a full screenshot
-  , ((0, xK_Print), spawn "cd ~/img/cap && scrot --quality 42 '%Y-%m-%d_%H-%M-%S.png' && caja ~/img/cap")
+  , ((0, xK_Print), spawn "cd ~/img/cap && scrot --quality 42 '%Y-%m-%d_%H-%M-%S.png' && nautilus ~/img/cap")
   -- Take a selective screenshot
   , ((modMask, xK_Print), spawn "select-screenshot")
 
   -- Volume control
-  , ((0, 0x1008FF12), spawn "amixer -q set Master toggle") -- XF88AudioMute
-  , ((0, 0x1008FF11), spawn "amixer -q set Master 5%-") -- XF86AudioLowerVolume
-  , ((0, 0x1008FF13), spawn "amixer -q set Master 5%+") -- XF86AudioRaiseVolume
-  , ((shiftMask, 0x1008FF12), spawn "amixer -q set PCM toggle") -- XF88AudioMute
-  , ((shiftMask, 0x1008FF11), spawn "amixer -q set PCM 5%-") -- XF86AudioLowerVolume
-  , ((shiftMask, 0x1008FF13), spawn "amixer -q set PCM 5%+") -- XF86AudioRaiseVolume
+  , ((0, 0x1008FF12), spawn "pactl -- set-sink-mute @DEFAULT_SINK@ toggle") -- XF88AudioMute
+  , ((0, 0x1008FF11), spawn "pactl -- set-sink-volume @DEFAULT_SINK@ -5%") -- XF86AudioLowerVolume
+  , ((0, 0x1008FF13), spawn "pactl -- set-sink-volume @DEFAULT_SINK@ +5%") -- XF86AudioRaiseVolume
   -- Audio previous
   -- , ((0, 0x1008FF16), spawn "")
   -- Play/pause
@@ -238,17 +233,12 @@ isWindowSpaceVisible = do
   vs <- gets (map (W.tag . W.workspace) . W.visible . windowset)
   return (\w -> W.tag w `elem` vs)
 
-defaults xmproc _nScreens = ewmh $
+defaults xmproc _nScreens = docks $ ewmhFullscreen $ ewmh $
  azertyConfig
   { borderWidth        = 1
   , focusFollowsMouse  = True
   , focusedBorderColor = "#00b10b"
   , handleEventHook    = handleEventHook def
-                         <+> XMonad.Hooks.EwmhDesktops.fullscreenEventHook
-                         <+> XMonad.Layout.Fullscreen.fullscreenEventHook
-                         <+> docksEventHook
-                             -- causes new docks to appear immediately,
-                             -- instead of waiting for the next focus change.
   , keys               = myKeys
   , layoutHook         = smartBorders $
                          mkToggle (NOBORDERS ?? FULL ?? EOT) $ -- enable temporarily maximizing a window
@@ -338,6 +328,7 @@ defaults xmproc _nScreens = ewmh $
      , inactiveBorderColor = "#7C7C7C"
      , inactiveColor       = "#000000"
      , inactiveTextColor   = "#EEEEEE"
+     , fontName            = "xft:DejaVu Sans Mono:pixelsize=9:antialias=true"
      }
 
 --