From 9f80e0e63cfe66cefc7d70a14a2522518014737f Mon Sep 17 00:00:00 2001 From: Leon Kowarschick Date: Tue, 12 May 2020 10:29:58 +0200 Subject: [PATCH] asdf --- .../configstore/update-notifier-npm.json | 2 +- files/.config/qutebrowser/bookmarks/urls | 1 + files/.xmonad/lib/Config.hs | 55 +++++++++++++++---- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json index 76ae287..d559cf0 100644 --- a/files/.config/configstore/update-notifier-npm.json +++ b/files/.config/configstore/update-notifier-npm.json @@ -1,4 +1,4 @@ { "optOut": false, - "lastUpdateCheck": 1589033667685 + "lastUpdateCheck": 1589203310918 } \ No newline at end of file diff --git a/files/.config/qutebrowser/bookmarks/urls b/files/.config/qutebrowser/bookmarks/urls index d3ceb22..ab50260 100644 --- a/files/.config/qutebrowser/bookmarks/urls +++ b/files/.config/qutebrowser/bookmarks/urls @@ -13,3 +13,4 @@ https://github.com/elenapan/dotfiles elenapan/dotfiles: There is no place like ~ https://lebenslauf.com/?theme=Belleza&utm_source=tabellarischer-lebenslauf.net&utm_medium=button&utm_campaign=tabellarischer-lebenslauf.net&utm_content=template-page Lebenslauf für Bewerbung online schreiben + PDF https://rust-unofficial.github.io/too-many-lists/index.html Introduction - Learning Rust With Entirely Too Many Linked Lists https://wiki.haskell.org/GHC_optimisations#Fusion GHC optimisations - HaskellWiki +https://github.com/ViktorNova/architect ViktorNova/architect: Automatically builds native packages for any Linux distribution using the source code repositories from Arch Linux and the Arch User Repository (AUR) diff --git a/files/.xmonad/lib/Config.hs b/files/.xmonad/lib/Config.hs index 6739b63..47256e3 100644 --- a/files/.xmonad/lib/Config.hs +++ b/files/.xmonad/lib/Config.hs @@ -59,6 +59,8 @@ import XMonad.Layout.IndependentScreens import XMonad.Layout.SubLayouts import qualified XMonad.StackSet as W import qualified XMonad.Util.XSelection as XSel +import qualified XMonad.Layout.Groups.Examples as GroupsEx +import qualified XMonad.Layout.Groups as Groups {-# ANN module "HLint: ignore Redundant $" #-} {-# ANN module "HLint: ignore Redundant bracket" #-} @@ -71,7 +73,7 @@ import qualified XMonad.Util.XSelection as XSel myModMask = mod4Mask myLauncher = Rofi.asCommand (def { Rofi.theme = Rofi.bigTheme }) ["-show run"] -myTerminal = "termite" +myTerminal = "alacritty" myBrowser = "qutebrowser" --myBrowser = "google-chrome-stable" @@ -117,17 +119,28 @@ aqua = "#8ec07c" -- }}} -- Layout ---------------------------------------- {{{ ---layoutHints . +-- + +myTabTheme = def + { activeColor = "#504945" + , inactiveColor = "#282828" + , activeBorderColor = "#fbf1c7" + , inactiveBorderColor = "#fbf1c7" + , activeTextColor = "#fbf1c7" + , inactiveTextColor = "#fbf1c7" + , fontName = "JetBrainsMono" + } +-- layoutHints . myLayout = avoidStruts . BoringWindows.boringWindows . smartBorders . toggleLayouts Full . layoutHintsToCenter $ layouts where layouts =((rename "Tall" $ onlySpacing $ mouseResizableTile {draggerType = dragger}) -- ResizableTall 1 (3/100) (1/2) [] ||| (rename "Horizon" $ onlySpacing $ mouseResizableTileMirrored {draggerType = dragger}) -- Mirror $ ResizableTall 1 (3/100) (3/4) [] ||| (rename "BSP" $ spacingAndGaps $ borderResize $ emptyBSP) - ||| (rename "Row" $ spacingAndGaps $ zoomRow) + ||| (rename "Tabbed" $ onlySpacing $ GroupsEx.tallTabs $ def { GroupsEx.tabsTheme = myTabTheme } ) + ||| (rename "Row" $ addTabsAlways shrinkText def $ subLayout [] Simplest $ spacingAndGaps $ zoomRow) ||| (rename "grid" $ spacingAndGaps $ Grid False)) -- ||| (rename "threeCol" $ spacingAndGaps $ ThreeColMid 1 (3/100) (1/2)) -- ||| (rename "spiral" $ spacingAndGaps $ spiral (9/21)) - -- Grid rename n = renamed [Replace n] @@ -136,9 +149,8 @@ myLayout = avoidStruts . BoringWindows.boringWindows . smartBorders . toggleLayo dragger = let x = fromIntegral gap * 2 in FixedDragger x x spacingAndGaps = let intGap = fromIntegral gap - spacingBorder = Border (intGap) (intGap) (intGap) (intGap) - gapBorder = Border intGap intGap intGap intGap - in spacingRaw True spacingBorder True gapBorder True + border = Border (intGap) (intGap) (intGap) (intGap) + in spacingRaw True border True border True -- }}} -- Startuphook ----------------------------- {{{ @@ -165,7 +177,7 @@ myStartupHook = do -- Default mappings that need to be removed removedKeys :: [String] -removedKeys = ["M-S-c", "M-S-q", "M-h", "M-l"] ++ ["M-" ++ show n | n <- [1..9 :: Int]] +removedKeys = ["M-", "M-S-c", "M-S-q", "M-h", "M-l", "M-j", "M-k"] ++ ["M-" ++ show n | n <- [1..9 :: Int]] multiMonitorOperation :: (WorkspaceId -> WindowSet -> WindowSet) -> ScreenId -> X () multiMonitorOperation operation n = do @@ -179,6 +191,29 @@ myKeys :: XConfig a -> XConfig a myKeys c = additionalKeysP c $ [ ("M-+", sendMessage zoomIn) , ("M--", sendMessage zoomOut) + , ("M-C-ü", GroupsEx.nextOuterLayout) + + , ("M-S-" , sendMessage $ Groups.Modify $ Groups.moveToGroupUp True) + , ("M-C-" , sendMessage $ Groups.Modify $ Groups.moveToNewGroupDown) + , ("M-" , sendMessage $ Groups.Modify Groups.focusDown) + , ("M-C-" , sendMessage $ Groups.Modify Groups.focusUp) + , ("M-j" , ifLayoutIs "Tabbed" (sendMessage $ Groups.Modify Groups.focusGroupDown) (windows W.focusDown)) + , ("M-k" , ifLayoutIs "Tabbed" (sendMessage $ Groups.Modify Groups.focusGroupUp) (windows W.focusUp)) + , ("M-S-j" , ifLayoutIs "Tabbed" (sendMessage $ Groups.Modify Groups.swapGroupDown) (windows W.swapDown)) + , ("M-S-k" , ifLayoutIs "Tabbed" (sendMessage $ Groups.Modify Groups.swapGroupUp) (windows W.swapUp)) + + + , ("M-", sendMessage $ pullGroup L) + , ("M-", sendMessage $ pullGroup D) + , ("M-", sendMessage $ pullGroup U) + , ("M-", sendMessage $ pullGroup R) + , ("M-S-C-m", withFocused (sendMessage . MergeAll)) + , ("M-S-C-u", withFocused (sendMessage . UnMerge)) + , ("M-S-C-+", onGroup W.focusUp') + , ("M-S-C--", onGroup W.focusDown') + + + , ("M-#", sendMessage zoomReset) , ("M-f", toggleFullscreen) @@ -187,7 +222,7 @@ myKeys c = additionalKeysP c $ , ("M-S-C-q", io exitSuccess) -- Binary space partitioning - , ("M-", sendMessage Swap) + , ("M-", sendMessage Swap) , ("M-M1-", sendMessage Rotate) -- Media @@ -221,7 +256,7 @@ myKeys c = additionalKeysP c $ where workspaceMappings = [ (mappingPrefix ++ show wspNum, windows $ onCurrentScreen action wsp) - | (wsp, wspNum) <- zip (workspaces' c) [1..9 :: Int] + | (wsp, wspNum) <- zip (workspaces' c) [1..9 :: Int] , (mappingPrefix, action) <- [("M-", W.greedyView), ("M-S-", W.shift), ("M-C-", copy)] ]