diff options
Diffstat (limited to '.config/XMonad')
| -rw-r--r-- | .config/XMonad/lib/Defaults.hs | 69 | ||||
| -rw-r--r-- | .config/XMonad/lib/Keybindings.hs | 4 | ||||
| -rw-r--r-- | .config/XMonad/lib/TreeSelect.hs | 20 | ||||
| -rw-r--r-- | .config/XMonad/xmonad.hs | 2 |
4 files changed, 19 insertions, 76 deletions
diff --git a/.config/XMonad/lib/Defaults.hs b/.config/XMonad/lib/Defaults.hs index 1aafc80..29d4313 100644 --- a/.config/XMonad/lib/Defaults.hs +++ b/.config/XMonad/lib/Defaults.hs @@ -7,21 +7,13 @@ import qualified XMonad.Actions.TreeSelect as TS import XMonad.Actions.GridSelect import XMonad.Util.Loggers --- import XMonad.Hooks.StatusBar --- import XMonad.Hooks.StatusBar.PP - -myBorder = "#282c34" -myBorder' = "#c678dd" --- myBorder = "#120F23" --- myBorder' = "#a663cc" --- myBorder' = "#C44CF2" --- myBorder = "#120F23" --- myBorder' = "#1ca09d" +myBorder = "#11111b" +myBorder' = "#cba6f7" myBorderWidth :: Dimension -myBorderWidth = 1 +myBorderWidth = 2 -myFont = "xft:Sauce Code Pro:style=Regular:size=14" +myFont = "xft:Roboto:style=Regular:size=12" myModMask = mod4Mask myModMask' = mod1Mask @@ -32,8 +24,8 @@ myLockscreen = "betterlockscreen -q -l" myColorPicker = "colorpicker --short --one-shot --preview | xsel -b" myTerminal = "open_terminal" -myTerminal' = "WINIT_X11_SCALE_FACTOR=1.5 alacritty" -myLauncher = "dmenu_run" +myTerminal' = "alacritty" +myLauncher = "rofi -show drun" prevTrack = "playerctl previous" nextTrack = "playerctl next" @@ -47,8 +39,8 @@ micVolUp = "pamixer --default-source -i 5" micVolDown = "pamixer --default-source -d 5" micVolMute = "pamixer --default-source -t" -backlightUp = "brightnessctl s +5" -backlightDown = "brightnessctl s 5-" +backlightUp = "brightnessctl s +1%" +backlightDown = "brightnessctl s 1%-" wifiOn = "nmcli radio wifi on" wifiOff = "nmcli radio wifi off" @@ -68,7 +60,6 @@ myFileManager = "pcmanfm" myFileManager' = "lf" myTextEditor = "doom run" -myTextEditor' = "codium" myTermTextEditor = "nvim" myEmailClient = "thunderbird" @@ -84,22 +75,12 @@ myCalculator = "galculator" myExtraWorkspaces = [(xK_0, "十")] myWorkspaces = ["一", "二", "三", "四", "五", "六", "七", "八", "九"] ++ map snd myExtraWorkspaces --- links -myWebsite = "https://vidhukant.com" -myGitServer = "https://mikunonaka.net" -myGitHubProfile = "https://github.com/MikunoNaka" -myYTChannel = "https://www.youtube.com/@MikunoNakaZT" -myMALProfile = "https://myanimelist.net/profile/0ZeroTsu" -myCloud = "https://cloud.vidhukant.com" -vpsDashboard = "https://cloud.linode.com/linodes" -dnsDashboard = "https://cloud.linode.com/domains" - -- screen gaps sGap = 3 wGap = 4 --- myGap = spacingRaw True (Border sGap sGap sGap sGap) True (Border wGap wGap wGap wGap) True -myGap = spacingRaw False (Border sGap sGap sGap sGap) True (Border wGap wGap wGap wGap) True +myGap = spacingRaw True (Border sGap sGap sGap sGap) True (Border wGap wGap wGap wGap) True +-- myGap = spacingRaw False (Border sGap sGap sGap sGap) True (Border wGap wGap wGap wGap) True myTabTheme = def { fontName = myFont @@ -112,15 +93,14 @@ myTabTheme = def { , decoHeight = 20 } ---myBorder' = "#c678dd" myTSConfig = TS.TSConfig { - TS.ts_hidechildren = True - , TS.ts_background = 0xb30e0911 + TS.ts_hidechildren = True + , TS.ts_background = 0xb311111b , TS.ts_font = myFont - , TS.ts_node = (0xffd0d0d0, 0xff1c1f24) - , TS.ts_nodealt = (0xffd0d0d0, 0xff282c34) - , TS.ts_highlight = (0xffffffff, 0xff755999) - , TS.ts_extra = 0xffffffff + , TS.ts_node = (0xffcdd6f4, 0xff1e1e2e) + , TS.ts_nodealt = (0xffbac2de, 0xff181825) + , TS.ts_highlight = (0xff11111b, 0xffcba6f7) + , TS.ts_extra = 0xffcdd6f4 , TS.ts_node_width = 220 , TS.ts_node_height = 28 , TS.ts_originX = 0 @@ -133,8 +113,6 @@ 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 @@ -149,18 +127,3 @@ myGSConfig colorizer = (buildDefaultGSConfig myGSColorizer) } myGridSelect = myGSConfig myGSColorizer - --- myLemonbarCmd = "lemon | lemonbar -d -g 1920x28+1920+0 -o -2 -f 'Source Han Sans JP Normal:size=12' -B '#e6100b13' -F '#9d00ff'" --- myLemonbarCmd' = "lemon | lemonbar -d -g 1920x20+0+0 -o 0 -f 'Source Han Sans JP Normal:size=9' -B '#e6100b13' -F '#9d00ff'" --- --- myLemonbarPP = def { --- ppCurrent = wrap "%{B#ff0aa3} %{F#FFFFFF}" " %{F-}%{B-}" --- , ppVisible = wrap "%{B#28c78f} %{F#FFFFFF}" " %{F-}%{B-}" --- , ppHidden = wrap "%{B#9b1bed} %{F#FFFFFF}" " %{F-}%{B-}" --- , ppHiddenNoWindows = wrap " " " " --- --, ppVisibleNoWindows = wrap "%{B#ffffff} %{F#9b1bed}" " %{F-}%{B-}" --- , ppWsSep = "" --- , ppSep = "" --- , ppTitle = wrap " " "" . shorten 60 --- , ppOrder = \(ws:l:t:ex) -> [t]++["%{r}",ws] --- } diff --git a/.config/XMonad/lib/Keybindings.hs b/.config/XMonad/lib/Keybindings.hs index 6255626..6d7f901 100644 --- a/.config/XMonad/lib/Keybindings.hs +++ b/.config/XMonad/lib/Keybindings.hs @@ -64,10 +64,10 @@ myKeybindings :: [((KeyMask, KeySym), X ())] myKeybindings = [ ((myModMask, xK_Return), spawn myTerminal) , ((myModShiftMask, xK_Return), spawn myLockscreen) - , ((myModMask .|. shiftMask, xK_c), kill1) + , ((myModMask, xK_w ), kill1) , ((myModMask, xK_s), showTS myMainTS) - , ((myModShiftMask, xK_s), spawn myLauncher) + , ((myModShiftMask, xK_s), spawn myLauncher) -- view prev/next workspaces , ((myModMask', xK_h ), prevWS) diff --git a/.config/XMonad/lib/TreeSelect.hs b/.config/XMonad/lib/TreeSelect.hs index 1fb49dc..1a859d4 100644 --- a/.config/XMonad/lib/TreeSelect.hs +++ b/.config/XMonad/lib/TreeSelect.hs @@ -33,7 +33,6 @@ myEditingTS = [ myDevTS :: Forest (TSNode (X ())) myDevTS = [ Node (TSNode "Doom Emacs" "" (spawn myTextEditor)) [] - , Node (TSNode "VSC" "VSCodium" (spawn myTextEditor')) [] , Node (TSNode "Postman" "" (spawn "postman")) [] , Node (TSNode "Virt Manager" "" (spawn "virt-manager")) [] , Node (TSNode "IntelliJ IDEA" "Java IDE" (spawn "idea")) [] @@ -46,7 +45,6 @@ myUtilTS = [ Node (TSNode "File Manager" "" (spawn myFileManager)) [] , Node (TSNode "Volume Control" "pavucontrol" (spawn "pavucontrol")) [] , Node (TSNode "Password Manager" "keepassxc" (spawn myPasswordManager)) [] - , Node (TSNode "Cloud" "Nextcloud" (spawn $ myBrowser ++ " " ++ myCloud)) [] , Node (TSNode "Calculator" "" (spawn myCalculator)) [] , Node (TSNode "Screenshot" "" (spawn fullScreenshot)) [] , Node (TSNode "Torrent" "" (spawn myTorrentClient)) [] @@ -60,23 +58,6 @@ myUtilTS = [ , Node (TSNode "Google Forms" "" (spawn $ myBrowser ++ " https://forms.google.com")) [] ] -myLinksTS :: Forest (TSNode (X ())) -myLinksTS = [ - Node (TSNode "Linode Dashboard" "" (spawn $ myBrowser ++ " " ++ vpsDashboard)) [] - , Node (TSNode "Linode Dashboard (DNS)" "" (spawn $ myBrowser ++ " " ++ dnsDashboard)) [] - , Node (TSNode "Git Server" "MikunoNaka.net" (spawn $ myBrowser ++ " " ++ myGitServer)) [] - , Node (TSNode "GitHub" "My GitHub Profile" (spawn $ myBrowser ++ " " ++ myGitHubProfile)) [] - , Node (TSNode "MyAnimeList" "My MAL Profile" (spawn $ myBrowser ++ " " ++ myMALProfile)) [] - , Node (TSNode "My Website" "VidhuKant.com" (spawn $ myBrowser ++ " " ++ myWebsite)) [] - , Node (TSNode "Cloud Storage" "Nextcloud" (spawn $ myBrowser ++ " " ++ myCloud)) [] - , Node (TSNode "YouTube Channel" "" (spawn $ myBrowser ++ " " ++ myYTChannel)) [] - , Node (TSNode "WhatsApp Web" "" (spawn $ myBrowser ++ " https://web.whatsapp.com")) [] - , Node (TSNode "Google Docs" "" (spawn $ myBrowser ++ " https://docs.google.com")) [] - , Node (TSNode "Google Sheets" "" (spawn $ myBrowser ++ " https://sheets.google.com")) [] - , Node (TSNode "Google Slides" "" (spawn $ myBrowser ++ " https://slides.google.com")) [] - , Node (TSNode "Google Forms" "" (spawn $ myBrowser ++ " https://forms.google.com")) [] - ] - myPowerTS :: Forest (TSNode (X ())) myPowerTS = [ Node (TSNode "Shut Down" "" (spawn "shutdown now")) [] @@ -90,6 +71,5 @@ myMainTS = [ , Node (TSNode "Editing" "Makin' memes" (return())) myEditingTS , Node (TSNode "Development" "Hackering tools" (return())) myDevTS , Node (TSNode "Utilities" "Misc n settings" (return())) myUtilTS - , Node (TSNode "Links" "Commonly visited sites" (return())) myLinksTS , Node (TSNode "Power" "" (return())) myPowerTS ] diff --git a/.config/XMonad/xmonad.hs b/.config/XMonad/xmonad.hs index 5b050a4..fe8c8d8 100644 --- a/.config/XMonad/xmonad.hs +++ b/.config/XMonad/xmonad.hs @@ -14,7 +14,7 @@ import Hooks main :: IO () main = do - xmonad $ ewmhFullscreen $ ewmh $ docks def { + xmonad $ disableEwmhManageDesktopViewport $ ewmhFullscreen $ ewmh $ docks def { focusFollowsMouse = True , terminal = myTerminal , borderWidth = myBorderWidth |