aboutsummaryrefslogtreecommitdiff
path: root/.config/XMonad
diff options
context:
space:
mode:
Diffstat (limited to '.config/XMonad')
-rw-r--r--.config/XMonad/lib/Defaults.hs31
-rw-r--r--.config/XMonad/lib/Hooks.hs18
-rw-r--r--.config/XMonad/lib/Keybindings.hs8
-rw-r--r--.config/XMonad/lib/Scratchpads.hs2
-rw-r--r--.config/XMonad/xmonad.hs7
5 files changed, 8 insertions, 58 deletions
diff --git a/.config/XMonad/lib/Defaults.hs b/.config/XMonad/lib/Defaults.hs
index 15c278c..0d751d6 100644
--- a/.config/XMonad/lib/Defaults.hs
+++ b/.config/XMonad/lib/Defaults.hs
@@ -4,6 +4,7 @@ import XMonad
import XMonad.Layout.Spacing
import XMonad.Layout.Tabbed
import XMonad.Actions.GridSelect
+import XMonad.Util.Loggers
myBorder = "#120F23"
@@ -92,33 +93,3 @@ myGSConfig colorizer = (buildDefaultGSConfig myGSColorizer)
}
myGridSelect = myGSConfig myGSColorizer
-
--- bar config
-
-bottomBar = "-b"
-barDimensions = "1920x28+0+0"
-barBackground = "#1E2120"
-barForeground = "#FFFFFF"
-barFont = "-f 'SauceCodePro:style=Regular:size=12' -f 'Source Han Sans JP:size=11'"
-
-myLemonbar = "lemonbar " ++ bottomBar ++ " -g " ++ barDimensions ++ " -B '" ++ barBackground ++ "' -F '" ++ barForeground ++ "'" ++ barFont
--- myLemonbar = "cat > ~/lemonb/ffx"
-
--- wsVisibleBG = "#ffffff"
--- wsVisibleFG = "#FFFFFF"
-
-wsVisibleOccupiedBG = "#ff0aa3"
-wsVisibleOccupiedFG = "#FFFFFF"
-
--- multi monitor only
--- wsVisibleInactiveBG = "#ff0aa3"
--- wsVisibleInactiveFG = "#FFFFFF"
-
-wsOccupiedBG = "#9b1bed"
-wsOccupiedFG = "#FFFFFF"
-
-wsEmptyBG = "#272526"
-wsEmptyFG = "#9d00ff"
-
-titleBG = "#272526"
-titleFG = "#9d00ff"
diff --git a/.config/XMonad/lib/Hooks.hs b/.config/XMonad/lib/Hooks.hs
index 99bb530..9464b41 100644
--- a/.config/XMonad/lib/Hooks.hs
+++ b/.config/XMonad/lib/Hooks.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE DeriveDataTypeable #-}
module Hooks where
import XMonad
@@ -14,7 +15,6 @@ import XMonad.Layout.Tabbed
import XMonad.Hooks.SetWMName
import XMonad.Hooks.ManageDocks
import XMonad.Hooks.ManageHelpers
-import XMonad.Hooks.StatusBar.PP
import XMonad.Util.SpawnOnce
import XMonad.Util.Cursor
@@ -23,19 +23,6 @@ import XMonad.Util.NamedScratchpad
import Defaults
import Scratchpads
-myLemonbarPP = def {
- ppCurrent = wrap ("%{B" ++ wsVisibleOccupiedBG ++ "}%{F" ++ wsVisibleOccupiedFG ++ "} ") " %{B-}%{F-}"
- -- , ppVisibleNoWindows = wrap ("%{B" ++ wsVisibleBG ++ "}%{F" ++ wsVisibleFG ++ "} ") " %{B-}%{F-}"
- -- , ppVisibleNoWindows = wrap "" ""
- -- , ppVisible = wrap ("%{B" ++ wsVisibleBG ++ "}%{F" ++ wsVisibleFG ++ "} ") " %{B-}%{F-}"
- , ppHidden = wrap ("%{B" ++ wsOccupiedBG ++ "}%{F" ++ wsOccupiedFG ++ "} ") " %{B-}%{F-}"
- , ppHiddenNoWindows = wrap ("%{B" ++ wsEmptyBG ++ "}%{F" ++ wsEmptyFG ++ "} ") " %{B-}%{F-}"
- , ppTitle = wrap ("%{B" ++ titleBG ++ "}%{F" ++ titleFG ++ "} ") " %{B-}%{F-}"
- , ppWsSep = ""
- , ppSep = ""
- , ppOrder = \(ws:_:t:_) -> ["%{l}"++t++"","%{r}"++ws++""]
- }
-
myManageHook = namedScratchpadManageHook myScratchpads
<+> manageDocks <+> composeAll [
className =? "discord" --> doShift ( myWorkspaces !! 9 )
@@ -52,6 +39,5 @@ myStartupHook = do
spawnOnce "polystart"
spawnOnce "nitrogen --restore"
spawnOnce "cbatticon"
- setWMName "LG3D"
+ setWMName "Anime Thighs"
setDefaultCursor xC_left_ptr
-
diff --git a/.config/XMonad/lib/Keybindings.hs b/.config/XMonad/lib/Keybindings.hs
index 3a07683..2c8743d 100644
--- a/.config/XMonad/lib/Keybindings.hs
+++ b/.config/XMonad/lib/Keybindings.hs
@@ -34,11 +34,6 @@ import XMonad.Hooks.SetWMName
import XMonad.Hooks.ManageDocks
import XMonad.Hooks.EwmhDesktops
-import XMonad.Hooks.DynamicLog
--- DynamicLog replacement(s)
--- import XMonad.Hooks.StatusBar
--- import XMonad.Hooks.StatusBar.PP
-
-- utilities
import XMonad.Util.Run
import XMonad.Util.SpawnOnce
@@ -67,7 +62,8 @@ myKeybindings = [
, ((myModMask, xK_o), myScratchpad "Term 2")
, ((myModMask, xK_p), myScratchpad "Term 3")
- -- volume keys , ((myModMask, xK_equal), spawn volUp)
+ -- volume keys
+ , ((myModMask, xK_equal), spawn volUp)
, ((myModMask, xK_minus), spawn volDown)
, ((myModMask, xK_BackSpace), spawn volMute)
diff --git a/.config/XMonad/lib/Scratchpads.hs b/.config/XMonad/lib/Scratchpads.hs
index ae5fa57..69df739 100644
--- a/.config/XMonad/lib/Scratchpads.hs
+++ b/.config/XMonad/lib/Scratchpads.hs
@@ -15,10 +15,10 @@ myScratchpads =
, NS "Term 3" "alacritty -t 'Term 3'" (title =? "Term 3") (customFloating $ W.RationalRect (1/16) (1/16) (7/8) (7/8))
, NS "lf" "alacritty -t 'lf' -e 'lf'" (title =? "lf") (customFloating $ W.RationalRect (1/16) (1/16) (7/8) (7/8))
, NS "nmtui" "alacritty -t 'nmtui' -e 'nmtui'" (title =? "nmtui") (customFloating $ W.RationalRect (1/16) (1/16) (7/8) (7/8))
+ , NS "BPYTOP" "alacritty -t 'BPYTOP' -e 'bpytop'" (title =? "BPYTOP") (customFloating $ W.RationalRect (1/16) (1/16) (7/8) (7/8))
, NS "arandr" "arandr" (className =? "Arandr") (customFloating $ W.RationalRect (1/4) (1/4) (1/2) (1/2))
, NS "calc" "galculator" (className =? "Galculator") (customFloating $ W.RationalRect (5/13) (4/13) (3/13) (6/13))
, NS "blueman" "blueman-manager" (className =? "Blueman-manager") (customFloating $ W.RationalRect (5.5/16) (4/13) (5/16) (6/13))
, NS "pavucontrol" "pavucontrol" (className =? "Pavucontrol") (customFloating $ W.RationalRect (3/12) (1/12) (3/6) (5/6))
, NS "wallpaper" "nitrogen" (className =? "Nitrogen") (customFloating $ W.RationalRect (3/12) (1/12) (3/6) (5/6))
- , NS "BPYTOP" "alacritty -t 'BPYTOP' -e 'bpytop'" (title =? "BPYTOP") (customFloating $ W.RationalRect (1/16) (1/16) (7/8) (7/8))
]
diff --git a/.config/XMonad/xmonad.hs b/.config/XMonad/xmonad.hs
index 6286115..69551ba 100644
--- a/.config/XMonad/xmonad.hs
+++ b/.config/XMonad/xmonad.hs
@@ -6,7 +6,6 @@ import XMonad.Layout.Fullscreen
import XMonad.Hooks.ManageDocks
import XMonad.Hooks.EwmhDesktops
-import XMonad.Hooks.StatusBar.PP
import XMonad.Util.EZConfig
import XMonad.Util.Run
@@ -17,9 +16,9 @@ import Hooks
main :: IO ()
main = do
- lemonBar <- spawnPipe myLemonbar
xmonad $ ewmh $ docks $ fullscreenSupport def {
focusFollowsMouse = True
+ , terminal = myTerminal
, borderWidth = myBorderWidth
, modMask = myModMask
, workspaces = myWorkspaces
@@ -28,8 +27,6 @@ main = do
, layoutHook = myLayoutHook
, startupHook = myStartupHook
, manageHook = myManageHook
- , logHook = dynamicLogWithPP myLemonbarPP { ppOutput = \x -> hPutStrLn lemonBar x}
- }
- `additionalKeys` myKeybindings
+ } `additionalKeys` myKeybindings
`additionalKeysP` myKeybindingsP
`additionalMouseBindings` myMouseKeybindings
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 08:20:14 +0000