diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index ad3fd62..a8069f9 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,4 +1,4 @@ -let mapleader ="/" +let mapleader ="=" if ! filereadable(system('echo -n "${XDG_CONFIG_HOME:-$HOME/.config}/nvim/autoload/plug.vim"')) echo "Downloading junegunn/vim-plug to manage plugins..." diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index d23b3b6..e131e5c 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -251,7 +251,7 @@ myScratchPads = [ NS "terminal" spawnTerm findTerm manageTerm h = 0.9 w = 0.9 t = 0.95 -h - l = 0.95 -w + l = 0.95 -w spawnCalc = "qalculate-gtk" findCalc = className =? "Qalculate-gtk" manageCalc = customFloating $ W.RationalRect l t w h @@ -319,7 +319,7 @@ myStandardEZKeys = , ("M-w", sendMessage (IncMasterN 1)) -- increment windows in master , ("M-v", sendMessage (IncMasterN (-1))) -- decrement windows in master , ("M-", sendMessage ToggleStruts) -- toggle bar - + -- NOTE Scratchpads -- NOTE Toggle show/hide these programs. They run on a hidden workspace. -- NOTE When you toggle them to show, it brings them to your current workspace. @@ -334,7 +334,7 @@ myStandardEZKeys = , ("C-g t", goToSelected $ mygridConfig myColorizer) -- goto selected window , ("C-g b", bringSelected $ mygridConfig myColorizer) -- bring selected window - --NOTE my custom keybind/script combinations + --NOTE my custom keybind/script combinations --NOTE system controls , ("M-S-s", spawn "dmenuprompt \"Are you sure you want to Shutdown?\" \"shutdown now\"") -- prompt computer shutdown , ("M-S-r", spawn "dmenuprompt \"Are you sure you want to Restart?\" \"reboot\"") -- prompt computer restart @@ -343,17 +343,17 @@ myStandardEZKeys = --NOTE bitwarden controls , ("M-S-x", spawn "$HOME/.local/bin/bw-unlock") -- unlock bitwarden cli , ("M-x", spawn "$HOME/.local/bin/passwords") -- get password from bw cli - + --NOTE demenu search and browser , ("M-s s", spawn "dmenusearch") -- launch searcher (dmenu and surf) , ("M-s d", spawn "dmenusearch duckduckgo") -- launch searcher, default to duckduckgo - + --NOTE my default browser pages - , ("C-b o", spawn "surf 192.168.2.101:8080") -- open openhab in surf - , ("C-b h", spawn "surf 'https://pve.inkletblot.com:8006'") -- open pve (hypervisor) in surf - , ("C-b p", spawn "surf 'https://app.plex.tv'") -- open plex in surf - , ("C-b c", spawn "surf 'https://calendar.protonmail.com'") -- open protoncalendar in surf - , ("C-b m", spawn "surf 'https://mail.protonmail.com'") -- open protonmail in surf + , ("M-b o", spawn "surf 192.168.2.101:8080") -- open openhab in surf + , ("M-b h", spawn "surf 'https://pve.inkletblot.com:8006'") -- open pve (hypervisor) in surf + , ("M-b p", spawn "surf 'https://app.plex.tv'") -- open plex in surf + , ("M-b c", spawn "surf 'https://calendar.protonmail.com'") -- open protoncalendar in surf + , ("M-b m", spawn "surf 'https://mail.protonmail.com'") -- open protonmail in surf --NOTE drive mounting , ("M-d m", spawn "dmenumount") -- launch mounter @@ -371,8 +371,7 @@ myStandardEZKeys = --NOTE extras , ("M-S-/", spawn "xmonad-keys-help") -- show keybinds - , ("", spawn "screenshot") -- take full (all monitors) screenshot - , ("M-", spawn "flameshot gui") -- launch flameshot for snipping + , ("M-", spawn "maimpick") -- take full screenshot ] -- The following lines are needed for named scratchpads. where nonNSP = WSIs (return (\ws -> W.tag ws /= "NSP")) @@ -409,7 +408,7 @@ myMouseBindings XConfig {XMonad.modMask = modm} = M.fromList -- Set ezKeys myEZKeys :: [(String, X ())] -myEZKeys = +myEZKeys = if isLaptop then (myStandardEZKeys ++ myLaptopEZKeys) else myStandardEZKeys @@ -488,7 +487,7 @@ myLayout = avoidStruts $ mouseResize $ windowArrange $ T.toggleLayouts floats where -- I've commented out the layouts I don't use. myDefaultLayout = - tall + tall ||| noBorders monocle ||| noBorders tabs -- unused layouts @@ -583,7 +582,7 @@ myStartupHook = do spawnOnce "trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x282a36 --height 20 &" -- Laptop things - if isLaptop + if isLaptop then spawnOnce "powerkit" else spawnOnce "" ------------------------------------------------------------------------ @@ -641,7 +640,7 @@ mainDesktop = do , ppOrder = \(ws:l:t:ex) -> [ws,l] }, startupHook = myStartupHook - } `additionalKeysP` myEZKeys + } `additionalKeysP` myEZKeys -- Define main for running on laptops