Updated modal keybindings

11 files changed, 122 insertions, 20 deletions

diff --git a/.config/XMonad/lib/Defaults.hi b/.config/XMonad/lib/Defaults.hi
deleted file mode 100644
index c8569d3..0000000
--- a/.config/XMonad/lib/Defaults.hi
+++ /dev/null
diff --git a/.config/XMonad/lib/Defaults.hs b/.config/XMonad/lib/Defaults.hs
index 8d12f3c..34806e8 100644
--- a/.config/XMonad/lib/Defaults.hs
+++ b/.config/XMonad/lib/Defaults.hs
@@ -3,6 +3,7 @@ module Defaults where
 import XMonad
 import XMonad.Layout.Spacing
 import XMonad.Layout.Tabbed
+import XMonad.Actions.GridSelect
 
 myBorder          = "#120F23"
 myBorder'         = "#C44CF2"
@@ -14,12 +15,15 @@ myFont            = "xft:Sauce Code Pro:style=Regular:size=14"
 
 myModMask         = mod4Mask
 myModMask'        = mod1Mask
+myModShiftMask    = myModMask  .|. shiftMask
+myModShiftMask'   = myModMask' .|. shiftMask
 
 myLockscreen      = "notify-send 'to be set up!' 'to be set up!'"
 myColorPicker     = "colorpicker --short --one-shot --preview | xsel -b"
 
 myTerminal        = "open_terminal"
 myTerminal'       = "alacritty"
+myLauncher        = "dmenu_run"
 
 volUp             = "pamixer -i 5"
 volDown           = "pamixer -d 5"
@@ -28,10 +32,25 @@ volMute           = "pamixer -t"
 backlightUp       = "brightnessctl s +5"
 backlightDown     = "brightnessctl s 5-"
 
+wifiOn            = "nmcli radio wifi on"
+wifiOff :: String
+wifiOff           = "nmcli radio wifi off"
+
 screenshot        = "flameshot screen"
 fullScreenshot    = "flameshot full"
 customScreenshot  = "flameshot gui"
 
+myBrowser         = "librewolf"
+myBrowser'        = "brave"
+
+myTorrentClient   = "qbittorrent"
+
+myFileManager     = "pcmanfm"
+myFileManager'    = "lf"
+
+myTextEditor      = "emacs"
+myTextEditor'     = "nvim"
+
 -- workspaces
 myExtraWorkspaces = [(xK_0, "十")] -- , (xK_comma, "  十一  "), (xK_period, "  十二  "), (xK_slash, "  十三  ")]
 myWorkspaces      = ["一", "二", "三", "四", "五", "六", "七", "八", "九"] ++ map snd myExtraWorkspaces
@@ -53,3 +72,26 @@ myTabTheme = def {
     , inactiveTextColor   = "#d0d0d0"
     , decoHeight          = 20
   }
+myGSColorizer :: Window -> Bool -> X (String, String)
+myGSColorizer = colorRangeFromClassName
+  (0x28,0x2c,0x34) -- lowest inactive bg
+  (0x28,0x2c,0x34) -- highest inactive bg
+  -- (0xff,0xff,0xff) -- lowest inactive bg
+  -- (0xff,0xff,0xff) -- highest inactive bg
+  (0xc4,0x4c,0xf2) -- active bg
+  (0xff,0xff,0xff) -- inactive fg
+  (0xff,0xff,0xff) -- active fg
+
+myGSConfig colorizer = (buildDefaultGSConfig myGSColorizer)
+    { gs_cellheight   = 36
+    , gs_cellwidth    = 180
+    , gs_cellpadding  = 6
+    , gs_originFractX = 0.5
+    , gs_originFractY = 0.5
+    , gs_font         = myFont
+    }
+
+myGridSelect = myGSConfig myGSColorizer
+
+-- myBorder          = "#120F23"
+-- myBorder'         = "#C44CF2"
diff --git a/.config/XMonad/lib/Defaults.o b/.config/XMonad/lib/Defaults.o
deleted file mode 100644
index 02b9289..0000000
--- a/.config/XMonad/lib/Defaults.o
+++ /dev/null
diff --git a/.config/XMonad/lib/Hooks.hi b/.config/XMonad/lib/Hooks.hi
deleted file mode 100644
index 8173f5f..0000000
--- a/.config/XMonad/lib/Hooks.hi
+++ /dev/null
diff --git a/.config/XMonad/lib/Hooks.o b/.config/XMonad/lib/Hooks.o
deleted file mode 100644
index 4dfa76f..0000000
--- a/.config/XMonad/lib/Hooks.o
+++ /dev/null
diff --git a/.config/XMonad/lib/Keybindings.hi b/.config/XMonad/lib/Keybindings.hi
deleted file mode 100644
index 90f098a..0000000
--- a/.config/XMonad/lib/Keybindings.hi
+++ /dev/null
diff --git a/.config/XMonad/lib/Keybindings.hs b/.config/XMonad/lib/Keybindings.hs
index 184e7f9..15b8e2f 100644
--- a/.config/XMonad/lib/Keybindings.hs
+++ b/.config/XMonad/lib/Keybindings.hs
@@ -1,6 +1,6 @@
 module Keybindings where
