diff --git a/.config/xmobar/xmobarrc-single.hs b/.config/xmobar/xmobarrc-single.hs index 34d6edf..51fc59e 100644 --- a/.config/xmobar/xmobarrc-single.hs +++ b/.config/xmobar/xmobarrc-single.hs @@ -13,7 +13,7 @@ Config { -- layout , sepChar = "%" -- delineator between plugin names and straight text , alignSep = "}{" -- separator between left-right alignment - , template = " %cpu% %memory% %dynnetwork% | %UnsafeStdinReader% }{ %date% | %YPAD% | %updates% %trayerpad%" + , template = " %cpu% %memory% %network% %volume% | %UnsafeStdinReader% }{ %keyboard% | %date% | %YPAD% | %updates% %trayerpad%" -- general behavior , lowerOnStart = True -- send to bottom of window stack on start @@ -64,16 +64,16 @@ Config { -- ] 10 -- network activity monitor (dynamic interface resolution) - , Run DynNetwork [ "--template" , "net: kB/s kB/s" - , "--Low" , "100000" -- units: B/s - , "--High" , "500000" -- units: B/s - , "--low" , "#50fa7b" - , "--normal" , "#ffb86c" - , "--high" , "#ff5555" - ] 10 + -- , Run DynNetwork [ "--template" , "net: kB/s kB/s" + -- , "--Low" , "100000" -- units: B/s + -- , "--High" , "500000" -- units: B/s + -- , "--low" , "#50fa7b" + -- , "--normal" , "#ffb86c" + -- , "--high" , "#ff5555" + -- ] 10 -- cpu activity monitor - , Run Cpu [ "--template" , "cpu: %" + , Run Cpu [ "--template" , "cpu %" , "--Low" , "30" -- units: % , "--High" , "60" -- units: % , "--low" , "#50fa7b" @@ -83,7 +83,7 @@ Config { -- memory usage monitor -- , Run Memory [ "--template" ,"mem: % (Mb)" - , Run Memory [ "--template" ,"mem: %" + , Run Memory [ "--template" ,"mem %" , "--Low" , "20" -- units: % , "--High" , "70" -- units: % , "--low" , "#50fa7b" @@ -116,10 +116,19 @@ Config { -- , Run Com "uname" ["-r"] "" 3600 -- Runs a simple script that counts the number of system updates to apply - , Run Com "/home/solomon/.config/xmobar/count-updates.sh" [] "updates" 3600 + , Run Com "xmobar-status-updates" [] "updates" 3600 -- Script that dynamically adjusts xmobar padding depending on number of trayer icons. - , Run Com "/home/solomon/.config/xmobar/trayer-padding-icon.sh" [] "trayerpad" 20 + , Run Com "xmobar-trayer-padding-icon" [] "trayerpad" 20 + + -- Script that pulls network information and builds string to display + , Run Com "xmobar-status-net" [] "network" 5 + + -- Script that pulls keyboard layout and builds string to display + , Run Com "xmobar-status-keyboard" [] "keyboard" 20 + + -- Script that pulls volume related data and builds string to dislpay + , Run Com "xmobar-status-vol" [] "volume" 5 -- Prints out the left side items such as workspaces, layout, etc. , Run UnsafeStdinReader diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs index a1e6cb1..786b228 100644 --- a/.xmonad/xmonad.hs +++ b/.xmonad/xmonad.hs @@ -288,6 +288,14 @@ myStandardEZKeys = , ("M-S-", spawn (myTerminal)) -- open a terminal , ("M-l", spawn (myFileManager)) -- open a file manager + --NOTE file manager bindings + , ("C-l l", spawn (myFileManager)) -- open file manager + , ("C-l n", spawn (myFileManager ++ " $HOME/nextcloud")) -- open my nextcloud folder + , ("C-l u", spawn (myFileManager ++ " $HOME/nextcloud/university")) -- open my nextcloud university folder + , ("C-l p", spawn (myFileManager ++ " $HOME/nextcloud/personal")) -- open my nextcloud personal folder + , ("C-l r", spawn (myFileManager ++ " $HOME/repos")) -- open my repos folder + , ("C-l d", spawn (myFileManager ++ " $HOME/Downloads")) -- open downloads + --NOTE wm controls , ("M-S-j", kill1) -- kill focused windown , ("M-", sendMessage NextLayout) -- rotate through layouts @@ -328,17 +336,17 @@ myStandardEZKeys = --NOTE my custom keybind/script combinations --NOTE system controls - , ("M-S-s", spawn "/usr/local/bin/dmenuprompt \"Are you sure you want to Shutdown?\" \"shutdown now\"") -- prompt computer shutdown - , ("M-S-r", spawn "/usr/local/bin/dmenuprompt \"Are you sure you want to Restart?\" \"reboot\"") -- prompt computer restart - , ("M-", spawn "/usr/local/bin/dmenuprompt \"Are you sure you want to lock?\" \"slock\" 1") -- prompt computer lock + , ("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 + , ("M-", spawn "dmenuprompt \"Are you sure you want to lock?\" \"slock\" 1") -- prompt computer lock --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 "/usr/local/bin/dmenusearch") -- launch searcher (dmenu and surf) - , ("M-s d", spawn "/usr/local/bin/dmenusearch duckduckgo") -- launch searcher, default to duckduckgo + , ("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 @@ -348,22 +356,22 @@ myStandardEZKeys = , ("C-b m", spawn "surf 'https://mail.protonmail.com'") -- open protonmail in surf --NOTE drive mounting - , ("M-d m", spawn "/usr/local/bin/dmenumount") -- launch mounter - , ("M-d u", spawn "/usr/local/bin/dmenuumount") -- launch unmounter + , ("M-d m", spawn "dmenumount") -- launch mounter + , ("M-d u", spawn "dmenuumount") -- launch unmounter --NOTE music and audio controls - , ("M-S-o", spawn "/usr/local/bin/set-default-sink") -- set default output - , ("M-S-i", spawn "/usr/local/bin/set-default-source") -- set default input - , ("", spawn "/usr/local/bin/dec-sink-volume") -- decrease output volume - , ("", spawn "/usr/local/bin/inc-sink-volume") -- increase output volume - , ("", spawn "/usr/local/bin/toggle-sink-mute") -- toggle output mute - , ("S-", spawn "/usr/local/bin/dec-source-volume") -- decrease input volume - , ("S-", spawn "/usr/local/bin/inc-source-volume") -- increase input volume - , ("S-", spawn "/usr/local/bin/toggle-source-mute") -- toggle input mute + , ("M-S-o", spawn "set-default-sink") -- set default output + , ("M-S-i", spawn "set-default-source") -- set default input + , ("", spawn "dec-sink-volume") -- decrease output volume + , ("", spawn "inc-sink-volume") -- increase output volume + , ("", spawn "toggle-sink-mute") -- toggle output mute + , ("S-", spawn "dec-source-volume") -- decrease input volume + , ("S-", spawn "inc-source-volume") -- increase input volume + , ("S-", spawn "toggle-source-mute") -- toggle input mute --NOTE extras - , ("M-S-/", spawn "/usr/local/bin/xmonad-keys") -- show keybinds - , ("", spawn "scrot") -- take full (all monitors) screenshot + , ("M-S-/", spawn "xmonad-keys-help") -- show keybinds + , ("", spawn "screenshot") -- take full (all monitors) screenshot , ("M-", spawn "flameshot gui") -- launch flameshot for snipping ] -- The following lines are needed for named scratchpads. @@ -375,8 +383,8 @@ myStandardEZKeys = myLaptopEZKeys :: [(String, X ())] myLaptopEZKeys = --NOTE backlight controls - [ ("", spawn "/usr/local/bin/mod_backlight +10") -- increase backlight brightness by 10 - , ("", spawn "/usr/local/bin/mod_backlight -10") -- decrease backlight brightness by 10 + [ ("", spawn "mod_backlight +10") -- increase backlight brightness by 10 + , ("", spawn "mod_backlight -10") -- decrease backlight brightness by 10 ] @@ -481,11 +489,11 @@ myLayout = avoidStruts $ mouseResize $ windowArrange $ T.toggleLayouts floats where -- I've commented out the layouts I don't use. myDefaultLayout = - spirals - ||| tall + tall ||| noBorders monocle ||| noBorders tabs -- unused layouts + -- ||| spirals -- ||| grid -- ||| floats -- ||| magnify @@ -558,7 +566,6 @@ myStartupHook = do spawnOnce "xsetroot -cursor_name left_ptr" -- Startup apps (tray) and settings - spawnOnce "volctl &" spawnOnce "nm-applet &" spawnOnce "blueman-applet &" spawnOnce "/usr/lib/kdeconnectd &"