mirror of
https://github.com/elkowar/dots-of-war.git
synced 2024-11-06 03:12:24 +00:00
asdf
This commit is contained in:
parent
11f40b96b0
commit
9ca7b53867
8 changed files with 53 additions and 51 deletions
|
@ -1,4 +1,10 @@
|
||||||
{
|
{
|
||||||
"optOut": false,
|
"optOut": false,
|
||||||
"lastUpdateCheck": 1598364175433
|
"lastUpdateCheck": 1598621325936,
|
||||||
|
"update": {
|
||||||
|
"latest": "6.14.8",
|
||||||
|
"current": "6.14.6",
|
||||||
|
"type": "patch",
|
||||||
|
"name": "npm"
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -1 +0,0 @@
|
||||||
/nix/store/af3jc2hqh3x6mi3blx02jrykilppmr09-home-manager-files/.config/htop/htoprc
|
|
|
@ -1,14 +0,0 @@
|
||||||
[:0.0]
|
|
||||||
file=/home/leon/Bilder/wallpapers/wallhaven-ox2gr9.jpg
|
|
||||||
mode=5
|
|
||||||
bgcolor=#000000
|
|
||||||
|
|
||||||
[xin_0]
|
|
||||||
file=/home/leon/Bilder/wallpapers/green_leaves.jpg
|
|
||||||
mode=5
|
|
||||||
bgcolor=#000000
|
|
||||||
|
|
||||||
[xin_1]
|
|
||||||
file=/home/leon/Bilder/wallpapers/green_leaves.jpg
|
|
||||||
mode=5
|
|
||||||
bgcolor=#000000
|
|
|
@ -1,12 +0,0 @@
|
||||||
[geometry]
|
|
||||||
posx=30
|
|
||||||
posy=1140
|
|
||||||
sizex=1233
|
|
||||||
sizey=1348
|
|
||||||
|
|
||||||
[nitrogen]
|
|
||||||
view=icon
|
|
||||||
recurse=true
|
|
||||||
sort=alpha
|
|
||||||
icon_caps=false
|
|
||||||
dirs=/home/leon/Bilder/wallpapers;
|
|
|
@ -12,8 +12,12 @@ glx-copy-from-front = false;
|
||||||
|
|
||||||
# }}}
|
# }}}
|
||||||
|
|
||||||
|
corner-radius = 0;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Shadows -------------------------------- {{{
|
# Shadows -------------------------------- {{{
|
||||||
shadow = false;
|
shadow = true;
|
||||||
#shadow-radius = 20;
|
#shadow-radius = 20;
|
||||||
#shadow-offset-x = -20;
|
#shadow-offset-x = -20;
|
||||||
#shadow-offset-y = -20;
|
#shadow-offset-y = -20;
|
||||||
|
@ -25,7 +29,8 @@ shadow = false;
|
||||||
shadow-radius = 18;
|
shadow-radius = 18;
|
||||||
shadow-offset-x = -19;
|
shadow-offset-x = -19;
|
||||||
shadow-offset-y = -15;
|
shadow-offset-y = -15;
|
||||||
shadow-opacity = 1.0;
|
#shadow-opacity = 1.0;
|
||||||
|
shadow-opacity = 0.5;
|
||||||
# shadow-red = 0.0;
|
# shadow-red = 0.0;
|
||||||
# shadow-green = 0.0;
|
# shadow-green = 0.0;
|
||||||
# shadow-blue = 0.0;
|
# shadow-blue = 0.0;
|
||||||
|
@ -49,7 +54,7 @@ shadow-exclude = [
|
||||||
"class_g ?= 'Cairo-dock'",
|
"class_g ?= 'Cairo-dock'",
|
||||||
#"class_g ?= 'Xfce4-notifyd'",
|
#"class_g ?= 'Xfce4-notifyd'",
|
||||||
"class_g ?= 'Xfce4-power-manager'",
|
"class_g ?= 'Xfce4-power-manager'",
|
||||||
"_GTK_FRAME_EXTENTS@:c",
|
#"_GTK_FRAME_EXTENTS@:c",
|
||||||
"_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
|
"_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
|
||||||
];
|
];
|
||||||
# Avoid drawing shadow on all shaped windows (see also: --detect-rounded-corners)
|
# Avoid drawing shadow on all shaped windows (see also: --detect-rounded-corners)
|
||||||
|
@ -69,17 +74,18 @@ inactive-dim = 1;
|
||||||
#inactive-dim-fixed = true;
|
#inactive-dim-fixed = true;
|
||||||
# Blur background of transparent windows. Bad performance with X Render backend. GLX backend is preferred.
|
# Blur background of transparent windows. Bad performance with X Render backend. GLX backend is preferred.
|
||||||
|
|
||||||
blur-background = false;
|
blur-background = true;
|
||||||
#blur-method = "dual_kawase";
|
blur-method = "dual_kawase";
|
||||||
#blur-method = "kernel";
|
#blur-method = "kernel";
|
||||||
blur-strength = 20; # max 20
|
#blur-method = "gaussian";
|
||||||
blur-size = 20;
|
blur-strength = 10; # max 20
|
||||||
|
blur-size = 14;
|
||||||
# Blur background of opaque windows with transparent frames as well.
|
# Blur background of opaque windows with transparent frames as well.
|
||||||
blur-background-frame = false;
|
blur-background-frame = false;
|
||||||
# Do not let blur radius adjust based on window opacity.
|
# Do not let blur radius adjust based on window opacity.
|
||||||
blur-background-fixed = false;
|
blur-background-fixed = true;
|
||||||
blur-background-exclude = [
|
blur-background-exclude = [
|
||||||
#"window_type = 'dock'",
|
"window_type = 'dock'",
|
||||||
"window_type = 'desktop'",
|
"window_type = 'desktop'",
|
||||||
|
|
||||||
"! name~=''",
|
"! name~=''",
|
||||||
|
@ -91,9 +97,7 @@ blur-background-exclude = [
|
||||||
"class_g *= 'boox'",
|
"class_g *= 'boox'",
|
||||||
"class_g ?= 'Xfce4-notifyd'",
|
"class_g ?= 'Xfce4-notifyd'",
|
||||||
"class_g ?= 'Xfce4-power-manager'",
|
"class_g ?= 'Xfce4-power-manager'",
|
||||||
"_GTK_FRAME_EXTENTS@:c",
|
|
||||||
"_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
|
"_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'"
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# }}}
|
# }}}
|
||||||
|
|
|
@ -7,7 +7,7 @@ module Config (main) where
|
||||||
import qualified Data.Map.Strict as M
|
import qualified Data.Map.Strict as M
|
||||||
import Control.Concurrent
|
import Control.Concurrent
|
||||||
import Control.Exception ( catch , SomeException)
|
import Control.Exception ( catch , SomeException)
|
||||||
import Control.Monad ( filterM
|
import Control.Monad (join, filterM
|
||||||
, when
|
, when
|
||||||
, guard
|
, guard
|
||||||
)
|
)
|
||||||
|
@ -64,6 +64,7 @@ import XMonad.Layout.ThreeColumns
|
||||||
import XMonad.Layout.ResizableThreeColumns
|
import XMonad.Layout.ResizableThreeColumns
|
||||||
import XMonad.Layout.WindowSwitcherDecoration
|
import XMonad.Layout.WindowSwitcherDecoration
|
||||||
import XMonad.Layout.DraggingVisualizer
|
import XMonad.Layout.DraggingVisualizer
|
||||||
|
import XMonad.Hooks.FadeInactive
|
||||||
--import XMonad.Layout.Hidden as Hidden
|
--import XMonad.Layout.Hidden as Hidden
|
||||||
|
|
||||||
import XMonad.Util.EZConfig ( additionalKeysP
|
import XMonad.Util.EZConfig ( additionalKeysP
|
||||||
|
@ -85,8 +86,7 @@ import qualified XMonad.Actions.Navigation2D as Nav2d
|
||||||
import qualified XMonad.Config.Desktop as Desktop
|
import qualified XMonad.Config.Desktop as Desktop
|
||||||
import qualified XMonad.Hooks.EwmhDesktops as Ewmh
|
import qualified XMonad.Hooks.EwmhDesktops as Ewmh
|
||||||
import qualified XMonad.Hooks.ManageHelpers as ManageHelpers
|
import qualified XMonad.Hooks.ManageHelpers as ManageHelpers
|
||||||
import XMonad.Hooks.DebugStack ( debugStackString
|
import XMonad.Hooks.DebugStack ( debugStackFullString
|
||||||
, debugStackFullString
|
|
||||||
)
|
)
|
||||||
import qualified XMonad.Layout.BoringWindows as BoringWindows
|
import qualified XMonad.Layout.BoringWindows as BoringWindows
|
||||||
import qualified XMonad.Layout.MultiToggle as MTog
|
import qualified XMonad.Layout.MultiToggle as MTog
|
||||||
|
@ -95,6 +95,7 @@ import qualified XMonad.Layout.ToggleLayouts as ToggleLayouts
|
||||||
import qualified XMonad.StackSet as W
|
import qualified XMonad.StackSet as W
|
||||||
import qualified XMonad.Util.XSelection as XSel
|
import qualified XMonad.Util.XSelection as XSel
|
||||||
import qualified XMonad.Layout.PerScreen as PerScreen
|
import qualified XMonad.Layout.PerScreen as PerScreen
|
||||||
|
import Data.Maybe (maybeToList)
|
||||||
{-# ANN module "HLint: ignore Redundant $" #-}
|
{-# ANN module "HLint: ignore Redundant $" #-}
|
||||||
{-# ANN module "HLint: ignore Redundant bracket" #-}
|
{-# ANN module "HLint: ignore Redundant bracket" #-}
|
||||||
{-# ANN module "HLint: ignore Move brackets to avoid $" #-}
|
{-# ANN module "HLint: ignore Move brackets to avoid $" #-}
|
||||||
|
@ -173,13 +174,11 @@ instance Shrinker EmptyShrinker where
|
||||||
|
|
||||||
|
|
||||||
myLayout = avoidStruts
|
myLayout = avoidStruts
|
||||||
-- $ FancyBorders.fancyBorders borderTheme
|
|
||||||
$ smartBorders
|
$ smartBorders
|
||||||
$ MTog.mkToggle1 MTog.FULL
|
$ MTog.mkToggle1 MTog.FULL
|
||||||
$ ToggleLayouts.toggleLayouts (rename "Tabbed" . makeTabbed . spacingAndGaps $ ResizableTall 1 (3/100) (1/2) [])
|
$ ToggleLayouts.toggleLayouts (rename "Tabbed" . makeTabbed . spacingAndGaps $ ResizableTall 1 (3/100) (1/2) [])
|
||||||
$ MTog.mkToggle1 WINDOWDECORATION
|
$ MTog.mkToggle1 WINDOWDECORATION
|
||||||
$ draggingVisualizer
|
$ draggingVisualizer
|
||||||
-- $ Hidden.hiddenWindows
|
|
||||||
$ layoutHintsToCenter
|
$ layoutHintsToCenter
|
||||||
$ layouts
|
$ layouts
|
||||||
where
|
where
|
||||||
|
@ -238,8 +237,17 @@ myStartupHook = do
|
||||||
spawn "/home/leon/.config/polybar/launch.sh"
|
spawn "/home/leon/.config/polybar/launch.sh"
|
||||||
spawnOnce "nitrogen --restore"
|
spawnOnce "nitrogen --restore"
|
||||||
spawnOnce "mailnag"
|
spawnOnce "mailnag"
|
||||||
--spawnOnce "flashfocus"
|
spawnOnce "flashfocus"
|
||||||
for_ ["led1", "led2"] $ \led -> safeSpawn "sudo" ["liquidctl", "set", led, "color", "fixed", "00ffff"]
|
for_ ["led1", "led2"] $ \led -> safeSpawn "sudo" ["liquidctl", "set", led, "color", "fixed", "00ffff"]
|
||||||
|
withDisplay $ \dpy -> do
|
||||||
|
r <- asks theRoot
|
||||||
|
a <- getAtom "_NET_SUPPORTED"
|
||||||
|
c <- getAtom "ATOM"
|
||||||
|
f <- getAtom "_GTK_FRAME_EXTENTS"
|
||||||
|
io $ do
|
||||||
|
sup <- (join . maybeToList) <$> getWindowProperty32 dpy a r
|
||||||
|
when (fromIntegral f `notElem` sup) $ do
|
||||||
|
changeProperty32 dpy r a c propModeAppend [fromIntegral f]
|
||||||
-- }}}
|
-- }}}
|
||||||
|
|
||||||
-- Keymap --------------------------------------- {{{
|
-- Keymap --------------------------------------- {{{
|
||||||
|
@ -503,10 +511,14 @@ main = do
|
||||||
then (map show [1..9 :: Int]) ++ ["NSP"]
|
then (map show [1..9 :: Int]) ++ ["NSP"]
|
||||||
else (withScreens (fromIntegral currentScreenCount) (map show [1..6 :: Int])) ++ ["NSP"]
|
else (withScreens (fromIntegral currentScreenCount) (map show [1..6 :: Int])) ++ ["NSP"]
|
||||||
, modMask = myModMask
|
, modMask = myModMask
|
||||||
, borderWidth = 1
|
, borderWidth = 0
|
||||||
, layoutHook = myLayout
|
, layoutHook = myLayout
|
||||||
, logHook = mconcat [ polybarLogHooks, Ewmh.ewmhDesktopsLogHook, logHook Desktop.desktopConfig, logHook def]
|
, logHook = mconcat [ polybarLogHooks
|
||||||
, startupHook = mconcat [ myStartupHook, Ewmh.ewmhDesktopsStartup, return () >> checkKeymap myConfig myKeys]
|
, Ewmh.ewmhDesktopsLogHook
|
||||||
|
, logHook Desktop.desktopConfig
|
||||||
|
--, fadeInactiveLogHook 0.95
|
||||||
|
, logHook def]
|
||||||
|
, startupHook = mconcat [ Ewmh.ewmhDesktopsStartup, myStartupHook, return () >> checkKeymap myConfig myKeys]
|
||||||
, manageHook = mconcat [ manageSpawn, myManageHook, manageHook def]
|
, manageHook = mconcat [ manageSpawn, myManageHook, manageHook def]
|
||||||
, focusedBorderColor = "#427b58"
|
, focusedBorderColor = "#427b58"
|
||||||
, normalBorderColor = "#282828"
|
, normalBorderColor = "#282828"
|
||||||
|
@ -530,7 +542,7 @@ main = do
|
||||||
|
|
||||||
mySwallowEventHook = WindowSwallowing.swallowEventHook
|
mySwallowEventHook = WindowSwallowing.swallowEventHook
|
||||||
(className =? "Alacritty" <||> className =? "Termite" <||> className =? "NOPE Thunar")
|
(className =? "Alacritty" <||> className =? "Termite" <||> className =? "NOPE Thunar")
|
||||||
(return True)
|
(not <$> className =? "Dragon")
|
||||||
|
|
||||||
|
|
||||||
activateWindowEventHook :: Event -> X All
|
activateWindowEventHook :: Event -> X All
|
||||||
|
|
|
@ -8,6 +8,9 @@
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
nixpkgs = {
|
nixpkgs = {
|
||||||
config = {
|
config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
|
@ -22,6 +25,9 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
elkowar = {
|
elkowar = {
|
||||||
base = {
|
base = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -10,8 +10,9 @@ in
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
gtk = {
|
gtk = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme.name = "phocus";
|
theme.name = "my_phocus";
|
||||||
iconTheme.name = "Numix";
|
iconTheme.name = "oomox-materia-dark";
|
||||||
|
#iconTheme.name = "Numix";
|
||||||
#font.name = "Terminus (TTF) 12";
|
#font.name = "Terminus (TTF) 12";
|
||||||
font.name = "xos4 Terminus 12";
|
font.name = "xos4 Terminus 12";
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue