bash: add ffmpeg-{opus,audio}

[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 d63f14199c48d5234edc1ab04b83a348a99b77fd..c3d7f06760240a158aea341f8cfcaa161e5e0e38 100644 (file)
--- a/home-manager/profiles/xmonad/xmonad.hs
+++ b/home-manager/profiles/xmonad/xmonad.hs
@@ -54,12 +54,12 @@ myKeys
   -- Start a terminal
     ((modMask, xK_Return), spawn $ XMonad.terminal conf)
   -- Launch a program
-  , ((modMask, xK_Menu), spawn "exec gmrun")
+  , ((modMask, xK_Menu), spawn "exec rofi -show run -no-disable-history -run-command \"bash -c 'systemd-run --user --unit=app-org.rofi.\\$(systemd-escape \\\"{cmd}\\\")@\\$RANDOM -p CollectMode=inactive-or-failed {cmd}'\"")
   -- Browse the filesystem
-  , ((modMask, xK_BackSpace), spawn "caja")
+  , ((modMask, xK_BackSpace), spawn "systemd-run --user --unit=app-org.rofi.caja@$RANDOM -p CollectMode=inactive-or-failed caja")
 
   -- 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")
@@ -67,12 +67,9 @@ myKeys
   , ((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
@@ -86,6 +83,9 @@ myKeys
   , ((modMask, xK_Escape), kill)
   , ((modMask, xK_q), kill)
 
+  -- Clipboard
+  , ((modMask, xK_c), spawn "clipster --select --primary")
+
   -- Temporarily maximize a window
   , ((modMask, xK_f), sendMessage $ XMonad.Layout.MultiToggle.Toggle FULL)
   -- , ((modMask, xK_f), withFocused (sendMessage . maximizeRestore))
@@ -236,17 +236,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
@@ -266,7 +261,8 @@ defaults xmproc _nScreens = ewmh $
                          , manageDocks -- NOTE: do not tile dock windows
                          , resource  =? "desktop_window" --> doIgnore
                          , className =? "Gimp"           --> doFloat
-                         , resource  =? "gpicview"       --> doFloat
+                         , resource  =? "gpicview"       --> doSink
+                         , className =? "mpv"            --> doFloat
                          --, className =? "MPlayer"        --> doShift "3:media" -- <+> doFloat
                          --, className =? "vlc"            --> doShift "3:media"
                          , className =? "stalonetray"    --> doIgnore
@@ -282,9 +278,10 @@ defaults xmproc _nScreens = ewmh $
                        <+> spawn "xset b off"
                        <+> spawn "xhost local:root"
                        <+> spawn "setxkbmap -option keypad:pointerkeys"
+                       -- Useful for programs launched by rofi
+                       <+> spawnOnce "exec systemctl --user import-environment GNUPGHOME PASSWORD_STORE_DIR PATH"
                        -- <+> spawnOnce "exec arbtt-capture -r 60"
                        -- <+> spawnOnce "exec parcellite"
-                       -- <+> spawnOnce "exec urxvtd -o -q"
                        -- <+> spawnOnce "exec xautolock"
                        -- <+> spawnOnce "exec redshift-gtk -l -45.7800:1.9700 -t 6500:3700"
                        <+> spawnOnce "exec nm-applet"
@@ -320,7 +317,7 @@ defaults xmproc _nScreens = ewmh $
                     _                      -> s
     , ppOutput  = hPutStrLn xmproc
     , ppSep     = "  "
-    , ppTitle   = xmobarColor "white" "black" . shorten 100
+    , ppTitle   = xmobarColor "white" "black" . shorten 50
     , ppUrgent  = xmobarColor "yellow" "black"
     , ppWsSep   = " "
     }
@@ -335,6 +332,7 @@ defaults xmproc _nScreens = ewmh $
      , inactiveBorderColor = "#7C7C7C"
      , inactiveColor       = "#000000"
      , inactiveTextColor   = "#EEEEEE"
+     , fontName            = "Hack 7"
      }
 
 --