From e382d3e03cbbfa44d9c0e5761a0c902962e30268 Mon Sep 17 00:00:00 2001 From: Leon Kowarschick Date: Sat, 16 May 2020 17:30:38 +0200 Subject: [PATCH] asdf --- files/.config/alacritty/alacritty.yml | 2 +- files/.config/gtk-3.0/settings.ini | 6 ++--- files/.xmonad/.stack-work/stack.sqlite3 | Bin 823296 -> 823296 bytes files/.xmonad/lib/Config.hs | 28 ++++++++++++++---------- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/files/.config/alacritty/alacritty.yml b/files/.config/alacritty/alacritty.yml index e62567d..316accb 100644 --- a/files/.config/alacritty/alacritty.yml +++ b/files/.config/alacritty/alacritty.yml @@ -304,7 +304,7 @@ schemes: # https://github.com/alacritty/alacritty/wiki/Color-schemes colors: *gruvbox #background_opacity: 0.95 -background_opacity: 1 +background_opacity: 1.0 font: size: 12 diff --git a/files/.config/gtk-3.0/settings.ini b/files/.config/gtk-3.0/settings.ini index d3418f2..db77d01 100644 --- a/files/.config/gtk-3.0/settings.ini +++ b/files/.config/gtk-3.0/settings.ini @@ -4,7 +4,7 @@ gtk-theme-name="Arc-Darker" [Settings] gtk-theme-name=Adwaita-dark gtk-icon-theme-name=Arc-X-D -gtk-font-name=Sans 10 +gtk-font-name=Sans 9 gtk-cursor-theme-name=capitaine-cursors-light gtk-cursor-theme-size=0 gtk-toolbar-style=GTK_TOOLBAR_ICONS @@ -15,5 +15,5 @@ gtk-enable-event-sounds=0 gtk-enable-input-feedback-sounds=0 gtk-xft-antialias=1 gtk-xft-hinting=1 -gtk-xft-hintstyle=hintfull -gtk-xft-rgba=none +gtk-xft-hintstyle=hintslight +gtk-xft-rgba=rgb diff --git a/files/.xmonad/.stack-work/stack.sqlite3 b/files/.xmonad/.stack-work/stack.sqlite3 index 8cda33278feb2e38e4a398d2e141255a5394113e..7109f61c3d03da09f847428cc5f30903aeda8441 100644 GIT binary patch delta 55 zcmZozVAQa{Xo57O&_o$$Mxn-p)&$1Z1g6#m=GFw3)&$np1h&=$_SOWB)&$Ph1g_Qu K?yU(t3;F@*J`u10 delta 55 zcmZozVAQa{Xo57Oz(g5mMuEnJ)&$1Z1g6#m=GFw3)&$np1h&=$_SOWB)&$Ph1g_Qu K?yU(t3;F@)kP)l^ diff --git a/files/.xmonad/lib/Config.hs b/files/.xmonad/lib/Config.hs index 5795edd..2484307 100644 --- a/files/.xmonad/lib/Config.hs +++ b/files/.xmonad/lib/Config.hs @@ -19,7 +19,7 @@ import System.Exit (exitSuccess) import qualified Rofi - +import Data.Function ((&)) import qualified Data.Map as M import qualified Data.Monoid import Data.Foldable ( for_ ) @@ -75,10 +75,6 @@ import XMonad.Util.WorkspaceCompare ( getSortByXineramaRule , getSortByIndex ) import XMonad.Layout.WindowNavigation ( windowNavigation ) -import GHC.IO.Encoding ( setLocaleEncoding - , utf8 - , setFileSystemEncoding - ) {-# ANN module "HLint: ignore Redundant $" #-} {-# ANN module "HLint: ignore Redundant bracket" #-} @@ -189,7 +185,6 @@ myLayout = avoidStruts myStartupHook :: X () myStartupHook = do setWMName "LG3D" -- Java stuff hack - spawnOnce "picom --config ~/.config/picom.conf &" --no-fading-openclose" --spawnOnce "pasystray" -- just open the UI by right-clicking on polybar's pulseaudio module spawnOnce "nm-applet &" spawnOnce "udiskie -s &" -- Mount USB sticks automatically. -s is smart systray mode: systray icon if something is mounted @@ -199,7 +194,11 @@ myStartupHook = do spawn "xset r rate 300 50 &" -- make key repeat quicker -- polybar and nitrogen need the screen layout to be restored fully before starting - spawn "/home/leon/.screenlayout/dualscreen-landscape.sh && /home/leon/.config/polybar/launch.sh && nitrogen --restore" + spawn "/home/leon/.screenlayout/dualscreen.sh " + io $ threadDelay $ 1000 * 100 + spawnOnce "picom --config ~/.config/picom.conf" --no-fading-openclose" + spawn"/home/leon/.config/polybar/launch.sh" + spawn "nitrogen --restore" -- }}} @@ -386,8 +385,6 @@ myManageHook = composeAll -- Main ------------------------------------ {{{ main :: IO () main = do - setLocaleEncoding utf8 - currentScreenCount :: Int <- countScreens let monitorIndices = [0..currentScreenCount - 1] @@ -395,7 +392,7 @@ main = do for_ monitorIndices (\idx -> safeSpawn "mkfifo" ["/tmp/xmonad-state-bar" ++ show idx]) -- create polybarLogHooks for every monitor and combine them using the <+> monoid instance - let polybarLogHooks = foldMap (polybarLogHook . fromIntegral) monitorIndices + let polybarLogHooks = composeAll $ map polybarLogHook monitorIndices let myConfig = desktopConfig { terminal = myTerminal @@ -404,7 +401,7 @@ main = do , modMask = myModMask , borderWidth = 2 , layoutHook = myLayout - , logHook = polybarLogHook 0 <+> polybarLogHook 1 <+> logHook def + , logHook = polybarLogHooks <+> logHook def , startupHook = myStartupHook <+> startupHook def <+> return () >> checkKeymap myConfig myKeys , manageHook = myManageHook <+> manageHook def , focusedBorderColor = aqua @@ -455,7 +452,11 @@ polybarPP monitor = namedScratchpadFilterOutWorkspacePP . (if useSharedWorkspace else do ws <- gets windowset sorter <- getSortByIndex - let visibleWorkspaceTags = map (unmarshallW . W.tag . W.workspace) $ W.current ws : W.visible ws + let visibleWorkspaceTags = W.current ws : W.visible ws + |> map (W.tag . W.workspace) + |> filter (\tag -> monitor == fromIntegral (unmarshallS tag)) + |> map unmarshallW + let shouldDrop wsp = (null $ W.stack wsp) && (W.tag wsp) `notElem` visibleWorkspaceTags return $ reverse . dropWhile shouldDrop . reverse . sorter } @@ -476,6 +477,9 @@ polybarPP monitor = namedScratchpadFilterOutWorkspacePP . (if useSharedWorkspace -- Utilities --------------------------------------------------- {{{ +(|>) :: a -> (a -> b) -> b +(|>) = (&) +infixl 1 |> catchAndNotifyAny :: IO () -> IO ()