-
 import XMonad
+import XMonad.Operations
 import qualified XMonad.StackSet as W
 import System.Exit
 import System.IO
@@ -11,6 +11,7 @@ import qualified Data.Map as M
 
 -- actions
 import XMonad.Actions.CopyWindow
+import XMonad.Actions.WithAll
 import XMonad.Actions.CycleWS
 import XMonad.Actions.GridSelect
 import XMonad.Actions.SwapWorkspaces
@@ -58,13 +59,13 @@ myKeybindings :: [((KeyMask, KeySym), X ())]
 myKeybindings = [
     ((myModMask, xK_Return), spawn myTerminal)
     , ((myModMask .|. shiftMask, xK_q), kill1)
+    , ((myModShiftMask, xK_p), spawn myLauncher)
 
     -- scratchpads
-    , ((myModMask, xK_u), myScratchpad "Term 0")
-    , ((myModMask, xK_i), myScratchpad "Term 1")
-    , ((myModMask, xK_o), myScratchpad "Term 2")
-    , ((myModMask, xK_p), myScratchpad "Term 3")
-
+    , ((myModMask,      xK_u), myScratchpad "Term 0")
+    , ((myModMask,      xK_i), myScratchpad "Term 1")
+    , ((myModMask,      xK_o), myScratchpad "Term 2")
+    , ((myModMask,      xK_p), myScratchpad "Term 3")
 
     -- volume keys , ((myModMask, xK_equal), spawn volUp)
     , ((myModMask, xK_minus),     spawn volDown)
@@ -162,18 +163,76 @@ myKeybindings = [
 
 myKeybindingsP :: [(String, X())]
 myKeybindingsP = [
-    -- fn keys
     ("<XF86MonBrightnessUp>",     spawn backlightUp)
     , ("<XF86MonBrightnessDown>", spawn backlightDown)
     , ("<XF86AudioRaiseVolume>",  spawn volUp)
     , ("<XF86AudioLowerVolume>",  spawn volDown)
     , ("<XF86AudioMute>",         spawn volMute)
-    , ("M-S-p", spawn "dmenu_run")
-    -- scratchpads
-    , ("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 "blueman")
-    , ("M-S-r", namedScratchpadAction myScratchpads "wallpaper")
+    -- actions
+    -- TODO: add reboot, shutdown, logout, copy, cut, paste
+    , ("M-a w",                   spawn volMute)
+    , ("M-a S-w",                 spawn wifiOn)
+    , ("M-a s",                   spawn wifiOff)
+    , ("M-a S-s",                 spawn fullScreenshot)
+    , ("M-a m",                   spawn volMute)
+    -- media
+    , ("M-m w",                   myScratchpad "wallpaper")
+    , ("M-m o",                   spawn "obs")
+    , ("M-m S-o",                 spawn "osu")
+    , ("M-m s",                   spawn "syncplay")
+    , ("M-m g",                   spawn "gimp")
+    , ("M-m k",                   spawn "kdenlive")
+    , ("M-m l",                   spawn "lutris")
+    , ("M-m v",                   spawn "vlc")
+    , ("M-m m",                   spawn "minecraft-launcher")
+    -- system apps/scratchpads
+    , ("M-b t",                   spawn myTorrentClient)
+    , ("M-b i",                   spawn myBrowser)
+    , ("M-b d",                   myScratchpad "aarandr")
+    , ("M-b c",                   myScratchpad "calc")
+    , ("M-b b",                   myScratchpad "blueman")
+    , ("M-b p",                   myScratchpad "pavucontrol")
+    , ("M-b m",                   myScratchpad "BPYTOP")
+    , ("M-b n",                   myScratchpad "nmtui")
+    -- websites
+    , ("M-n y",                   spawn $ myBrowser ++ " https://youtube.com")
+    , ("M-n d",                   spawn $ myBrowser ++ " https://duckduckgo.com")
+    , ("M-n g",                   spawn $ myBrowser ++ " https://google.com")
+    , ("M-n S-g",                 spawn $ myBrowser ++ " https://github.com")
+    , ("M-n j",                   spawn $ myBrowser ++ " https://www.youtube.com/playlist?list=PL8lRJQHQWddu55nsz8CezmJJ-GRVISZ1E")
+    , ("M-n k",                   spawn $ myBrowser ++ " https://www.youtube.com/playlist?list=PL8lRJQHQWddvzCv02lClCfDfUo97wzX1A")
+    , ("M-n c",                   spawn $ myBrowser ++ " https://www.youtube.com/playlist?list=PL8lRJQHQWdduy2V0DQQ4Lm0P572XJFVB9")
+    , ("M-n v",                   spawn $ myBrowser ++ " https://vidhukant.xyz")
+    , ("M-n S-v",                 spawn $ myBrowser ++ " https://blog.vidhukant.xyz")
+    , ("M-n m",                   spawn $ myBrowser ++ " https://myanimelist.net/profile/0ZeroTsu")
+    -- other apps
+    -- TODO: add scrcpy
+    , ("M-y t",                   spawn myTorrentClient)
+    , ("M-y S-t",                 spawn "torbrowser-launcher")
+    , ("M-y i",                   spawn myBrowser)
+    , ("M-y d",                   spawn "discord")
+    , ("M-y f",                   spawn "firefox")
+    , ("M-y v",                   spawn "virt-manager")
+    , ("M-y b",                   spawn "brave")
+    , ("M-y p",                   spawn myFileManager)
+    , ("M-y S-p",                 spawn $ myTerminal' ++ " -e " ++ myFileManager')
+    -- XMonad
+    , ("M-q q",                   gridselectWindow myGridSelect >>= flip whenJust (\w -> killWindow w))
+    , ("M-q S-q",                 killAll)
+    , ("M-q r",                   sendMessage Rotate)
+    , ("M-q t",                   sendMessage ToggleStruts)
+    , ("M-q s",                   sendMessage BSP.Swap)
+    , ("M-q g",                   goToSelected myGridSelect)
+    , ("M-q c",                   windows copyToAll)
+    , ("M-q S-c",                 killAllOtherCopies)
+    , ("M-q b",                   bringSelected myGridSelect)
+    -- resize windows
+    , ("M-q h",                   sendMessage $ ExpandTowards L)
+    , ("M-q j",                   sendMessage $ ExpandTowards D)
+    , ("M-q k",                   sendMessage $ ExpandTowards U)
+    , ("M-q l",                   sendMessage $ ExpandTowards R)
+    , ("M-q S-h",                 sendMessage $ ShrinkFrom L)
+    , ("M-q S-j",                 sendMessage $ ShrinkFrom D)
+    , ("M-q S-k",                 sendMessage $ ShrinkFrom U)
+    , ("M-q S-l",                 sendMessage $ ShrinkFrom R)
   ]
diff --git a/.config/XMonad/lib/Keybindings.o b/.config/XMonad/lib/Keybindings.o
deleted file mode 100644
index c342e42..0000000
--- a/.config/XMonad/lib/Keybindings.o
+++ /dev/null
diff --git a/.config/XMonad/lib/Scratchpads.hi b/.config/XMonad/lib/Scratchpads.hi
deleted file mode 100644
index 667b8c8..0000000
--- a/.config/XMonad/lib/Scratchpads.hi
+++ /dev/null
diff --git a/.config/XMonad/lib/Scratchpads.hs b/.config/XMonad/lib/Scratchpads.hs
index 5fb8952..ae5fa57 100644
--- a/.config/XMonad/lib/Scratchpads.hs
+++ b/.config/XMonad/lib/Scratchpads.hs
@@ -9,11 +9,12 @@ myScratchpad :: String -> X ()
 myScratchpad x = namedScratchpadAction myScratchpads x
 
 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 "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 "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 "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 "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))
diff --git a/.config/XMonad/lib/Scratchpads.o b/.config/XMonad/lib/Scratchpads.o
deleted file mode 100644
index c582a58..0000000
--- a/.config/XMonad/lib/Scratchpads.o
+++ /dev/null