diff --git a/.config/gtk-2.0/dark.conf b/.config/gtk-2.0/dark.conf index cbd25fc..dfb790a 100644 --- a/.config/gtk-2.0/dark.conf +++ b/.config/gtk-2.0/dark.conf @@ -1,3 +1,3 @@ -gtk-icon-theme-name = "Papirus-Dark" +gtk-icon-theme-name = "Adwaita" gtk-theme-name = "Adwaita-dark" gtk-font-name = "IBM Plex 12" diff --git a/.config/gtk-2.0/light.conf b/.config/gtk-2.0/light.conf index fcd2438..2b62d87 100644 --- a/.config/gtk-2.0/light.conf +++ b/.config/gtk-2.0/light.conf @@ -1,3 +1,3 @@ -gtk-icon-theme-name = "Papirus-Light" +gtk-icon-theme-name = "Adwaita" gtk-theme-name = "Adwaita" gtk-font-name = "IBM Plex 12" diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index faa00c9..2519776 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,19 +1,3 @@ volume=70 sub-auto=fuzzy # hwdec=auto-safe - -# mpv options with upscaling - -deband -deband-grain=0 -deband-range=12 -deband-threshold=32 -hwdec=auto-copy -profile=gpu-hq -gpu-api=opengl -fbo-format=rgba16f -dither-depth=auto -dither=fruit -glsl-shaders-append=/home/ryan/.config/mpv/default-shader-pack/shaders/noise_static_luma.hook -glsl-shaders-append=/home/ryan/.config/mpv/default-shader-pack/shaders/noise_static_chroma.hook -glsl-shaders-append=/home/ryan/.config/mpv/default-shader-pack/shaders/CAS-scaled.glsl diff --git a/.config/sway/Wallpaper b/.config/sway/Wallpaper deleted file mode 120000 index 4e640f7..0000000 --- a/.config/sway/Wallpaper +++ /dev/null @@ -1 +0,0 @@ -/home/ryan/Pictures/wall/sway/dark \ No newline at end of file diff --git a/.config/sway/conf.d/custom.d/outputs b/.config/sway/conf.d/custom.d/outputs index bcdf3e1..b46f66d 100644 --- a/.config/sway/conf.d/custom.d/outputs +++ b/.config/sway/conf.d/custom.d/outputs @@ -7,7 +7,7 @@ output 'Lectron Company Ltd LECOO M2412HL GG30A137' subpixel rgb # output 'Lectron Company Ltd LECOO M2412HL GG30A137' max_render_time 5 # lab screen -output "XMI Redmi 27 NU 3948622WH08F4" mode --custom 3840x2160@35.000Hz +output "XMI Redmi 27 NU 3948622WH08F4" mode --custom 2560x1440@60Hz output "XMI Redmi 27 NU 3948622WH08F4" scale 1.5 output "XMI Redmi 27 NU 3948622WH08F4" transform 90 output "XMI Redmi 27 NU 3948622WH08F4" pos 2560 0 diff --git a/.config/sway/conf.d/display b/.config/sway/conf.d/display index b345821..1515b24 100644 --- a/.config/sway/conf.d/display +++ b/.config/sway/conf.d/display @@ -11,7 +11,3 @@ bindswitch --reload --locked lid:off output $laptop enable #workspace_auto_back_and_forth yes force_display_urgency_hint 500 ms smart_borders no_gaps - -# Use static wallpaper - -output * bg $(find -L ~/.config/sway/Wallpaper/ -type f | shuf -n1) fill diff --git a/.config/sway/conf.d/exec b/.config/sway/conf.d/exec index daf3a43..b70e785 100644 --- a/.config/sway/conf.d/exec +++ b/.config/sway/conf.d/exec @@ -5,7 +5,6 @@ exec mkfifo /tmp/kitty exec wlsunset -s 19:00 -S 07:00 -d 1800 exec light -S 70 -# exec gentoo-pipewire-launcher -# exec swaync exec playerctld daemon -# exec dbus-update-activation-environment --all + +include /usr/local/etc/sway/config.d/* diff --git a/.config/sway/conf.d/themes/dark b/.config/sway/conf.d/themes/dark index d6a51d1..eef27ac 100644 --- a/.config/sway/conf.d/themes/dark +++ b/.config/sway/conf.d/themes/dark @@ -5,7 +5,7 @@ set $gnome-schema org.gnome.desktop.interface exec_always { gsettings set $gnome-schema color-scheme 'prefer-dark' gsettings set $gnome-schema gtk-theme 'Adwaita' - gsettings set $gnome-schema icon-theme 'Papirus-Dark' + gsettings set $gnome-schema icon-theme 'Adwaita' gsettings set $gnome-schema cursor-theme 'Adwaita' gsettings set $gnome-schema font-name 'ibm-plex 12' gsettings set org.gtk.Settings.FileChooser startup-mode cwd @@ -22,3 +22,5 @@ client.background #928374 #282828 #borders stuff default_border pixel 1 + +output * bg #282828 solid_color diff --git a/.config/sway/conf.d/themes/light b/.config/sway/conf.d/themes/light index ecf8a6e..9a58c1c 100644 --- a/.config/sway/conf.d/themes/light +++ b/.config/sway/conf.d/themes/light @@ -5,7 +5,7 @@ set $gnome-schema org.gnome.desktop.interface exec_always { gsettings set $gnome-schema color-scheme 'prefer-light' gsettings set $gnome-schema gtk-theme 'Adwaita' - gsettings set $gnome-schema icon-theme 'Papirus-Light' + gsettings set $gnome-schema icon-theme 'Adwaita' gsettings set $gnome-schema cursor-theme 'Adwaita' gsettings set $gnome-schema font-name 'ibm-plex 12' gsettings set org.gtk.Settings.FileChooser startup-mode cwd @@ -22,3 +22,5 @@ client.background #ebdbb2 #fbf1c7 #borders stuff default_border pixel 1 + +output * bg #fbf1c7 solid_color diff --git a/.config/sway/scripts/themes.sh b/.config/sway/scripts/themes.sh index 3484182..7230877 100755 --- a/.config/sway/scripts/themes.sh +++ b/.config/sway/scripts/themes.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash scheme=$(echo -e "light\ndark" | wofi -d -p "󰔎 Select color scheme") # simply subsitude dark and light @@ -29,8 +30,8 @@ if [ $scheme = "light" ]; then # gtk2 cp ~/.config/gtk-2.0/light.conf ~/.gtkrc-2.0 # set wallpaper location - unlink ~/.config/sway/Wallpaper - ln -s ~/Pictures/wall/sway/light ~/.config/sway/Wallpaper + # unlink ~/.config/sway/Wallpaper + # ln -s ~/Pictures/wall/sway/light ~/.config/sway/Wallpaper else # kitty config kitty -1 sh -c "kitty @ set-colors -a -c ~/.config/kitty/themes/dark.conf" & @@ -42,8 +43,9 @@ else # gtk2 cp ~/.config/gtk-2.0/dark.conf ~/.gtkrc-2.0 # set dark wallpaper - unlink ~/.config/sway/Wallpaper - ln -s ~/Pictures/wall/sway/dark ~/.config/sway/Wallpaper + # unlink ~/.config/sway/Wallpaper + # ln -s ~/Pictures/wall/sway/dark ~/.config/sway/Wallpaper fi -hyprctl reload +swaymsg reload +systemctl --user restart waybar.service diff --git a/.zshrc b/.zshrc index dbbe4bb..6da34ce 100644 --- a/.zshrc +++ b/.zshrc @@ -37,8 +37,10 @@ zinit light zsh-users/zsh-completions zinit light zsh-users/zsh-history-substring-search # Software -zinit ice as"command" from"gh-r" mv"bat* -> bat" pick"bat/bat" -zinit light sharkdp/bat +if ! command -v bat &> /dev/null ; then + zinit ice as"command" from"gh-r" mv"bat* -> bat" pick"bat/bat" + zinit light sharkdp/bat +fi zinit from"gh-r" as"program" mv"direnv* -> direnv" \ atclone'./direnv hook zsh > zhook.zsh' atpull'%atclone' \