mirror of
https://github.com/elkowar/dots-of-war.git
synced 2024-12-24 13:22:23 +00:00
asdf
This commit is contained in:
parent
bdb2d28832
commit
e382d3e03c
4 changed files with 20 additions and 16 deletions
|
@ -304,7 +304,7 @@ schemes:
|
||||||
# https://github.com/alacritty/alacritty/wiki/Color-schemes
|
# https://github.com/alacritty/alacritty/wiki/Color-schemes
|
||||||
colors: *gruvbox
|
colors: *gruvbox
|
||||||
#background_opacity: 0.95
|
#background_opacity: 0.95
|
||||||
background_opacity: 1
|
background_opacity: 1.0
|
||||||
|
|
||||||
font:
|
font:
|
||||||
size: 12
|
size: 12
|
||||||
|
|
|
@ -4,7 +4,7 @@ gtk-theme-name="Arc-Darker"
|
||||||
[Settings]
|
[Settings]
|
||||||
gtk-theme-name=Adwaita-dark
|
gtk-theme-name=Adwaita-dark
|
||||||
gtk-icon-theme-name=Arc-X-D
|
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-name=capitaine-cursors-light
|
||||||
gtk-cursor-theme-size=0
|
gtk-cursor-theme-size=0
|
||||||
gtk-toolbar-style=GTK_TOOLBAR_ICONS
|
gtk-toolbar-style=GTK_TOOLBAR_ICONS
|
||||||
|
@ -15,5 +15,5 @@ gtk-enable-event-sounds=0
|
||||||
gtk-enable-input-feedback-sounds=0
|
gtk-enable-input-feedback-sounds=0
|
||||||
gtk-xft-antialias=1
|
gtk-xft-antialias=1
|
||||||
gtk-xft-hinting=1
|
gtk-xft-hinting=1
|
||||||
gtk-xft-hintstyle=hintfull
|
gtk-xft-hintstyle=hintslight
|
||||||
gtk-xft-rgba=none
|
gtk-xft-rgba=rgb
|
||||||
|
|
Binary file not shown.
|
@ -19,7 +19,7 @@ import System.Exit (exitSuccess)
|
||||||
|
|
||||||
import qualified Rofi
|
import qualified Rofi
|
||||||
|
|
||||||
|
import Data.Function ((&))
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
import qualified Data.Monoid
|
import qualified Data.Monoid
|
||||||
import Data.Foldable ( for_ )
|
import Data.Foldable ( for_ )
|
||||||
|
@ -75,10 +75,6 @@ import XMonad.Util.WorkspaceCompare ( getSortByXineramaRule
|
||||||
, getSortByIndex
|
, getSortByIndex
|
||||||
)
|
)
|
||||||
import XMonad.Layout.WindowNavigation ( windowNavigation )
|
import XMonad.Layout.WindowNavigation ( windowNavigation )
|
||||||
import GHC.IO.Encoding ( setLocaleEncoding
|
|
||||||
, utf8
|
|
||||||
, setFileSystemEncoding
|
|
||||||
)
|
|
||||||
|
|
||||||
{-# ANN module "HLint: ignore Redundant $" #-}
|
{-# ANN module "HLint: ignore Redundant $" #-}
|
||||||
{-# ANN module "HLint: ignore Redundant bracket" #-}
|
{-# ANN module "HLint: ignore Redundant bracket" #-}
|
||||||
|
@ -189,7 +185,6 @@ myLayout = avoidStruts
|
||||||
myStartupHook :: X ()
|
myStartupHook :: X ()
|
||||||
myStartupHook = do
|
myStartupHook = do
|
||||||
setWMName "LG3D" -- Java stuff hack
|
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 "pasystray" -- just open the UI by right-clicking on polybar's pulseaudio module
|
||||||
spawnOnce "nm-applet &"
|
spawnOnce "nm-applet &"
|
||||||
spawnOnce "udiskie -s &" -- Mount USB sticks automatically. -s is smart systray mode: systray icon if something is mounted
|
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
|
spawn "xset r rate 300 50 &" -- make key repeat quicker
|
||||||
|
|
||||||
-- polybar and nitrogen need the screen layout to be restored fully before starting
|
-- 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 ------------------------------------ {{{
|
||||||
main :: IO ()
|
main :: IO ()
|
||||||
main = do
|
main = do
|
||||||
setLocaleEncoding utf8
|
|
||||||
|
|
||||||
currentScreenCount :: Int <- countScreens
|
currentScreenCount :: Int <- countScreens
|
||||||
let monitorIndices = [0..currentScreenCount - 1]
|
let monitorIndices = [0..currentScreenCount - 1]
|
||||||
|
|
||||||
|
@ -395,7 +392,7 @@ main = do
|
||||||
for_ monitorIndices (\idx -> safeSpawn "mkfifo" ["/tmp/xmonad-state-bar" ++ show idx])
|
for_ monitorIndices (\idx -> safeSpawn "mkfifo" ["/tmp/xmonad-state-bar" ++ show idx])
|
||||||
|
|
||||||
-- create polybarLogHooks for every monitor and combine them using the <+> monoid instance
|
-- 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
|
let myConfig = desktopConfig
|
||||||
{ terminal = myTerminal
|
{ terminal = myTerminal
|
||||||
|
@ -404,7 +401,7 @@ main = do
|
||||||
, modMask = myModMask
|
, modMask = myModMask
|
||||||
, borderWidth = 2
|
, borderWidth = 2
|
||||||
, layoutHook = myLayout
|
, layoutHook = myLayout
|
||||||
, logHook = polybarLogHook 0 <+> polybarLogHook 1 <+> logHook def
|
, logHook = polybarLogHooks <+> logHook def
|
||||||
, startupHook = myStartupHook <+> startupHook def <+> return () >> checkKeymap myConfig myKeys
|
, startupHook = myStartupHook <+> startupHook def <+> return () >> checkKeymap myConfig myKeys
|
||||||
, manageHook = myManageHook <+> manageHook def
|
, manageHook = myManageHook <+> manageHook def
|
||||||
, focusedBorderColor = aqua
|
, focusedBorderColor = aqua
|
||||||
|
@ -455,7 +452,11 @@ polybarPP monitor = namedScratchpadFilterOutWorkspacePP . (if useSharedWorkspace
|
||||||
else do
|
else do
|
||||||
ws <- gets windowset
|
ws <- gets windowset
|
||||||
sorter <- getSortByIndex
|
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
|
let shouldDrop wsp = (null $ W.stack wsp) && (W.tag wsp) `notElem` visibleWorkspaceTags
|
||||||
return $ reverse . dropWhile shouldDrop . reverse . sorter
|
return $ reverse . dropWhile shouldDrop . reverse . sorter
|
||||||
}
|
}
|
||||||
|
@ -476,6 +477,9 @@ polybarPP monitor = namedScratchpadFilterOutWorkspacePP . (if useSharedWorkspace
|
||||||
|
|
||||||
-- Utilities --------------------------------------------------- {{{
|
-- Utilities --------------------------------------------------- {{{
|
||||||
|
|
||||||
|
(|>) :: a -> (a -> b) -> b
|
||||||
|
(|>) = (&)
|
||||||
|
infixl 1 |>
|
||||||
|
|
||||||
|
|
||||||
catchAndNotifyAny :: IO () -> IO ()
|
catchAndNotifyAny :: IO () -> IO ()
|
||||||
|
|
Loading…
Reference in a new issue