.gitignore

@@ -41,10 +41,6 @@ flycheck_*.el
 # projectiles files
 .projectile
 
-# direnv
-/.direnv/
-.direnv
-
 # network security
 /network-security.data
 

users/ellmau/conf/xmonad/xmonad.hs

@@ -30,50 +30,13 @@ import XMonad.Layout.Grid
 import XMonad.Layout.Tabbed
 import XMonad.Layout.Renamed
 import XMonad.Layout.ThreeColumns
-import XMonad.Layout.PerWorkspace
 
 main :: IO ()
 main' :: D.Client -> IO ()
 main = mkDbusClient >>= main'
 
 workSpaces = ["code", "web", "misc", "comm"] ++ map show ([5 .. 9] ++ [0])
-layout :: XMonad.Layout.LayoutModifier.ModifiedLayout
-  SmartBorder
-  (XMonad.Layout.LayoutModifier.ModifiedLayout
-     AvoidStruts
-     (PerWorkspace
-        (Choose
-           (XMonad.Layout.LayoutModifier.ModifiedLayout Rename ThreeCol)
-           (Choose
-              Tall
-              (Choose
-                 (Mirror Tall)
-                 (Choose
-                    Grid
-                    (Choose
-                       Full
-                       (XMonad.Layout.LayoutModifier.ModifiedLayout
-                          (XMonad.Layout.Decoration.Decoration
-                             TabbedDecoration XMonad.Layout.Decoration.DefaultShrinker)
-                          XMonad.Layout.Simplest.Simplest))))))
-        (Choose
-           Tall
-           (Choose
-              (Mirror Tall)
-              (Choose
-                 Grid
-                 (Choose
-                    Full
-                    (Choose
-                       (XMonad.Layout.LayoutModifier.ModifiedLayout
-                          (XMonad.Layout.Decoration.Decoration
-                             TabbedDecoration XMonad.Layout.Decoration.DefaultShrinker)
-                          XMonad.Layout.Simplest.Simplest)
-                       (XMonad.Layout.LayoutModifier.ModifiedLayout
-                          Rename ThreeCol))))))))
-  Window
 layout = smartBorders $ avoidStruts $
-  onWorkspace "comm" (threemid ||| tall ||| Mirror tall  ||| Grid ||| Full ||| simpleTabbed) $
   (tall ||| Mirror tall  ||| Grid ||| Full ||| simpleTabbed ||| threemid)
   where tall = Tall 1 (3/100) (1/2)
         threemid = renamed [AppendWords "Mid"] $ ThreeColMid 1 (3/100) (1/2)
@@ -87,10 +50,9 @@ main' dbus = do
       , modMask = mod4Mask -- rebind mod to super key
       , keys = keyMap
       , manageHook = myHookManager
-      , startupHook = do -- autostart
+      , startupHook = do
           startupHook def
           spawn "autorandr -c"
-          spawn "keepassxc"
       , workspaces = workSpaces
       }
 
@@ -136,7 +98,7 @@ keyMap c = mkKeymap c $
   , ("M-S-e"           , sendToScreen def 1)
   , ("M-S-r"           , sendToScreen def 2)
   , ("M-t"             , withFocused $ windows . W.sink)
-  , ("M-C-l"           , spawn "betterlockscreen -l")
+  , ("M-C-l"           , spawn "betterlockscreen -l --show-layout -u ~/.background-image.png")
   , ("M-S-<Tab>"       , spawn keyboardtoggle)
   ] ++
   [(m ++ k, windows $ f w)
@@ -162,24 +124,10 @@ myHookManager = composeAll [ manageDocks
                            , className =? "Element" --> doShift "comm"
                            , className =? "firefox" --> doShift "web"
                            , className =? "thunderbird" --> doShift "comm"
-                           , className =? "KeePassXC" --> doFloat
-                           , (className =? zoomClassName) <&&> shouldFloat <$> title --> doFloat
-                           , (className =? zoomClassName) <&&> shouldSink <$> title --> doSink
                            , isFullscreen --> doFullFloat
                            , placeHook $ withGaps (32, 32, 32, 32) $ smart (0.5, 0.5)
                            , manageHook def
                            ]
-                where
-                  zoomClassName = "zoom"
-                  titleTitles =
-                    [ "Zoom - Free Account" -- main window
-                    , "Zoom - Licensed Account" -- main window
-                    , "Zoom" -- meeting window
-                    , "Zoom Meeting" -- meeting window shortly after creation
-                    ]
-                  shouldFloat title = title `notElem` titleTitles
-                  shouldSink title = title `elem` titleTitles
-                  doSink = (ask >>= doF . W.sink) <+> doF W.swapDown
    
 polybarHook :: D.Client -> PP
 polybarHook dbus =
@@ -208,7 +156,6 @@ fadeHook act inact = fadeOutLogHook $ fadeAllBut exceptions act inact
                    <||> className =? "Chromium-browser"
                    <||> className =? "Emacs"
                    <||> className =? "thunderbird"
-                   <||> className =? "element"
 
 fadeAllBut :: Query Bool -> Rational -> Rational -> Query Rational
 fadeAllBut qry amt inact = do isInactive <- isUnfocused