uhh update lots of stuff and xmobar
This commit is contained in:
parent
f88c053196
commit
a597d4dc2d
@ -1,7 +1,7 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static char * floating_xpm[] = {
|
static char * floating_xpm[] = {
|
||||||
"20 20 3 1",
|
"20 20 3 1",
|
||||||
" c #31353F",
|
" c #113844",
|
||||||
". c #B6BDCA",
|
". c #B6BDCA",
|
||||||
"+ c #ABB2BF",
|
"+ c #ABB2BF",
|
||||||
" ",
|
" ",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static char * Monocle_xpm[] = {
|
static char * full_xpm[] = {
|
||||||
"20 20 2 1",
|
"20 20 2 1",
|
||||||
" c #31353F",
|
" c #113844",
|
||||||
". c #ABB2BF",
|
". c #ABB2BF",
|
||||||
" ",
|
" ",
|
||||||
" ",
|
" ",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static char * MirrorTall_xpm[] = {
|
static char * mirrortiled_xpm[] = {
|
||||||
"20 20 2 1",
|
"20 20 2 1",
|
||||||
" c #31353F",
|
" c #113844",
|
||||||
". c #ABB2BF",
|
". c #ABB2BF",
|
||||||
" ",
|
" ",
|
||||||
" ",
|
" ",
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* XPM */
|
/* XPM */
|
||||||
static char * Tall_xpm[] = {
|
static char * tiled_xpm[] = {
|
||||||
"20 20 2 1",
|
"20 20 2 1",
|
||||||
" c #31353F",
|
" c #113844",
|
||||||
". c #ABB2BF",
|
". c #ABB2BF",
|
||||||
" ",
|
" ",
|
||||||
" ",
|
" ",
|
||||||
|
@ -4,6 +4,6 @@ mpt=$(mpc current -f %title%)
|
|||||||
mpa=$(mpc current -f %artist%)
|
mpa=$(mpc current -f %artist%)
|
||||||
icon1=' '
|
icon1=' '
|
||||||
icon2=''
|
icon2=''
|
||||||
echo "$icon2 $mpa - $icon1 $mpt"
|
echo "$mpa - $mpt "
|
||||||
|
|
||||||
|
|
||||||
|
@ -4,9 +4,9 @@ MUTE=${MUTE:-$(pactl get-sink-mute @DEFAULT_SINK@ | awk '{print $2}')}
|
|||||||
VOLUME=${VOLUME:-$(pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}' | sed "s/%//")}
|
VOLUME=${VOLUME:-$(pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}' | sed "s/%//")}
|
||||||
|
|
||||||
if [[ "${MUTE}" = "yes" ]] ; then
|
if [[ "${MUTE}" = "yes" ]] ; then
|
||||||
echo "<fc=#6B7089,#31353F:5></fc>"
|
echo "<fc=#6B7089,#31353F:5></fc>"
|
||||||
elif [[ "${MUTE}" = "no" ]] && [[ "${VOLUME}" -eq 0 ]] ; then
|
elif [[ "${MUTE}" = "no" ]] && [[ "${VOLUME}" -eq 0 ]] ; then
|
||||||
echo "<fc=#6B7089,#31353F:5> ${VOLUME}%</fc>"
|
echo "<fc=#6B7089,#31353F:5>${VOLUME}%</fc>"
|
||||||
elif [[ "${MUTE}" = "no" ]] && [[ "${VOLUME}" -gt 0 ]] ; then
|
elif [[ "${MUTE}" = "no" ]] && [[ "${VOLUME}" -gt 0 ]] ; then
|
||||||
echo " ${VOLUME}%"
|
echo "${VOLUME}%"
|
||||||
fi
|
fi
|
12
configs/xmonad/scripts/volumeicon.sh
Executable file
12
configs/xmonad/scripts/volumeicon.sh
Executable file
@ -0,0 +1,12 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
MUTE=${MUTE:-$(pactl get-sink-mute @DEFAULT_SINK@ | awk '{print $2}')}
|
||||||
|
VOLUME=${VOLUME:-$(pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}' | sed "s/%//")}
|
||||||
|
|
||||||
|
if [[ "${MUTE}" = "yes" ]] ; then
|
||||||
|
echo ""
|
||||||
|
elif [[ "${MUTE}" = "no" ]] && [[ "${VOLUME}" -eq 0 ]] ; then
|
||||||
|
echo " "
|
||||||
|
elif [[ "${MUTE}" = "no" ]] && [[ "${VOLUME}" -gt 0 ]] ; then
|
||||||
|
echo " "
|
||||||
|
fi
|
@ -10,6 +10,7 @@
|
|||||||
-- Data Imports
|
-- Data Imports
|
||||||
|
|
||||||
import Data.Functor
|
import Data.Functor
|
||||||
|
import Data.List (isInfixOf)
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
import Data.Monoid
|
import Data.Monoid
|
||||||
-- Used in io exitSuccess
|
-- Used in io exitSuccess
|
||||||
@ -71,7 +72,11 @@ myTerminal = "kitty"
|
|||||||
|
|
||||||
-- Default Launcher
|
-- Default Launcher
|
||||||
myLauncher :: String
|
myLauncher :: String
|
||||||
myLauncher = myHomeDir ++ "/.config/rofi/launchers/type-7/launcher.sh"
|
myLauncher = myHomeDir ++ "/.config/rofi/launchers/type-6/launcher.sh"
|
||||||
|
|
||||||
|
-- Default Launcher
|
||||||
|
myWinSwitch :: String
|
||||||
|
myWinSwitch = myHomeDir ++ "/.config/rofi/launchers/type-6/tab.sh"
|
||||||
|
|
||||||
-- Default Launcher
|
-- Default Launcher
|
||||||
myFileManager :: String
|
myFileManager :: String
|
||||||
@ -79,7 +84,7 @@ myFileManager = "thunar"
|
|||||||
|
|
||||||
-- Default Browser
|
-- Default Browser
|
||||||
myBrowser :: String
|
myBrowser :: String
|
||||||
myBrowser = "chromium"
|
myBrowser = "brave-bin"
|
||||||
|
|
||||||
myPowerMenu :: String
|
myPowerMenu :: String
|
||||||
myPowerMenu = myHomeDir ++ "/.config/rofi/powermenu/type-6/powermenu.sh"
|
myPowerMenu = myHomeDir ++ "/.config/rofi/powermenu/type-6/powermenu.sh"
|
||||||
@ -187,6 +192,7 @@ myAdditionalKeys =
|
|||||||
("C-<Print>", unGrab *> spawn screenShotApp),
|
("C-<Print>", unGrab *> spawn screenShotApp),
|
||||||
("<Print>", spawn screenShotFullscreen),
|
("<Print>", spawn screenShotFullscreen),
|
||||||
("M-S-<Return>", spawn myLauncher),
|
("M-S-<Return>", spawn myLauncher),
|
||||||
|
("M1-<Tab>", spawn myWinSwitch),
|
||||||
("M-e", spawn myFileManager)
|
("M-e", spawn myFileManager)
|
||||||
]
|
]
|
||||||
-- Multimedia keybinds.
|
-- Multimedia keybinds.
|
||||||
@ -222,12 +228,13 @@ myStartupHook = do
|
|||||||
[ "sh ~/scripts/screenlayout.sh",
|
[ "sh ~/scripts/screenlayout.sh",
|
||||||
"nitrogen --restore &",
|
"nitrogen --restore &",
|
||||||
"touch ~/tmp/touchy && rm -rf ~/tmp/*",
|
"touch ~/tmp/touchy && rm -rf ~/tmp/*",
|
||||||
-- , myHomeDir ++ "/.local/bin/picom-jonaburg --glx-no-stencil --xrender-sync-fence -b &"
|
myHomeDir ++ "/.local/bin/picom-jonaburg -b --experimental-backends &",
|
||||||
"picom",
|
"nm-applet &",
|
||||||
|
-- "picom",
|
||||||
"xinput --set-prop 'pointer:''Gaming Mouse' 'libinput Accel Profile Enabled' 0, 1 && xinput --set-prop 'pointer:''Gaming Mouse' 'libinput Accel Speed' 0.1",
|
"xinput --set-prop 'pointer:''Gaming Mouse' 'libinput Accel Profile Enabled' 0, 1 && xinput --set-prop 'pointer:''Gaming Mouse' 'libinput Accel Speed' 0.1",
|
||||||
"setxkbmap -option ctrl:nocaps br abnt2",
|
"setxkbmap -option ctrl:nocaps br abnt2",
|
||||||
"nm-applet",
|
"nm-applet",
|
||||||
"trayer-srg -l --edge top --align right --SetDockType true --SetPartialStrut true --expand true --widthtype request --tint 0xFF181814 --height 27 --transparent false --distance 2 --margin 1 --alpha 0 --monitor 0 &",
|
"trayer-srg -l --edge top --align right --SetDockType true --SetPartialStrut true --expand true --widthtype request --tint 0x002b36 --height 30 --distance 15 --margin 10 --alpha 0 --monitor 0 --transparent true",
|
||||||
"mpd &",
|
"mpd &",
|
||||||
"dunst &",
|
"dunst &",
|
||||||
"lxqt-policykit-agent &",
|
"lxqt-policykit-agent &",
|
||||||
@ -266,6 +273,10 @@ about = TitleApp "About Mozilla Firefox" "About Mozilla Firefox"
|
|||||||
message = ClassApp "Xmessage" "Xmessage"
|
message = ClassApp "Xmessage" "Xmessage"
|
||||||
|
|
||||||
myManageHook :: XMonad.Query (Data.Monoid.Endo WindowSet)
|
myManageHook :: XMonad.Query (Data.Monoid.Endo WindowSet)
|
||||||
|
|
||||||
|
-- Like '=?' but matches substrings.
|
||||||
|
q =?? x = fmap (isInfixOf x) q
|
||||||
|
|
||||||
myManageHook = manageRules
|
myManageHook = manageRules
|
||||||
where
|
where
|
||||||
-- Hides windows without ignoring it, see doHideIgnore in XMonad contrib.
|
-- Hides windows without ignoring it, see doHideIgnore in XMonad contrib.
|
||||||
@ -319,20 +330,16 @@ myManageHook = manageRules
|
|||||||
className ^? "Visual " <&&> isDialog --> doCenterFloat,
|
className ^? "Visual " <&&> isDialog --> doCenterFloat,
|
||||||
className =? "firefox-esr" --> doShift "web",
|
className =? "firefox-esr" --> doShift "web",
|
||||||
className =? "Chromium-browser-chromium" --> doShift "web",
|
className =? "Chromium-browser-chromium" --> doShift "web",
|
||||||
|
className =? "Brave-browser" --> doShift "web",
|
||||||
className =? "Virt-manager" --> doShift "vm",
|
className =? "Virt-manager" --> doShift "vm",
|
||||||
className =? "steam_app_1172620" --> doShift "gfx",
|
|
||||||
className =? "steam_app_960090" --> doShift "gfx",
|
|
||||||
className =? "steam_app_1063730" --> doShift "gfx",
|
|
||||||
className =? "steam_app_632360" --> doShift "gfx",
|
|
||||||
className =? "discord" --> doShift "irc",
|
className =? "discord" --> doShift "irc",
|
||||||
className =? "discord-screenaudio" --> doShift "irc",
|
className =? "discord-screenaudio" --> doShift "irc",
|
||||||
className =? "Spotify" --> doShift "msc",
|
className =? "Spotify" --> doShift "msc",
|
||||||
className =? "thunderbird" --> doShift "eml",
|
className =? "thunderbird" --> doShift "eml",
|
||||||
className =? "Steam" --> doShift "stm",
|
className =? "Steam" --> doShift "stm",
|
||||||
|
className =? "steam" --> doShift "stm",
|
||||||
|
className =? "obs" --> doShift "vm",
|
||||||
className =? "Lutris" --> doShift "vm" <> doFloat,
|
className =? "Lutris" --> doShift "vm" <> doFloat,
|
||||||
className =? "leagueclientux.exe" --> doShift "gfx",
|
|
||||||
className =? "league of legends.exe" --> doShift "gfx",
|
|
||||||
className =? "leagueclient.exe" --> doShift "gfx",
|
|
||||||
className =? "explorer.exe" --> doShift "gfx",
|
className =? "explorer.exe" --> doShift "gfx",
|
||||||
className =? "riotclientux.exe" --> doShift "gfx",
|
className =? "riotclientux.exe" --> doShift "gfx",
|
||||||
className =? "dauntless-win64-shipping.exe" --> doShift "gfx",
|
className =? "dauntless-win64-shipping.exe" --> doShift "gfx",
|
||||||
@ -342,7 +349,7 @@ myManageHook = manageRules
|
|||||||
className =? "Pavucontrol" --> doFloat,
|
className =? "Pavucontrol" --> doFloat,
|
||||||
className =? "Nitrogen" --> doFloat,
|
className =? "Nitrogen" --> doFloat,
|
||||||
className =? "Wrapper-2.0" --> doFloat,
|
className =? "Wrapper-2.0" --> doFloat,
|
||||||
className =? "TeamSpeak 3" --> doFloat <> doShift "irc",
|
className =? "TeamSpeak 3" --> doShift "irc",
|
||||||
className =? "easyeffects" --> doFloat <> doShift "vm",
|
className =? "easyeffects" --> doFloat <> doShift "vm",
|
||||||
className =? "Arandr" --> doFloat,
|
className =? "Arandr" --> doFloat,
|
||||||
resource =? "desktop_window" --> doIgnore,
|
resource =? "desktop_window" --> doIgnore,
|
||||||
@ -351,9 +358,12 @@ myManageHook = manageRules
|
|||||||
isRole ^? "About" <||> isRole ^? "about" --> doFloat,
|
isRole ^? "About" <||> isRole ^? "about" --> doFloat,
|
||||||
"_NET_WM_WINDOW_TYPE" `isInProperty` "_KDE_NET_WM_WINDOW_TYPE_OVERRIDE" --> doIgnore <> doRaise,
|
"_NET_WM_WINDOW_TYPE" `isInProperty` "_KDE_NET_WM_WINDOW_TYPE_OVERRIDE" --> doIgnore <> doRaise,
|
||||||
-- Steam Game Fixes
|
-- Steam Game Fixes
|
||||||
className =? "steam_app_1551360" <&&> title /=? "Forza Horizon 5" --> doHide -- Prevents black screen when fullscreening.
|
className =? "steam_app_1551360" <&&> title /=? "Forza Horizon 5" --> doHide, -- Prevents black screen when fullscreening.
|
||||||
-- , title =? "Wine System Tray" --> doHide -- Prevents Wine System Trays from taking input focus.
|
className =?? "league" --> doShift "gfx" <> doCenterFloat <> hasBorder False,
|
||||||
-- , title ^? "Steam - News" --> doHide -- I don't like the Steam news menu
|
className =?? "riot" --> doShift "gfx" <> doCenterFloat <> hasBorder False,
|
||||||
|
className =? "gamescope" --> doShift "gfx" <> doCenterFloat <> hasBorder False,
|
||||||
|
title =? "Wine System Tray" --> doHide, -- Prevents Wine System Trays from taking input focus.
|
||||||
|
className =?? "steam_app" --> doShift "gfx" <> hasBorder False
|
||||||
]
|
]
|
||||||
|
|
||||||
{- May be useful one day
|
{- May be useful one day
|
||||||
@ -389,9 +399,9 @@ myXmobarPP =
|
|||||||
ppTitle = xmobarColor "#d5d5d5" "" . shorten 49,
|
ppTitle = xmobarColor "#d5d5d5" "" . shorten 49,
|
||||||
ppSep = wrapSep " ",
|
ppSep = wrapSep " ",
|
||||||
ppTitleSanitize = xmobarStrip,
|
ppTitleSanitize = xmobarStrip,
|
||||||
ppWsSep = xmobarColor "" "#212121" " ",
|
ppWsSep = xmobarColor "" "#002b36" " ",
|
||||||
ppLayout =
|
ppLayout =
|
||||||
xmobarColor "#212121" ""
|
xmobarColor "#002b36" ""
|
||||||
. ( \case
|
. ( \case
|
||||||
"Spacing Tall" -> "<icon=tiled.xpm/>"
|
"Spacing Tall" -> "<icon=tiled.xpm/>"
|
||||||
"Spacing Mirror Tall" -> "<icon=mirrortiled.xpm/>"
|
"Spacing Mirror Tall" -> "<icon=mirrortiled.xpm/>"
|
||||||
@ -404,8 +414,8 @@ myXmobarPP =
|
|||||||
wrapSep :: String -> String
|
wrapSep :: String -> String
|
||||||
wrapSep =
|
wrapSep =
|
||||||
wrap
|
wrap
|
||||||
(xmobarColor "#212121" "#212121:7" (xmobarFont 2 "\xe0b4"))
|
(xmobarColor "#002b36" "#002b36:7" (xmobarFont 2 "\xe0b4"))
|
||||||
(xmobarColor "#212121" "#212121:7" (xmobarFont 2 "\xe0b6"))
|
(xmobarColor "#002b36" "#002b36:7" (xmobarFont 2 "\xe0b6"))
|
||||||
|
|
||||||
myXmobar :: String
|
myXmobar :: String
|
||||||
myXmobar = (myHomeDir ++ "/.local/bin/xmobar " ++ myHomeDir ++ "/.config/xmonad/src/xmobar.hs")
|
myXmobar = (myHomeDir ++ "/.local/bin/xmobar " ++ myHomeDir ++ "/.config/xmonad/src/xmobar.hs")
|
||||||
|
@ -17,30 +17,35 @@ myConfig =
|
|||||||
baseConfig
|
baseConfig
|
||||||
{ template =
|
{ template =
|
||||||
concat $
|
concat $
|
||||||
[ " <fn=2><fc=#212121,#212121:7>\xe0b6</fc></fn>\
|
[ " <fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
|
||||||
\<fn=4><fc=#558c8e,#212121:5>\xf30d </fc></fn>\
|
\<fn=4><fc=#558c8e,#002b36:5>\xf30d </fc></fn>\
|
||||||
\<fn=2><fc=#212121,#212121:7>\xe0b4</fc></fn> "
|
\<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
|
||||||
]
|
]
|
||||||
<> ["<fn=5>@UnsafeXMonadLog@</fn>}{"]
|
<> ["<fn=5>@UnsafeXMonadLog@</fn>}"]
|
||||||
<> [ "<fn=2><fc=#212121,#212121:7>\xe0b6</fc></fn>\
|
<> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
|
||||||
\<fn=4><fc=#E06C75,#212121:5>@music@</fc></fn>\
|
\<fn=4><fc=#E06C75,#002b36:5>\xf001 </fc></fn>\
|
||||||
\<fn=2><fc=#212121,#212121:7>\xe0b4</fc></fn> "
|
\<fn=5><fc=#E06C75,#002b36:5>@music@</fc></fn>\
|
||||||
|
\<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn>{"
|
||||||
]
|
]
|
||||||
<> [ "<fn=2><fc=#212121,#212121:7>\xe0b6</fc></fn>\
|
<> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
|
||||||
\<fn=4><fc=#56B6C2,#212121:5>CPU: @cpu@%</fc></fn>\
|
\<fn=4><fc=#56B6C2,#002b36:5>\xf2db </fc></fn>\
|
||||||
\<fn=2><fc=#212121,#212121:7>\xe0b4</fc></fn> "
|
\<fn=5><fc=#56B6C2,#002b36:5>CPU: @cpu@%</fc></fn>\
|
||||||
|
\<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
|
||||||
]
|
]
|
||||||
<> [ "<fn=2><fc=#212121,#212121:7>\xe0b6</fc></fn>\
|
<> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
|
||||||
\<fn=4><fc=#C678DD,#212121:5>Mem: @memory@% </fc></fn>\
|
\<fn=4><fc=#C678DD,#002b36:5>\xf538 </fc></fn>\
|
||||||
\<fn=2><fc=#212121,#212121:7>\xe0b4</fc></fn> "
|
\<fn=5><fc=#C678DD,#002b36:5>Mem: @memory@% </fc></fn>\
|
||||||
|
\<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
|
||||||
]
|
]
|
||||||
<> [ "<fn=2><fc=#212121,#212121:7>\xe0b6</fc></fn>\
|
<> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
|
||||||
\<fn=4><fc=#98C379,#212121:5>@vol@</fc></fn>\
|
\<fn=4><fc=#98C379,#002b36:5>@volicon@</fc></fn>\
|
||||||
\<fn=2><fc=#212121,#212121:7>\xe0b4</fc></fn> "
|
\<fn=5><fc=#98C379,#002b36:5>@vol@</fc></fn>\
|
||||||
|
\<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
|
||||||
]
|
]
|
||||||
<> [ "<fn=2><fc=#212121,#212121:7>\xe0b6</fc></fn>\
|
<> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
|
||||||
\<fn=4><fc=#61AFEF,#212121:5>@date@</fc></fn>\
|
\<fn=4><fc=#61AFEF,#002b36:5>\xf017 </fc></fn>\
|
||||||
\<fn=2><fc=#212121,#212121:7>\xe0b4</fc></fn> "
|
\<fn=5><fc=#61AFEF,#002b36:5>@date@</fc></fn>\
|
||||||
|
\<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
|
||||||
]
|
]
|
||||||
<> ["@trayer@"],
|
<> ["@trayer@"],
|
||||||
commands = myCommands
|
commands = myCommands
|
||||||
@ -50,7 +55,8 @@ myCommands :: [Runnable]
|
|||||||
myCommands =
|
myCommands =
|
||||||
[ Run UnsafeXMonadLog,
|
[ Run UnsafeXMonadLog,
|
||||||
Run $ Com (myHomeDir <> "/.config/xmonad/scripts/volume.sh") ["vol"] "vol" 100,
|
Run $ Com (myHomeDir <> "/.config/xmonad/scripts/volume.sh") ["vol"] "vol" 100,
|
||||||
Run $ Date "\xf017 %-l:%M %p" "date" 600,
|
Run $ Com (myHomeDir <> "/.config/xmonad/scripts/volumeicon.sh") ["volicon"] "volicon" 100,
|
||||||
|
Run $ Date "%-l:%M %p" "date" 600,
|
||||||
Run $ Cpu ["-t", "<fc=#8c7f80><total></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#56B6C2", "-n", "#4797a1", "-l", "#3a7b83"] 100,
|
Run $ Cpu ["-t", "<fc=#8c7f80><total></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#56B6C2", "-n", "#4797a1", "-l", "#3a7b83"] 100,
|
||||||
Run $ Memory ["-t", "<fc=#8c7f80><usedratio></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#c678dd", "-n", "#9f60b1", "-l", "#855094"] 100,
|
Run $ Memory ["-t", "<fc=#8c7f80><usedratio></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#c678dd", "-n", "#9f60b1", "-l", "#855094"] 100,
|
||||||
-- , Run $ Com (myHomeDir <> "/.config/xmonad/scripts/gputemp.sh") ["gpu"] "gpu" 5
|
-- , Run $ Com (myHomeDir <> "/.config/xmonad/scripts/gputemp.sh") ["gpu"] "gpu" 5
|
||||||
@ -63,16 +69,16 @@ myCommands =
|
|||||||
baseConfig :: Config
|
baseConfig :: Config
|
||||||
baseConfig =
|
baseConfig =
|
||||||
defaultConfig
|
defaultConfig
|
||||||
{ font = "xft:UbuntuMono Nerd Font:pixelsize=12:antialias=true:hinting=true",
|
{ font = "xft:Sugar Snow:pixelsize=14:antialias=true:hinting=true",
|
||||||
additionalFonts =
|
additionalFonts =
|
||||||
[ "xft:UbuntuMono Nerd Font:pixelsize=10:antialias=true:hinting=true",
|
[ "xft:Sugar Snow:pixelsize=12:antialias=true:hinting=true",
|
||||||
"xft:UbuntuMono Nerd Font:size=13:antialias=true:hinting=true",
|
"xft:Sugar Snow:size=15:antialias=true:hinting=true",
|
||||||
"xft:UbuntuMono Nerd Font:size=11:antialias=true:hinting=true",
|
"xft:Sugar Snow:size=13:antialias=true:hinting=true",
|
||||||
"xft:UbuntuMono Nerd Font:size=11:antialias=true:hinting=true",
|
"xft:JetBrainsMono Nerd Font:size=12:antialias=true:hinting=true",
|
||||||
"xft:UbuntuMono Nerd Font:pixelsize=13:antialias=true:hinting=true"
|
"xft:Sugar Snow:pixelsize=14:antialias=true:hinting=true"
|
||||||
],
|
],
|
||||||
textOffsets = [20, 22, 21, 21, 20],
|
textOffsets = [20, 22, 21, 21, 20],
|
||||||
bgColor = "#212121",
|
bgColor = "#002b36",
|
||||||
fgColor = "#c8b6b8",
|
fgColor = "#c8b6b8",
|
||||||
borderColor = "#272727",
|
borderColor = "#272727",
|
||||||
border = FullB,
|
border = FullB,
|
||||||
@ -82,7 +88,7 @@ baseConfig =
|
|||||||
, position = Static { xpos = 0, ypos = 1048, width = 1920, height = 32 } Bottom Flat
|
, position = Static { xpos = 0, ypos = 1048, width = 1920, height = 32 } Bottom Flat
|
||||||
, position = Static { xpos = 0, ypos = 0, width = 1920, height = 32 } Top Flat
|
, position = Static { xpos = 0, ypos = 0, width = 1920, height = 32 } Top Flat
|
||||||
-}
|
-}
|
||||||
position = Static {xpos = 0, ypos = 0, width = 1920, height = 30},
|
position = Static {xpos = 20, ypos = 15, width = 1880, height = 34},
|
||||||
alpha = 255,
|
alpha = 255,
|
||||||
overrideRedirect = True,
|
overrideRedirect = True,
|
||||||
lowerOnStart = True,
|
lowerOnStart = True,
|
||||||
|
@ -17,30 +17,35 @@ myConfig =
|
|||||||
baseConfig
|
baseConfig
|
||||||
{ template =
|
{ template =
|
||||||
concat $
|
concat $
|
||||||
[ " <fn=2><fc=#212121,#212121:7>\xe0b6</fc></fn>\
|
[ " <fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
|
||||||
\<fn=4><fc=#558c8e,#212121:5>\xf30d </fc></fn>\
|
\<fn=4><fc=#558c8e,#002b36:5>\xf30d </fc></fn>\
|
||||||
\<fn=2><fc=#212121,#212121:7>\xe0b4</fc></fn> "
|
\<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
|
||||||
]
|
]
|
||||||
<> ["<fn=5>@UnsafeXMonadLog@</fn>}{"]
|
<> ["<fn=5>@UnsafeXMonadLog@</fn>}"]
|
||||||
<> [ "<fn=2><fc=#212121,#212121:7>\xe0b6</fc></fn>\
|
<> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
|
||||||
\<fn=4><fc=#E06C75,#212121:5>@music@</fc></fn>\
|
\<fn=4><fc=#E06C75,#002b36:5>\xf001 </fc></fn>\
|
||||||
\<fn=2><fc=#212121,#212121:7>\xe0b4</fc></fn> "
|
\<fn=5><fc=#E06C75,#002b36:5>@music@</fc></fn>\
|
||||||
|
\<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn>{"
|
||||||
]
|
]
|
||||||
<> [ "<fn=2><fc=#212121,#212121:7>\xe0b6</fc></fn>\
|
<> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
|
||||||
\<fn=4><fc=#56B6C2,#212121:5>CPU: @cpu@%</fc></fn>\
|
\<fn=4><fc=#56B6C2,#002b36:5>\xf2db </fc></fn>\
|
||||||
\<fn=2><fc=#212121,#212121:7>\xe0b4</fc></fn> "
|
\<fn=5><fc=#56B6C2,#002b36:5>CPU: @cpu@%</fc></fn>\
|
||||||
|
\<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
|
||||||
]
|
]
|
||||||
<> [ "<fn=2><fc=#212121,#212121:7>\xe0b6</fc></fn>\
|
<> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
|
||||||
\<fn=4><fc=#C678DD,#212121:5>Mem: @memory@% </fc></fn>\
|
\<fn=4><fc=#C678DD,#002b36:5>\xf538 </fc></fn>\
|
||||||
\<fn=2><fc=#212121,#212121:7>\xe0b4</fc></fn> "
|
\<fn=5><fc=#C678DD,#002b36:5>Mem: @memory@% </fc></fn>\
|
||||||
|
\<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
|
||||||
]
|
]
|
||||||
<> [ "<fn=2><fc=#212121,#212121:7>\xe0b6</fc></fn>\
|
<> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
|
||||||
\<fn=4><fc=#98C379,#212121:5>@vol@</fc></fn>\
|
\<fn=4><fc=#98C379,#002b36:5>@volicon@</fc></fn>\
|
||||||
\<fn=2><fc=#212121,#212121:7>\xe0b4</fc></fn> "
|
\<fn=5><fc=#98C379,#002b36:5>@vol@</fc></fn>\
|
||||||
|
\<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
|
||||||
]
|
]
|
||||||
<> [ "<fn=2><fc=#212121,#212121:7>\xe0b6</fc></fn>\
|
<> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
|
||||||
\<fn=4><fc=#61AFEF,#212121:5>@date@</fc></fn>\
|
\<fn=4><fc=#61AFEF,#002b36:5>\xf017 </fc></fn>\
|
||||||
\<fn=2><fc=#212121,#212121:7>\xe0b4</fc></fn> "
|
\<fn=5><fc=#61AFEF,#002b36:5>@date@</fc></fn>\
|
||||||
|
\<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
|
||||||
],
|
],
|
||||||
commands = myCommands
|
commands = myCommands
|
||||||
}
|
}
|
||||||
@ -49,7 +54,8 @@ myCommands :: [Runnable]
|
|||||||
myCommands =
|
myCommands =
|
||||||
[ Run UnsafeXMonadLog,
|
[ Run UnsafeXMonadLog,
|
||||||
Run $ Com (myHomeDir <> "/.config/xmonad/scripts/volume.sh") ["vol"] "vol" 100,
|
Run $ Com (myHomeDir <> "/.config/xmonad/scripts/volume.sh") ["vol"] "vol" 100,
|
||||||
Run $ Date "\xf017 %-l:%M %p" "date" 600,
|
Run $ Com (myHomeDir <> "/.config/xmonad/scripts/volumeicon.sh") ["volicon"] "volicon" 100,
|
||||||
|
Run $ Date "%-l:%M %p" "date" 600,
|
||||||
Run $ Cpu ["-t", "<fc=#8c7f80><total></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#56B6C2", "-n", "#4797a1", "-l", "#3a7b83"] 100,
|
Run $ Cpu ["-t", "<fc=#8c7f80><total></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#56B6C2", "-n", "#4797a1", "-l", "#3a7b83"] 100,
|
||||||
Run $ Memory ["-t", "<fc=#8c7f80><usedratio></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#c678dd", "-n", "#9f60b1", "-l", "#855094"] 100,
|
Run $ Memory ["-t", "<fc=#8c7f80><usedratio></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#c678dd", "-n", "#9f60b1", "-l", "#855094"] 100,
|
||||||
-- , Run $ Com (myHomeDir <> "/.config/xmonad/scripts/gputemp.sh") ["gpu"] "gpu" 5
|
-- , Run $ Com (myHomeDir <> "/.config/xmonad/scripts/gputemp.sh") ["gpu"] "gpu" 5
|
||||||
@ -62,16 +68,16 @@ myCommands =
|
|||||||
baseConfig :: Config
|
baseConfig :: Config
|
||||||
baseConfig =
|
baseConfig =
|
||||||
defaultConfig
|
defaultConfig
|
||||||
{ font = "xft:UbuntuMono Nerd Font:pixelsize=12:antialias=true:hinting=true",
|
{ font = "xft:Sugar Snow:pixelsize=14:antialias=true:hinting=true",
|
||||||
additionalFonts =
|
additionalFonts =
|
||||||
[ "xft:UbuntuMono Nerd Font:pixelsize=10:antialias=true:hinting=true",
|
[ "xft:Sugar Snow:pixelsize=12:antialias=true:hinting=true",
|
||||||
"xft:UbuntuMono Nerd Font:size=13:antialias=true:hinting=true",
|
"xft:Sugar Snow:size=15:antialias=true:hinting=true",
|
||||||
"xft:UbuntuMono Nerd Font:size=11:antialias=true:hinting=true",
|
"xft:Sugar Snow:size=13:antialias=true:hinting=true",
|
||||||
"xft:UbuntuMono Nerd Font:size=11:antialias=true:hinting=true",
|
"xft:JetBrainsMono Nerd Font:size=12:antialias=true:hinting=true",
|
||||||
"xft:UbuntuMono Nerd Font:pixelsize=13:antialias=true:hinting=true"
|
"xft:Sugar Snow:pixelsize=14:antialias=true:hinting=true"
|
||||||
],
|
],
|
||||||
textOffsets = [20, 22, 21, 21, 20],
|
textOffsets = [20, 22, 21, 21, 20],
|
||||||
bgColor = "#212121",
|
bgColor = "#002b36",
|
||||||
fgColor = "#c8b6b8",
|
fgColor = "#c8b6b8",
|
||||||
borderColor = "#272727",
|
borderColor = "#272727",
|
||||||
border = FullB,
|
border = FullB,
|
||||||
@ -81,7 +87,7 @@ baseConfig =
|
|||||||
, position = Static { xpos = 0, ypos = 1048, width = 1920, height = 32 } Bottom Flat
|
, position = Static { xpos = 0, ypos = 1048, width = 1920, height = 32 } Bottom Flat
|
||||||
, position = Static { xpos = 0, ypos = 0, width = 1920, height = 32 } Top Flat
|
, position = Static { xpos = 0, ypos = 0, width = 1920, height = 32 } Top Flat
|
||||||
-}
|
-}
|
||||||
position = Static {xpos = 1920, ypos = 148, width = 1920, height = 30},
|
position = Static {xpos = 1940, ypos = 163, width = 1880, height = 34},
|
||||||
alpha = 255,
|
alpha = 255,
|
||||||
overrideRedirect = True,
|
overrideRedirect = True,
|
||||||
lowerOnStart = True,
|
lowerOnStart = True,
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
resolver: lts-19.23
|
resolver: lts-19.33
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
- .
|
- .
|
||||||
@ -7,9 +7,9 @@ extra-deps:
|
|||||||
- github: xmonad/x11
|
- github: xmonad/x11
|
||||||
commit: 8a33c4ebe7d0a1be96073d8c019f1f3901bbf344
|
commit: 8a33c4ebe7d0a1be96073d8c019f1f3901bbf344
|
||||||
- github: xmonad/xmonad
|
- github: xmonad/xmonad
|
||||||
commit: 57c3a131253720e542fb399b229b697614642b53
|
commit: 5ecdf7591d4f4bc3e44571326e66dfe895393a20
|
||||||
- github: xmonad/xmonad-contrib
|
- github: xmonad/xmonad-contrib
|
||||||
commit: 6117a867d984f97fb689eca986eff2989b2fe069
|
commit: 6fba80168df60d8a151515601f046a22cf9efbf5
|
||||||
- xmobar-0.44.2
|
- xmobar-0.44.2
|
||||||
|
|
||||||
flags:
|
flags:
|
||||||
|
@ -16,27 +16,27 @@ packages:
|
|||||||
original:
|
original:
|
||||||
url: https://github.com/xmonad/x11/archive/8a33c4ebe7d0a1be96073d8c019f1f3901bbf344.tar.gz
|
url: https://github.com/xmonad/x11/archive/8a33c4ebe7d0a1be96073d8c019f1f3901bbf344.tar.gz
|
||||||
- completed:
|
- completed:
|
||||||
size: 107338
|
size: 107331
|
||||||
url: https://github.com/xmonad/xmonad/archive/57c3a131253720e542fb399b229b697614642b53.tar.gz
|
url: https://github.com/xmonad/xmonad/archive/5ecdf7591d4f4bc3e44571326e66dfe895393a20.tar.gz
|
||||||
name: xmonad
|
name: xmonad
|
||||||
version: 0.17.1.9
|
version: 0.17.1.9
|
||||||
sha256: 3ad4fa2e31e227284d3bd5d20786cd3c960e5e56de716e9a3e8b5efa1c23a2e7
|
sha256: b5c72c205b2cc66251deb24af6cb338e2f271837e8cb67dfd484d1f107012c54
|
||||||
pantry-tree:
|
pantry-tree:
|
||||||
size: 3917
|
size: 3917
|
||||||
sha256: 56c75bff3591f9f448c730d109f16002d2b91c60a695ef3783415a1f7dc60602
|
sha256: 00c673ac7255489f7ded160e9fa9c0e7c4bf2ef697ce67bdbaf10072adc62549
|
||||||
original:
|
original:
|
||||||
url: https://github.com/xmonad/xmonad/archive/57c3a131253720e542fb399b229b697614642b53.tar.gz
|
url: https://github.com/xmonad/xmonad/archive/5ecdf7591d4f4bc3e44571326e66dfe895393a20.tar.gz
|
||||||
- completed:
|
- completed:
|
||||||
size: 668025
|
size: 673668
|
||||||
url: https://github.com/xmonad/xmonad-contrib/archive/6117a867d984f97fb689eca986eff2989b2fe069.tar.gz
|
url: https://github.com/xmonad/xmonad-contrib/archive/6fba80168df60d8a151515601f046a22cf9efbf5.tar.gz
|
||||||
name: xmonad-contrib
|
name: xmonad-contrib
|
||||||
version: 0.17.1.9
|
version: 0.17.1.9
|
||||||
sha256: f6ab8b33c936175f164cbe4add5c20e975e292a9d8f89e7d300f856eea157e05
|
sha256: 12efbfa9dc19ea9770d51fd6d1dabadf44e23f190f00b92791a061e82e6ded59
|
||||||
pantry-tree:
|
pantry-tree:
|
||||||
size: 24163
|
size: 24370
|
||||||
sha256: adcdf6221b8e60f8b3138f0e88da01a4434ae923c9f9be35d3a1b4aa53d67fd7
|
sha256: 66c16f132310a956bd86076efb55122dc02e5bedbb86fb7e6d1feeda9b52a082
|
||||||
original:
|
original:
|
||||||
url: https://github.com/xmonad/xmonad-contrib/archive/6117a867d984f97fb689eca986eff2989b2fe069.tar.gz
|
url: https://github.com/xmonad/xmonad-contrib/archive/6fba80168df60d8a151515601f046a22cf9efbf5.tar.gz
|
||||||
- completed:
|
- completed:
|
||||||
hackage: xmobar-0.44.2@sha256:a2eed5f8833194babd60e45520023cd5698ccb8d40976d1f41a9b53b350297d0,14895
|
hackage: xmobar-0.44.2@sha256:a2eed5f8833194babd60e45520023cd5698ccb8d40976d1f41a9b53b350297d0,14895
|
||||||
pantry-tree:
|
pantry-tree:
|
||||||
@ -46,7 +46,7 @@ packages:
|
|||||||
hackage: xmobar-0.44.2
|
hackage: xmobar-0.44.2
|
||||||
snapshots:
|
snapshots:
|
||||||
- completed:
|
- completed:
|
||||||
size: 619399
|
size: 619204
|
||||||
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/23.yaml
|
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/33.yaml
|
||||||
sha256: f5d9002479d87103fd070f17cfe71fcd2147676f1e47a2dabca5ab91a42b846d
|
sha256: 6d1532d40621957a25bad5195bfca7938e8a06d923c91bc52aa0f3c41181f2d4
|
||||||
original: lts-19.23
|
original: lts-19.33
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
-- heavily copied from github.com/scherso, all rights to him
|
-- heavily copied from github.com/scherso, all rights to him
|
||||||
|
|
||||||
cabal-version: 1.12
|
cabal-version: 1.12
|
||||||
|
|
||||||
name: zmonad
|
name: zmonad
|
||||||
@ -20,7 +19,6 @@ executable xmobar
|
|||||||
ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -O2 -j -dynamic -rtsopts -threaded -with-rtsopts=-N
|
ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -O2 -j -dynamic -rtsopts -threaded -with-rtsopts=-N
|
||||||
build-depends:
|
build-depends:
|
||||||
base
|
base
|
||||||
, dbus
|
|
||||||
, xmobar
|
, xmobar
|
||||||
, xmonad-contrib >=0.16
|
, xmonad-contrib >=0.16
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
@ -34,7 +32,6 @@ executable xmobar2
|
|||||||
ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -O2 -j -dynamic -rtsopts -threaded -with-rtsopts=-N
|
ghc-options: -Wall -Wcompat -Wincomplete-record-updates -Wincomplete-uni-patterns -Wredundant-constraints -O2 -j -dynamic -rtsopts -threaded -with-rtsopts=-N
|
||||||
build-depends:
|
build-depends:
|
||||||
base
|
base
|
||||||
, dbus
|
|
||||||
, xmobar
|
, xmobar
|
||||||
, xmonad-contrib >=0.16
|
, xmonad-contrib >=0.16
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
@ -50,7 +47,6 @@ executable xmonad
|
|||||||
X11 >=1.10
|
X11 >=1.10
|
||||||
, base
|
, base
|
||||||
, containers
|
, containers
|
||||||
, dbus
|
|
||||||
, xmonad
|
, xmonad
|
||||||
, xmonad-contrib >=0.16
|
, xmonad-contrib >=0.16
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
|
Loading…
Reference in New Issue
Block a user