added more functions to TS and change colors a bit

1 files changed, 31 insertions, 21 deletions

diff --git a/XMonad/xmonad.hs b/XMonad/xmonad.hs
index c6724517..2f3ff01c 100644
--- a/XMonad/xmonad.hs
+++ b/XMonad/xmonad.hs
@@ -117,12 +117,12 @@ myFont = "xft:Roboto:pixelsize=16:antialias=true"
 
 -- wm variables
 
-nBorder = "#000000" -- "#3804f4" -- "#bf00ff"
-fBorder = "#6e02fc"
+nBorder = "#130F23" -- "#3804f4" -- "#bf00ff"
+fBorder = "#00ff85"
 
 myBorderWidth = 1
 
-sGap = 0 -- screen gap
+sGap = 1 -- screen gap
 wGap = 1 -- window gap
 
 myExtraWorkspaces = [(xK_0, "  十  ")] -- , (xK_comma, "  十一  "), (xK_period, "  十二  "), (xK_slash, "  十三  ")]
@@ -181,24 +181,34 @@ myPowerMenu a = TS.treeselectAction a
 myTreeMenu :: TS.TSConfig (X ()) -> X ()
 myTreeMenu a = TS.treeselectAction a
     [ Node (TS.TSNode "Section Screenshot" "Take screenshot of a section on the screen" (spawn "scrot -s /zt/Screenshots/Screenshot-%Y-%d-%m--%T.png")) []
-    , Node (TS.TSNode "Terminals" "Launch terminals for various tasks" (return()))
-        [ Node (TS.TSNode "Web dev" "for websites" (return()))
-	    [ Node (TS.TSNode "KE-Site" "Kalawati Enterprises Site" (spawn "launch_terminals_ke-site")) []
-	    ]
+    , Node (TS.TSNode "Utilities" "" (return()))
+        [ Node (TS.TSNode "Pavucontrol" "" (spawn "pavucontrol")) []
+        , Node (TS.TSNode "Color Picker" "" (spawn myColorPicker)) []
+        , Node (TS.TSNode "bashtop" "" (spawn "st -e bashtop")) []
+        , Node (TS.TSNode "htop" "" (spawn "st -e htop")) []
+        , Node (TS.TSNode "lxappearance" "" (spawn "st -e lxappearance")) []
 	]
-    , Node (TS.TSNode "GUI Apps" "Shitty apps that require a mouse" (return()))
+    , Node (TS.TSNode "Apps" "" (return()))
         [ Node (TS.TSNode "Torrents" "" (spawn "qbittorrent")) []
-	, Node (TS.TSNode "Pavucontrol" "" (spawn "Pavucontrol")) []
         , Node (TS.TSNode "Discord" "" (spawn "discord-canary")) []
         , Node (TS.TSNode "LibreOffice" "" (spawn "libreoffice")) []
-        , Node (TS.TSNode "Vivaldi" "" (spawn "vivaldi-stable")) []
-        , Node (TS.TSNode "Firefox" "" (spawn "firefox")) []
+    	, Node (TS.TSNode "Browsers" "" (return()))
+            [ Node (TS.TSNode "Vivaldi" "" (spawn "vivaldi-stable")) []
+            , Node (TS.TSNode "Firefox" "" (spawn "firefox")) []
+            , Node (TS.TSNode "Brave" "" (spawn "brave")) []
+	    ]
+	]
+    , Node (TS.TSNode "Other" "" (return()))
+        [ Node (TS.TSNode "Recompile XMonad" "Recompile and restart the window manager" (spawn "xmonad --recompile && xmonad --restart")) []
+        , Node (TS.TSNode "Launch DMenu" "just in case the keybinding doesn't work" (spawn "run_dmenu")) []
+        , Node (TS.TSNode "Restart server" "Restart startpage server" (spawn "killall startpage-server;startpage-server")) []
+        , Node (TS.TSNode "notify" "send a notification" (spawn "notify-send 'This is a notification' 'Hello World!'")) []
+	]
+    , Node (TS.TSNode "Power" "" (return()))
+        [ Node (TS.TSNode "Shutdown" "It's not like I'll miss you b- baka!" (spawn "shutdown now")) []
+        , Node (TS.TSNode "Reboot" "What are you doing!" (spawn "reboot")) []
+        , Node (TS.TSNode "Cancel" "Yamete kudasai" (return())) []
 	]
-    , Node (TS.TSNode "Terminal Apps" "Command line apps" (return())) 
-        [ Node (TS.TSNode "Htop" "" (spawn "st -e htop")) []
-        , Node (TS.TSNode "Bashtop" "" (spawn "st -e bashtop")) []
-        , Node (TS.TSNode "Ranger" "" (spawn  "st -e ranger")) []
-        ]
     ]
 
 
@@ -214,18 +224,18 @@ myScratchpads = [
 -- keybindings
 myKeys = [
          ((myModMask, xK_Return), spawn (myTerminal))
-         , ((myModMask, xK_p), spawn (myLauncher))
+         , ((myModMask .|. shiftMask, xK_p), spawn (myLauncher))
 	 , ((myModMask .|. shiftMask, xK_Return), spawn (myScreenshot))
 	 , ((myModMask, xK_q), spawn (myLockscreen))
-	 , ((mod1Mask, xK_Return), spawn (myColorPicker))
+	 , ((myModMask, xK_c), spawn (myColorPicker))
 
-         , ((mod1Mask, xK_w), kill1)
-         , ((mod1Mask .|. shiftMask, xK_k), kill1)
+         , ((altMask, xK_w), kill1)
+         , ((altMask .|. shiftMask, xK_k), kill1)
          , ((myModMask, xK_a), withFocused $ windows . W.sink) -- unfloat windows
 
          -- TreeSelect
 	 , ((altMask, xK_F4), myPowerMenu myTSConfig)
-	 , ((myModMask, xK_n), myTreeMenu myTSConfig)
+	 , ((myModMask, xK_p), myTreeMenu myTSConfig)
 
          -- launch apps/execute scripts
          -- , ((myModMask, xK_i), spawn (myBrowser))