From dea9a66fccca94ed27387246e384f3dcb20501f6 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Sat, 5 May 2018 13:02:04 +0200 Subject: Basic attempt at a better structure --- conf/kitty.conf | 31 -------- conf/pwmt/zathurarc | 16 ----- conf/urxvt.Xresources | 54 -------------- conf/xdg/user-dirs.dirs | 3 - conf/xmonad/xmonad.hs | 184 ------------------------------------------------ 5 files changed, 288 deletions(-) delete mode 100644 conf/kitty.conf delete mode 100644 conf/pwmt/zathurarc delete mode 100644 conf/urxvt.Xresources delete mode 100644 conf/xdg/user-dirs.dirs delete mode 100644 conf/xmonad/xmonad.hs (limited to 'conf') diff --git a/conf/kitty.conf b/conf/kitty.conf deleted file mode 100644 index 29c1362..0000000 --- a/conf/kitty.conf +++ /dev/null @@ -1,31 +0,0 @@ -font_family iosevka -font_size 10 -font_size_delta 1 -adjust_line_height 110% - -background #161616 -foreground #F2F2F2 -# black -color0 #161616 -color8 #F2F2F2 -# red -color1 #8C3346 -color9 #ff0000 -# green -color2 #aadb0f -color10 #909636 -# yellow -color3 #E4E093 -color11 #ffff00 -# blue -color4 #352F6A -color12 #0000ff -# magenta -color5 #ce5c00 -color13 #f57900 -# cyan -color6 #89b6e2 -color14 #46a4ff -# white -color7 #F2F2F2 -color15 #ffffff diff --git a/conf/pwmt/zathurarc b/conf/pwmt/zathurarc deleted file mode 100644 index 3258fe6..0000000 --- a/conf/pwmt/zathurarc +++ /dev/null @@ -1,16 +0,0 @@ -set font "Iosevka 14px" - -set inputbar-bg "#161616" -set inputbar-fg "#909737" - -set statusbar-bg "#161616" -set statusbar-fg "#909737" - -set completion-bg "#161616" -set completion-fg "#909737" - -set completion-highlight-bg "#909737" -set completion-highlight-fg "#161616" - -set recolor-lightcolor "#161616" -set recolor-darkcolor "#ffffff" diff --git a/conf/urxvt.Xresources b/conf/urxvt.Xresources deleted file mode 100644 index 5cab29d..0000000 --- a/conf/urxvt.Xresources +++ /dev/null @@ -1,54 +0,0 @@ -URxvt.saveLines: 10000 -URxvt.scrollBar: false -URxvt.font: xft:Iosevka:pixelsize=12 -URxvt.letterSpace: 0 -URxvt.transparent: false -URxvt.inheritPixmap: false -URxvt.fading: 20 -URxvt.dynamicColors: on - -URxvt.perl-ext-common: default,matcher,clipboard,resize-font -URxvt.matcher.button: 1 -URxvt.matcher.pattern.1: \\bwww\\.[\\w-]\\.[\\w./?&@#-]*[\\w/-] -URxvt.url-launcher: firefox - -URxvt.keysym.Control-Up: \033[1;5A -URxvt.keysym.Control-Down: \033[1;5B -URxvt.keysym.Control-Left: \033[1;5D -URxvt.keysym.Control-Right: \033[1;5C - -URxvt.keysym.M-Down: \033[1;3B -URxvt.keysym.M-Up: \033[1;3A -URxvt.keysym.M-Left: \033[1;3D -URxvt.keysym.M-Right: \033[1;3C - -URxvt.keysym.M-c: perl:clipboard:copy -URxvt.keysym.M-v: perl:clipboard:paste - -URxvt.background: #161616 -URxvt.foreground: #F2F2F2 - -! black -URxvt.color0: #161616 -URxvt.color8: #F2F2F2 -! red -URxvt.color1: #8C3346 -URxvt.color9: #ff0000 -! green -URxvt.color2: #aadb0f -URxvt.color10: #909636 -! yellow -URxvt.color3: #E4E093 -URxvt.color11: #ffff00 -! blue -URxvt.color4: #352F6A -URxvt.color12: #0000ff -! magenta -URxvt.color5: #ce5c00 -URxvt.color13: #f57900 -! cyan -URxvt.color6: #89b6e2 -URxvt.color14: #46a4ff -! white -URxvt.color7: #F2F2F2 -URxvt.color15: #ffffff diff --git a/conf/xdg/user-dirs.dirs b/conf/xdg/user-dirs.dirs deleted file mode 100644 index 9088276..0000000 --- a/conf/xdg/user-dirs.dirs +++ /dev/null @@ -1,3 +0,0 @@ -XDG_TEMPLATES_DIR="$HOME/" -XDG_DESKTOP_DIR="$HOME/" -XDG_DOWNLOADS_DIR="$HOME/downloads/" diff --git a/conf/xmonad/xmonad.hs b/conf/xmonad/xmonad.hs deleted file mode 100644 index f42ec34..0000000 --- a/conf/xmonad/xmonad.hs +++ /dev/null @@ -1,184 +0,0 @@ -import XMonad -import XMonad.Util.EZConfig -import XMonad.StackSet - -import XMonad.Hooks.EwmhDesktops - -import XMonad.Layout.NoBorders -import XMonad.Layout.Tabbed -import XMonad.Layout.Reflect - -import XMonad.Util.Themes -import XMonad.Util.NamedScratchpad - -import XMonad.Actions.SpawnOn -import XMonad.Actions.CycleWS -import XMonad.Actions.WindowBringer -import XMonad.Actions.GroupNavigation -import XMonad.Actions.FloatKeys - -import System.Exit -import Data.Maybe -import Control.Monad (when) -import qualified Data.Map as M - -workspaces :: [WorkspaceId] -workspaces = map show [1 .. 9 :: Int] - -customTabTheme = (theme xmonadTheme) - { fontName = "xft:Iosevka Medium-12" - , decoHeight = 20 - , activeTextColor = "#222222" - , activeColor = "#909737" - , inactiveTextColor = "#999999" - , inactiveColor = "#161616" - , activeBorderColor = "#909737" - , inactiveBorderColor = "#161616" } - -availableLayouts = smartBorders $ tabs ||| tilesLM ||| tilesRM ||| tilesTM ||| tilesBM - where - tabs = tabbed shrinkText customTabTheme - tilesLM = Tall 1 delta ratio - tilesRM = reflectHoriz tilesLM - tilesTM = Mirror tilesLM - tilesBM = reflectVert tilesTM - ratio = 1/2 - delta = 3/100 - -windowBringerDmenuConfig = def { menuCommand = "rofi" - , menuArgs = [ "-p", "win", "-dmenu", "-i" ] } - -floatRectTop h = hideScreenBorder $ RationalRect (1/20) 0 (18/20) h -floatRectBottom h = hideScreenBorder $ RationalRect (1/20) (1-h) (18/20) h -floatRectLeft w = hideScreenBorder $ RationalRect 0 (1/20) w (18/20) -floatRectRight w = hideScreenBorder $ RationalRect (1-w) (1/20) w (18/20) - -dropUp = floatRectBottom $ 2/3 -dropUpLarge = floatRectBottom $ 18/20 -dropDown = floatRectTop $ 2/3 -dropDownLarge = floatRectTop $ 18/20 -sideBarLeft = floatRectLeft $ 1/2 -sideBarRight = floatRectRight $ 1/2 - -scratchpads = [ NS "terminal" "kitty --class=scratchterm" (className =? "scratchterm") - (customFloating dropDown) - , NS "browser" "firefox" (className =? "Firefox") - (customFloating dropDown) - , NS "documentation" "zeal" (className =? "Zeal") - (customFloating dropDown) - , NS "messaging" "telegram-desktop" (className =? "TelegramDesktop") - (customFloating sideBarRight) ] - -keybindings = --- xmonad session control - [ ("C-M1-" , io (exitWith ExitSuccess)) - , ("C-M1-" , spawn "xmonad --restart") --- application launchers - , ("M-" , spawn "rofi -show combi") - , ("M-" , spawn "kitty") - , ("M-S-" , spawn "vim -g") --- window management - , ("M-q" , windows $ shift "NSP") - , ("M-S-q" , kill) - , ("M-j" , windows focusDown) - , ("M-k" , windows focusUp) - , ("M-S-j" , windows swapDown) - , ("M-S-k" , windows swapUp) - , ("M-h" , sendMessage Shrink) - , ("M-l" , sendMessage Expand) - , ("M-" , nextMatch History (return True)) --- window bringer - , ("M-a" , gotoMenuConfig windowBringerDmenuConfig) - , ("M-S-a" , bringMenuConfig windowBringerDmenuConfig) --- scratchpads - , ("M-b" , namedScratchpadAction scratchpads "browser") - , ("M-d" , namedScratchpadAction scratchpads "documentation") - , ("M-m" , namedScratchpadAction scratchpads "messaging") ] ++ --- workspace selection - [ (p ++ [k] , windows $ f i) | (i, k) <- zip Main.workspaces ['1' .. '9'] - , (p, f) <- [ ("M-" , greedyView) - , ("M-S-" , shift) ] ] ++ --- workspace management - [ ("M-s l" , sendMessage NextLayout) - , ("M-s p" , toggleWS' ["NSP"]) - , ("M-s j" , moveTo Next nonEmptyWS) - , ("M-s k" , moveTo Prev nonEmptyWS) - , ("M-S-s j" , shiftTo Next nonEmptyWS >> moveTo Next nonEmptyWS) - , ("M-S-s k" , shiftTo Prev nonEmptyWS >> moveTo Prev nonEmptyWS) --- floating placement - , ("M-w t" , withFocused $ windows . sink) - , ("M-w f" , withFocused $ placeFloating $ RationalRect 0 0 1 1) - , ("M-w j" , withFocused $ placeFloating dropUp) - , ("M-w S-j" , withFocused $ placeFloating dropUpLarge) - , ("M-w k" , withFocused $ placeFloating dropDown) - , ("M-w S-k" , withFocused $ placeFloating dropDownLarge) - , ("M-w h" , withFocused $ placeFloating sideBarLeft) - , ("M-w l" , withFocused $ placeFloating sideBarRight) --- system control - , ("M-c " , spawn "amixer sset Master 10%+") - , ("M-c " , spawn "amixer sset Master 10%-") - , ("M-c m" , spawn "amixer sset Master toggle") ] - -customEventHook = do - handleEventHook defaultConfig - fullscreenEventHook - -customLogHook = do - historyHook - customizeBorderWhen (isFloat <&&> isNotFullscreen) "#aadb0f" 6 - -main = xmonad $ ewmh - $ defaultConfig - { modMask = mod4Mask -- super key as modifier - , borderWidth = 3 - , normalBorderColor = "#161616" - , focusedBorderColor = "#909737" - , keys = \c -> mkKeymap c keybindings - , startupHook = return () >> checkKeymap defaultConfig keybindings - , handleEventHook = customEventHook - , layoutHook = availableLayouts - , manageHook = namedScratchpadManageHook scratchpads - , logHook = customLogHook } - `additionalKeys` - [ ((noModMask, xK_Menu) , namedScratchpadAction scratchpads "terminal") ] - -nonEmptyWS = WSIs $ return (\w -> nonNSP w && nonEmpty w) - where nonNSP (Workspace tag _ _) = tag /= "NSP" - nonEmpty = isJust . stack - -placeFloating :: RationalRect -> Window -> X () -placeFloating rect = windows . (flip XMonad.StackSet.float $ rect) - -windowSize w = do - r <- withDisplay $ (\d -> io $ getWindowAttributes d w) - return (fromIntegral $ wa_width r, fromIntegral $ wa_height r) - -withCurrentScreen f = withWindowSet $ \ws -> f (current ws) -withCurrentScreenRect f = withCurrentScreen $ \s -> f (screenRect (screenDetail s)) - -screenResolution = withCurrentScreenRect $ \r -> return (rect_width r, rect_height r) - -isNotFullscreen :: Query Bool -isNotFullscreen = ask >>= (\w -> liftX $ do (ww, wh) <- windowSize w - (sw, sh) <- screenResolution - return $ not (ww == sw && wh == sh)) - -isFloat :: Query Bool -isFloat = ask >>= (\w -> liftX $ withWindowSet $ \ws -> return $ (M.member w (floating ws))) - -customizeBorderWhen :: Query Bool -> String -> Dimension -> X () -customizeBorderWhen q color width = withFocused $ \w -> runQuery q w >>= flip when (setWindowBorder' color width w) - -setWindowBorder' :: String -> Dimension -> Window -> X () -setWindowBorder' color width window = do - XConf { display = d } <- ask - ~(Just pixel) <- io $ initColor d color - io $ setWindowBorder d window pixel - io $ setWindowBorderWidth d window width - --- ugly hack to hide window border at screen boundary -hideScreenBorder :: RationalRect -> RationalRect -hideScreenBorder (RationalRect x0 y0 w h) = RationalRect (x0-(bw/sw)) (y0-(bw/sh)) (w+((2*bw)/sw)) (h+((2*bw+1)/sh)) - where bw = 6 - sw = 1280 - sh = 1024 -- cgit v1.2.3