Merge branch 'main' of git.themagician.cc:TheMagician/stow

applications/.local/share/applications/zathura.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+
+# The type as listed above
+Type=Application
+Version=1.0
+Name=zathura
+Comment=document reader
+Exec=zathura
+Terminal=false

shell/.config/shell/aliasrc

@@ -24,6 +24,10 @@ alias d="docker"
 # taskwarrior aliases
 alias t="task"
 
+# sxiv aliases
+alias s="nsxiv"
+alias sxiv="nsxiv"
+
 # aliases for enabling color
 alias ls="ls --human-readable --color=auto"
 alias grep="grep --color=auto"

xmobar/.config/xmobar/xmobarrc

@@ -0,0 +1,38 @@
+Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
+       , additionalFonts = []
+       , borderColor = "black"
+       , border = TopB
+       , bgColor = "black"
+       , fgColor = "grey"
+       , alpha = 255
+       , position = Top
+       , textOffset = -1
+       , iconOffset = -1
+       , lowerOnStart = True
+       , pickBroadest = False
+       , persistent = False
+       , hideOnStart = False
+       , iconRoot = "."
+       , allDesktops = True
+       , overrideRedirect = True
+       , commands = [ Run Weather "EGPF" ["-t","<station>: <tempC>C",
+                                          "-L","18","-H","25",
+                                          "--normal","green",
+                                          "--high","red",
+                                          "--low","lightblue"] 36000
+                    , Run Network "eth0" ["-L","0","-H","32",
+                                          "--normal","green","--high","red"] 10
+                    , Run Network "eth1" ["-L","0","-H","32",
+                                          "--normal","green","--high","red"] 10
+                    , Run Cpu ["-L","3","-H","50",
+                               "--normal","green","--high","red"] 10
+                    , Run Memory ["-t","Mem: <usedratio>%"] 10
+                    , Run Swap [] 10
+                    , Run Com "uname" ["-s","-r"] "" 36000
+                    , Run Date "%a %b %_d %Y %H:%M:%S" "date" 10
+                    ]
+       , sepChar = "%"
+       , alignSep = "}{"
+       , template = "%cpu% | %memory% * %swap% | %eth0% - %eth1% }\
+                    \{ <fc=#ee9a00>%date%</fc>| %EGPF% | %uname%"
+       }

xmonad/.xmonad/xmonad.hs

@@ -15,7 +15,7 @@ import XMonad.Layout.ResizableTile
 
 myModKey               = mod4Mask
 myTerminal             = "st"
-myBorderWidth          = 1
+myBorderWidth          = 2
 myUnfocusedBorderColor = "#ffffff"
 myFocusedBorderColor   = "#00cd00"
 myWorkspaces           = map show [1..9]
@@ -25,7 +25,7 @@ tiled   = spacing 12 $ ResizableTall 1 (1/100) (1/2) []
 grid    = spacing 12 $ Grid (16/10)
 monocle = smartBorders (Full)
 myLayout = myDefaultLayout
-    where myDefaultLayout = tiled ||| Mirror tiled ||| monocle
+    where myDefaultLayout = avoidStruts ( tiled ||| Mirror tiled ) ||| monocle
         -- TODO: These don't seem used, see if we can remove/use them
         -- Update: Examination of other xmonad.hs files seems to back up my suspicions
         -- nmaster = 1
@@ -45,7 +45,7 @@ main = do
         , modMask = myModKey
         , terminal = myTerminal
         -- , startupHook = myStartupHook
-        -- , layoutHook = myLayoutHook
+        , layoutHook = myLayout
         , workspaces = myWorkspaces
         , borderWidth = myBorderWidth
         , normalBorderColor = myUnfocusedBorderColor