diff --git a/.config/xmobar/.gitignore b/.config/xmobar/.gitignore
new file mode 100644
index 0000000..8a085be
--- /dev/null
+++ b/.config/xmobar/.gitignore
@@ -0,0 +1 @@
+/dist-*
diff --git a/.config/xmobar/xmobar-frosty.cabal b/.config/xmobar/xmobar-frosty.cabal
new file mode 100644
index 0000000..6e1c894
--- /dev/null
+++ b/.config/xmobar/xmobar-frosty.cabal
@@ -0,0 +1,10 @@
+cabal-version: 3.0
+name: xmobar-frosty
+version: 0.1.0.0
+build-type: Simple
+
+executable xmobar
+ main-is: xmobar.hs
+ build-depends: base ^>=4.17.2.1
+ , xmobar >=0.48.1
+ default-language: Haskell2010
diff --git a/.config/xmobar/xmobar.hs b/.config/xmobar/xmobar.hs
new file mode 100644
index 0000000..99ececc
--- /dev/null
+++ b/.config/xmobar/xmobar.hs
@@ -0,0 +1,24 @@
+import Xmobar
+
+config :: Config
+config = defaultConfig
+ { font = "Terminus 8"
+ , textOffset = 0
+ , bgColor = "#121212"
+ , fgColor = "#cccccc"
+ , position = Top
+ , template = " %XMonadLog% }{ %network% | VOL %volume% | %battery% | CPU %cpu% | RAM %memory% | %load% | %date% "
+ , commands =
+ [ Run XMonadLog
+ , Run $ Com "monitors" ["network"] "network" 6000
+ , Run $ PipeReader "/tmp/pipe-volume" "volume"
+ , Run $ Com "monitors" ["battery"] "battery" 3600
+ , Run $ Com "monitors" ["cpu"] "cpu" 50
+ , Run $ Com "monitors" ["memory"] "memory" 50
+ , Run $ Com "monitors" ["load"] "load" 600
+ , Run $ Date "%d/%m/%Y %H:%M:%S" "date" 10
+ ]
+ }
+
+main :: IO ()
+main = xmobar config
diff --git a/.config/xmobar/xmobarrc b/.config/xmobar/xmobarrc
deleted file mode 100644
index 7a61f0f..0000000
--- a/.config/xmobar/xmobarrc
+++ /dev/null
@@ -1,20 +0,0 @@
-Config
- { font = "Terminus 8"
- , textOffset = 0
- , bgColor = "#121212"
- , fgColor = "#cccccc"
- , position = Top
- , template = " %XMonadLog% }{ %network% | VOL %volume% | %battery% | CPU %cpu% | RAM %memory% | %load% | %date% "
- , commands =
- [ Run XMonadLog
- , Run Com "monitors" ["network"] "network" 6000
- , Run PipeReader "/tmp/pipe-volume" "volume"
- , Run Com "monitors" ["battery"] "battery" 3600
- , Run Com "monitors" ["cpu"] "cpu" 50
- , Run Com "monitors" ["memory"] "memory" 50
- , Run Com "monitors" ["load"] "load" 600
- , Run Date "%d/%m/%Y %H:%M:%S" "date" 10
- ]
- }
-
--- vim:ft=haskell
diff --git a/.config/xmonad/.gitignore b/.config/xmonad/.gitignore
new file mode 100644
index 0000000..8a085be
--- /dev/null
+++ b/.config/xmonad/.gitignore
@@ -0,0 +1 @@
+/dist-*
diff --git a/.config/xmonad/xmonad-frosty.cabal b/.config/xmonad/xmonad-frosty.cabal
new file mode 100644
index 0000000..30f5655
--- /dev/null
+++ b/.config/xmonad/xmonad-frosty.cabal
@@ -0,0 +1,13 @@
+cabal-version: 3.0
+name: xmonad-frosty
+version: 0.1.0.0
+build-type: Simple
+
+executable xmonad
+ main-is: xmonad.hs
+ build-depends: base ^>=4.17.2.1
+ , xmonad >=0.18
+ , xmonad-contrib >=0.18
+ , containers
+ , X11
+ default-language: Haskell2010
diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs
index 73ac3f9..8eab860 100644
--- a/.config/xmonad/xmonad.hs
+++ b/.config/xmonad/xmonad.hs
@@ -1,5 +1,5 @@
import XMonad
-import XMonad.Layout.Circle
+import XMonad.Layout.CircleEx
import XMonad.Layout.Grid
import XMonad.Layout.LayoutModifier
import XMonad.Layout.NoBorders (noBorders, smartBorders)
@@ -54,7 +54,7 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
, ((modMask, xK_w), spawn "firefox")
, ((modMask .|. controlMask, xK_q), spawn "qutebrowser")
, ((modMask, xK_e), spawnTerminal myEditor)
- , ((modMask, xK_f), spawnTerminal "nnn")
+ , ((modMask, xK_f), spawnTerminal "lf")
, ((modMask, xK_t), spawnTerminal "ncmpcpp")
, ((modMask .|. controlMask, xK_e), spawnTerminal "ncspot")
, ((modMask, xK_v), spawnTerminal "pulsemixer")
@@ -104,7 +104,6 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
[ ((modMask, xK_t), sendMessage $ JumpToLayout "Tall")
, ((modMask, xK_y), sendMessage $ JumpToLayout "Wide")
, ((modMask, xK_g), sendMessage $ JumpToLayout "Grid")
- , ((modMask, xK_c), sendMessage $ JumpToLayout "Circle")
, ((modMask, xK_a), sendMessage $ NextLayout)
]
)
@@ -187,7 +186,7 @@ myMouseBindings (XConfig {XMonad.modMask = modMask}) = M.fromList $
myLayoutHook =
avoidStruts
- $ tall ||| wide ||| grid ||| circle
+ $ tall ||| wide ||| grid
where
tall = named "Tall"
$ Tall 1 (3/100) (1/2)
@@ -195,8 +194,6 @@ myLayoutHook =
$ Mirror tall
grid = named "Grid"
$ Grid
- circle = named "Circle"
- $ Circle
mySWNConfig :: SWNConfig
mySWNConfig = def