diff --git a/Xdefaults b/Xdefaults index 99390c6..308c8b0 100644 --- a/Xdefaults +++ b/Xdefaults @@ -49,7 +49,7 @@ URxvt.boldFont: font1:style=bold,font2:style=bold,font3:style=bold,font4 URxvt.italicFont:font1:style=italic,font2:style=italic,font3:style=italic,font4 URxvt.boldItalicfont: font1:style=bolditalic,font2:style=bolditalic,font3:style=bolditalic,font4 URxvt.letterSpace: 0 -URxvt.lineSpace: -4 +URxvt.lineSpace: 0 URxvt.internalBorder: 20 URxvt.cursorBlink: true diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index ccd9cc1..af256db 100755 --- a/config/bspwm/bspwmrc +++ b/config/bspwm/bspwmrc @@ -1,18 +1,19 @@ #!/bin/sh - setup=0 -COLOR_BACKGROUND="#191919" +COLOR_BACKGROUND="#282a2e" COLOR_PRIMARY="#fefefe" -COLOR_SECONDARY="#f58f44" +COLOR_SECONDARY="#81a2be" +BORDER=2 +hsetroot -solid $COLOR_BACKGROUND & xsetroot -cursor_name left_ptr & xrdb ~/.Xdefaults pgrep -x sxhkd > /dev/null || sxhkd & pgrep -x picom > /dev/null || picom & pgrep -x xss-lock > /dev/null || xss-lock slock & -pgrep -x bg.sh > /dev/null || $HOME/.scripts/bg.sh > /dev/null & +#pgrep -x bg.sh > /dev/null || $HOME/.scripts/bg.sh > /dev/null & [ -f "$HOME/.config/xrandr.sh" ] && . $HOME/.config/xrandr.sh @@ -31,16 +32,15 @@ done $HOME/.config/polybar/launch.sh & -bspc config border_width 1 +bspc config border_width $BORDER bspc config window_gap 0 +$HOME/.scripts/toggle-gap.sh bspc config focus_follows_pointer false -bspc config normal_border_color "$COLOR_BACKGROUND" -bspc config active_border_color "$COLOR_BACKGROUND" -bspc config focused_border_color "$COLOR_PRIMARY" +bspc config normal_border_color "$COLOR_PRIMARY" +bspc config active_border_color "$COLOR_PRIMARY" +bspc config focused_border_color "$COLOR_SECONDARY" wmname bspwm -urxvt & - -sleep 1; $HOME/.scripts/start-mpd +$HOME/.scripts/start-mpd diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf index 679ebd1..b086d5e 100644 --- a/config/mpd/mpd.conf +++ b/config/mpd/mpd.conf @@ -13,14 +13,6 @@ audio_output { max_clients "0" } -audio_output { - type "httpd" - name "HQ HTTP Stream" - encoder "wave" # optional, vorbis or lame - port "6681" - max_clients "0" -} - audio_output { type "pulse" name "mpd" diff --git a/config/picom/picom.conf b/config/picom/picom.conf index 68d0f83..7e5ed20 100644 --- a/config/picom/picom.conf +++ b/config/picom/picom.conf @@ -2,24 +2,8 @@ # Corners # ################################# # requires: https://github.com/sdhand/compton -#corner-radius = 10; -rounded-corners-exclude = [ - #"window_type = 'normal'", - "class_g = 'awesome'", - "class_g = 'Polybar'", - "class_i = 'tray'", - "class_g = 'XTerm'", - "class_g = 'kitty'", - "class_g = 'Alacritty'", - "class_g = 'qtile'", - "class_g = 'code-oss'", - "class_g = 'firefox'", - "class_g = 'Thunderbird'" -]; +corner-radius = 6; round-borders = 0; -round-borders-exclude = [ - #"class_g = 'TelegramDesktop'", -]; # Specify a list of border width rules, in the format `PIXELS:PATTERN`, # Note we don't make any guarantee about possible conflicts with the @@ -29,9 +13,6 @@ round-borders-exclude = [ # round-borders-rule = [ "2:class_g = 'URxvt'" ]; # round-borders-rule = [ - "3:class_g = 'XTerm'", - "10:class_g = 'Alacritty'", - "15:class_g = 'Signal'" ]; ################################# @@ -43,33 +24,29 @@ round-borders-rule = [ # (windows with '_NET_WM_WINDOW_TYPE_DESKTOP') never get shadow, # unless explicitly requested using the wintypes option. # -shadow = false -#shadow = true; +#shadow = false +shadow = true; # The blur radius for shadows, in pixels. (defaults to 12) # shadow-radius = 12 -shadow-radius = 25; +shadow-radius = 50; # The opacity of shadows. (1.0 - 1.0, defaults to 0.75) -shadow-opacity = 0.0; +shadow-opacity = 1.0; # The left offset for shadows, in pixels. (defaults to -15) # shadow-offset-x = -15 -shadow-offset-x = 2; +shadow-offset-x = -50; # The top offset for shadows, in pixels. (defaults to -15) # shadow-offset-y = -15 -shadow-offset-y = 2; - -# Avoid drawing shadows on dock/panel windows. This option is deprecated, -# you should use the *wintypes* option in your config file instead. -# -#no-dock-shadow = true +shadow-offset-y = -50; # Don't draw shadows on drag-and-drop windows. This option is deprecated, # you should use the *wintypes* option in your config file instead. # #no-dnd-shadow = true +no-dock-shadow = false # Red color value of shadow (0.0 - 1.0, defaults to 0). #shadow-red = 0.86328125 @@ -98,15 +75,8 @@ shadow-offset-y = 2; # # shadow-exclude = [] shadow-exclude = [ - "name = 'Notification'", - "class_g = 'Conky'", - "class_g ?= 'Notify-osd'", - "class_g = 'Cairo-clock'", - "class_g = 'slop'", - "class_g = 'Polybar'", - "name = 'qtile'", "_GTK_FRAME_EXTENTS@:c", - "_NET_WM_STATE@:32a" + #"_NET_WM_STATE@:32a" ]; # Specify a X geometry that describes the region in which shadow should not @@ -161,11 +131,9 @@ fade-exclude = [ # Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0) # inactive-opacity = 1 -inactive-opacity = 1; # Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default) # frame-opacity = 1.0 -frame-opacity = 1; # Default opacity for dropdown menus and popup menus. (0.0 - 1.0, defaults to 1.0) # menu-opacity = 1.0 @@ -183,8 +151,6 @@ active-opacity = 1.0; # Specify a list of conditions of windows that should always be considered focused. # focus-exclude = [] focus-exclude = [ - "class_g = 'Cairo-clock'", - "class_g = 'Bar'", # lemonbar "class_g = 'slop'" # maim ]; @@ -200,18 +166,7 @@ focus-exclude = [ # # opacity-rule = [] opacity-rule = [ - "80:class_g = 'Bar'", # lemonbar "100:class_g = 'slop'", # maim - "100:class_g = 'XTerm'", - "100:class_g = 'kitty'", - "100:class_g = 'Alacritty'", - "100:class_g = 'Polybar'", - "100:class_g = 'code-oss'", - "100:class_g = 'Meld'", - "70:class_g = 'TelegramDesktop'", - "90:class_g = 'Joplin'", - "100:class_g = 'firefox'", - "100:class_g = 'Thunderbird'" ]; @@ -221,7 +176,7 @@ opacity-rule = [ # Parameters for background blurring, see the *BLUR* section for more information. -# blur-method = +# blur-method = gaussian # blur-size = 12 # # blur-deviation = false @@ -230,7 +185,7 @@ opacity-rule = [ # Bad in performance, with driver-dependent behavior. # The name of the switch may change without prior notifications. # -# blur-background = true; +blur-background = true; # Blur background of windows when the window frame is not opaque. # Implies: @@ -266,13 +221,6 @@ blur: { # Exclude conditions for background blur. blur-background-exclude = [ - #"window_type = 'dock'", - #"window_type = 'desktop'", - #"class_g = 'URxvt'", - # - # prevents picom from blurring the background - # when taking selection screenshot with `main` - # https://github.com/naelstrof/maim/issues/130 "class_g = 'slop'", "_GTK_FRAME_EXTENTS@:c" ]; @@ -283,20 +231,15 @@ blur-background-exclude = [ ################################# # Daemonize process. Fork to background after initialization. Causes issues with certain (badly-written) drivers. -# daemon = false +daemon = true # Specify the backend to use: `xrender`, `glx`, or `xr_glx_hybrid`. # `xrender` is the default one. # experimental-backends = true; backend = "glx"; -#backend = "xrender"; -#backend = "xr_glx_hybrid"; - -# Enable/disable VSync. -vsync = false -#vsync = true +vsync = true # Enable remote control via D-Bus. See the *D-BUS API* section below for more details. # dbus = false @@ -314,7 +257,6 @@ mark-ovredir-focused = true; # Try to detect windows with rounded corners and don't consider them # shaped windows. The accuracy is not very high, unfortunately. # -# detect-rounded-corners = false detect-rounded-corners = true; # Detect '_NET_WM_OPACITY' on client windows, useful for window managers @@ -499,9 +441,9 @@ wintypes: { normal = { fade = true; shadow = true;} tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; }; - dock = { shadow = true; } + dock = { full-shadow = true; } dnd = { shadow = true; } - popup_menu = { opacity = 0.8; } - dropdown_menu = { opacity = 0.8; } + popup_menu = { shadow = true; } + dropdown_menu = { shadow = true; } }; unredir-if-possible = false diff --git a/scripts/toggle-gap.sh b/scripts/toggle-gap.sh index 4216af5..210dac3 100755 --- a/scripts/toggle-gap.sh +++ b/scripts/toggle-gap.sh @@ -1,3 +1,3 @@ #!/bin/sh -GAP=32; bspc config window_gap | grep -q $GAP && bspc config window_gap 0 || bspc config window_gap $GAP +GAP=40; bspc config window_gap | grep -q $GAP && bspc config window_gap 0 || bspc config window_gap $GAP