diff --git a/xmobar/blue-lake-xmobarrc b/xmobar/blue-lake-xmobarrc
index 79ec310..b4512c7 100644
--- a/xmobar/blue-lake-xmobarrc
+++ b/xmobar/blue-lake-xmobarrc
@@ -3,7 +3,8 @@ Config { bgColor = "#23497E"
, font = "xft:BigBlueTermPlus Nerd Font-12"
, additionalFonts = []
, commands = [ Run Date "%a %Y-%m-%d %H:%M" "date" 10
+ , Run Com "/bin/sh" ["-c", "amixer get Master | awk -F'[][]' 'END { print $2 ($6 == \"off\" ? \" (muted)\" : \"\") }'"] "volume" 1
, Run XMonadLog
]
, alignSep = "}{"
- , template = " %XMonadLog% }{ %date% "}
+ , template = " %XMonadLog% }{ vol %volume% | %date% "}
diff --git a/xmobar/dusk-cloud-xmobarrc b/xmobar/dusk-cloud-xmobarrc
index 34cbabe..ddd77dd 100644
--- a/xmobar/dusk-cloud-xmobarrc
+++ b/xmobar/dusk-cloud-xmobarrc
@@ -3,7 +3,8 @@ Config { bgColor = "#000000"
, font = "xft:BigBlueTermPlus Nerd Font-12"
, additionalFonts = []
, commands = [ Run Date "%a %Y-%m-%d %H:%M" "date" 10
+ , Run Com "/bin/sh" ["-c", "amixer get Master | awk -F'[][]' 'END { print $2 ($6 == \"off\" ? \" (muted)\" : \"\") }'"] "volume" 1
, Run XMonadLog
]
, alignSep = "}{"
- , template = " %XMonadLog% }{ %date% "}
\ No newline at end of file
+ , template = " %XMonadLog% }{ vol %volume% | %date% "}
\ No newline at end of file
diff --git a/xmobar/natural-green-xmobarrc b/xmobar/natural-green-xmobarrc
index 056ef12..df51d82 100644
--- a/xmobar/natural-green-xmobarrc
+++ b/xmobar/natural-green-xmobarrc
@@ -3,7 +3,8 @@ Config { bgColor = "#425F57"
, font = "xft:BigBlueTermPlus Nerd Font-12"
, additionalFonts = []
, commands = [ Run Date "%a %Y-%m-%d %H:%M" "date" 10
+ , Run Com "/bin/sh" ["-c", "amixer get Master | awk -F'[][]' 'END { print $2 ($6 == \"off\" ? \" (muted)\" : \"\") }'"] "volume" 1
, Run XMonadLog
]
, alignSep = "}{"
- , template = " %XMonadLog% }{ %date% "}
+ , template = " %XMonadLog% }{ vol %volume% | %date% "}
diff --git a/xmobar/purple-subway-xmobarrc b/xmobar/purple-subway-xmobarrc
index 06c1590..7d9683f 100644
--- a/xmobar/purple-subway-xmobarrc
+++ b/xmobar/purple-subway-xmobarrc
@@ -3,7 +3,8 @@ Config { bgColor = "#23497E"
, font = "xft:BigBlueTermPlus Nerd Font-12"
, additionalFonts = []
, commands = [ Run Date "%a %Y-%m-%d %H:%M" "date" 10
+ , Run Com "/bin/sh" ["-c", "amixer get Master | awk -F'[][]' 'END { print $2 ($6 == \"off\" ? \" (muted)\" : \"\") }'"] "volume" 1
, Run XMonadLog
]
, alignSep = "}{"
- , template = " %XMonadLog% }{ %date% "}
+ , template = " %XMonadLog% }{ vol %volume% | %date% "}
diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index e4a0df5..3ca3316 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -6,6 +6,7 @@ import XMonad.Hooks.StatusBar.PP
import XMonad.Hooks.EwmhDesktops
import XMonad.Util.SpawnOnce (spawnOnce)
import XMonad.Layout.Spacing
+import XMonad.Layout.ThreeColumns
import Theme
import NaturalGreenTheme
@@ -30,7 +31,7 @@ myTerminal = "alacritty"
myModMask = mod4Mask
myBorderWidth = 0
myEmacs = "emacsclient -c -a 'emacs' "
-myBrowser = "vivaldi"
+myBrowser = "firefox"
myWorkBrowser = "firefox -P emre@mixrank.com"
myTheme = duskCloudTheme
myLauncher = ".config/rofi/launchers/type-6/launcher.sh"
@@ -54,8 +55,8 @@ myKeybindings = [ ("M-S-e", spawn myEmacs)
, ("M-s", spawn "maim -s | xclip -selection clipboard -t image/png")
, ("", spawn "brightnessctl s +4%")
, ("", spawn "brightnessctl s 4%-")
- , ("", spawn "amixer -q sset Master 3%+")
- , ("", spawn "amixer -q sset Master 3%-")
+ , ("", spawn "amixer -q sset Master 5%+")
+ , ("", spawn "amixer -q sset Master 5%-")
, ("M-", spawn myTerminal)
, ("M-q", spawn "xmonad --recompile; killall xmobar; killall picom; xmonad --restart")
, ("M-d", spawn myLauncher)
@@ -63,9 +64,10 @@ myKeybindings = [ ("M-S-e", spawn myEmacs)
, ("", spawn "playerctl play-pause")
]
-myLayoutHook = tiled ||| Mirror tiled ||| Full
+myLayoutHook = tiled ||| Mirror tiled ||| Full ||| threeCol
where
tiled = Tall nmaster delta ratio
+ threeCol = ThreeCol nmaster delta (1/3)
nmaster = 1
ratio = 1/2
delta = 3/100