added blueman to scratchpads

1 files changed, 37 insertions, 35 deletions

diff --git a/.config/XMonad/xmonad.hs b/.config/XMonad/xmonad.hs
index 3b83b1b..fc2e219 100644
--- a/.config/XMonad/xmonad.hs
+++ b/.config/XMonad/xmonad.hs
@@ -47,15 +47,15 @@ myExtraWorkspaces = [(xK_0, "十")] -- , (xK_comma, "  十一  "), (xK_period, "
 myWorkspaces = ["一", "二", "三", "四", "五", "六", "七", "八", "九"] ++ (map snd myExtraWorkspaces)
 
 myScratchpads = 
-  [ NS "Term 0" "alacritty -t 'Term 0'"     (title     =? "Term 0") (customFloating $ W.RationalRect (1/16) (1/16) (7/8) (7/8))
-	, NS "Term 1" "alacritty -t 'Term 1'"     (title     =? "Term 1") (customFloating $ W.RationalRect (1/16) (1/16) (7/8) (7/8))
-	, NS "Term 2" "alacritty -t 'Term 2'"     (title     =? "Term 2") (customFloating $ W.RationalRect (1/16) (1/16) (7/8) (7/8))
-  , NS "OBS"    "obs"                       (className =? "obs")    (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 "calc"   "kcalc"                     (className =? "kcalc")  defaultFloating
-	, NS "arandr" "arandr"                    (className =? "Arandr") defaultFloating
-	, NS "pavucontrol" "pavucontrol"          (className =? "Pavucontrol") (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 "Term 0"      "alacritty -t 'Term 0'"     (title     =? "Term 0") (customFloating $ W.RationalRect (1/16) (1/16) (7/8) (7/8))
+	, NS "Term 1"      "alacritty -t 'Term 1'"     (title     =? "Term 1") (customFloating $ W.RationalRect (1/16) (1/16) (7/8) (7/8))
+	, NS "Term 2"      "alacritty -t 'Term 2'"     (title     =? "Term 2") (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 "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 "BPYTOP" "alacritty -t 'BPYTOP' -e 'bpytop'"  (title =? "BPYTOP")          (customFloating $ W.RationalRect (1/16) (1/16) (7/8) (7/8))
   ]
 
 myTabTheme = def { fontName            = myFont
@@ -119,14 +119,14 @@ gamingTS =
 myGamingTS a = TS.treeselectAction a gamingTS
 
 scratchpadTS =
-  [ Node (TS.TSNode "Term 0"      "" (namedScratchpadAction myScratchpads "Term 0")) []
-  , Node (TS.TSNode "Term 1"      "" (namedScratchpadAction myScratchpads "Term 1")) []
-  , Node (TS.TSNode "Term 2"      "" (namedScratchpadAction myScratchpads "Term 2")) []
-  , Node (TS.TSNode "OBS"         "" (namedScratchpadAction myScratchpads "OBS"))    []
-  , Node (TS.TSNode "lf"          "" (namedScratchpadAction myScratchpads "lf"))     []
-  , Node (TS.TSNode "BPYTOP"      "" (namedScratchpadAction myScratchpads "BPYTOP")) []
-  , Node (TS.TSNode "Calculator"  "" (namedScratchpadAction myScratchpads "calc"))   []
-  , Node (TS.TSNode "Arandr"      "" (namedScratchpadAction myScratchpads "arandr")) []
+  [ Node (TS.TSNode "Term 0"      "" (namedScratchpadAction myScratchpads "Term 0"))  []
+  , Node (TS.TSNode "Term 1"      "" (namedScratchpadAction myScratchpads "Term 1"))  []
+  , Node (TS.TSNode "Term 2"      "" (namedScratchpadAction myScratchpads "Term 2"))  []
+  , Node (TS.TSNode "lf"          "" (namedScratchpadAction myScratchpads "lf"))      []
+  , Node (TS.TSNode "BPYTOP"      "" (namedScratchpadAction myScratchpads "BPYTOP"))  []
+  , Node (TS.TSNode "Calculator"  "" (namedScratchpadAction myScratchpads "calc"))    []
+  , Node (TS.TSNode "Arandr"      "" (namedScratchpadAction myScratchpads "arandr"))  []
+  , Node (TS.TSNode "Blueman"     "" (namedScratchpadAction myScratchpads "blueman")) []
   , Node (TS.TSNode "Pavucontrol" "" (namedScratchpadAction myScratchpads "pavucontrol")) []
   ]
 myScratchpadTS a = TS.treeselectAction a scratchpadTS
@@ -194,21 +194,21 @@ main = do
     , modMask            = myModMask
     , workspaces         = myWorkspaces
     , normalBorderColor  = "#130F23"
-    , focusedBorderColor = "#BF00FF"
+    , focusedBorderColor = "#e310a9"
     , layoutHook         = avoidStruts $ maximize $ windowNavigation $ smartBorders $ myGap $ (
         emptyBSP ||| tabbed shrinkText myTabTheme ||| emptyBSP ||| Grid)
-    , manageHook         = namedScratchpadManageHook myScratchpads <+> manageDocks <+> composeAll [ className =? "plasmashell"    --> doIgnore , className =? "ksmserver"      --> doIgnore 
-      , className =? "kcalc"          --> doFloat 
-      , className =? "systemsettings" --> doFloat 
-      , className =? "confirm"        --> doFloat 
-      , className =? "file_progress"  --> doFloat 
-      , className =? "dialog"         --> doFloat 
-      , className =? "download"       --> doFloat 
-      , className =? "error"          --> doFloat 
-      , className =? "notification"   --> doFloat 
-      , className =? "splash"         --> doFloat 
-      , className =? "toolbar"        --> doFloat 
-      ]
+    , startupHook        = do
+      -- spawnOnce "lxsession"
+      spawnOnce "polybar mybar"
+      spawnOnce "picom"
+      spawnOnce "dunst"
+      spawnOnce "nitrogen --restore"
+      spawnOnce "optimus-manager-qt"
+      spawnOnce "xmodmap /home/zt/.Xmodmap"
+      -- spawnOnce ""
+      setWMName "LG3D"
+      setDefaultCursor xC_left_ptr
+    , manageHook         = namedScratchpadManageHook myScratchpads <+> manageDocks
 } `additionalMouseBindings` [ 
       ((myModMask, 4), \w -> prevWS), ((myModMask, 5), \w -> nextWS)
     ] `additionalKeys` ([
@@ -302,7 +302,7 @@ main = do
     ) `additionalKeysP` [
         ("M-c", spawn myColorPicker)
         -- Launchers
-        , ("M-S-w",   myDevTS          myTSConfig)
+        , ("M-S-w", myDevTS          myTSConfig)
         , ("M-x",   myXmonadTS       myTSConfig)
         , ("M-e",   myMediaTS        myTSConfig)
         , ("M-S-e", myGamingTS       myTSConfig)
@@ -316,13 +316,15 @@ main = do
         , ("M-r",   namedScratchpadAction myScratchpads "Term 0")
         , ("M-t",   namedScratchpadAction myScratchpads "Term 1")
         , ("M-y",   namedScratchpadAction myScratchpads "Term 2")
-        , ("M-S-o", namedScratchpadAction myScratchpads "OBS")
         , ("M-m",   namedScratchpadAction myScratchpads "BPYTOP")
         , ("M-S-m", namedScratchpadAction myScratchpads "calc")
         , ("M-n",   namedScratchpadAction myScratchpads "pavucontrol")
         , ("M-S-n", namedScratchpadAction myScratchpads "arandr")
-        , ("M-b", namedScratchpadAction myScratchpads "lf")
+        , ("M-u",   namedScratchpadAction myScratchpads "lf")
+        , ("M-b",   namedScratchpadAction myScratchpads "blueman")
         -- other apps
-        , ("M-S-b", spawn "dolphin")
+        , ("M-S-u", spawn "dolphin")
+        , ("M-S-b", spawn "brave")
+        , ("M-S-i", spawn "librewolf")
     ]
-    -- used keys: x e w o i p r t y q n b
+    -- used keys: x e w o i p r t y q n b c