diff --git a/AppData/Local/external_nvim b/AppData/Local/external_nvim index 2eb81c1..23c86b3 160000 --- a/AppData/Local/external_nvim +++ b/AppData/Local/external_nvim @@ -1 +1 @@ -Subproject commit 2eb81c1d93946193696445df9250602101e89084 +Subproject commit 23c86b37763f3662b40cbce638bacc8791894c41 diff --git a/dot_envrc b/dot_envrc index 669832c..cc5a836 100644 --- a/dot_envrc +++ b/dot_envrc @@ -141,3 +141,4 @@ export LOCALE_ARCHIVE=/usr/lib/locale/locale-archive export ADW_DISABLE_PORTAL=1 export MOZ_ENABLE_WAYLAND=1 export XDG_CURRENT_DESKTOP="${XDG_CURRENT_DESKTOP:-sway}" +export FREETYPE_PROPERTIES="truetype:interpreter-version=40" diff --git a/executable_dot_aliasrc b/executable_dot_aliasrc index c08024f..7f04088 100644 --- a/executable_dot_aliasrc +++ b/executable_dot_aliasrc @@ -134,8 +134,14 @@ load_aliases() { if checkCommand swhkd; then alias reload-swhkd="sudo pkill -HUP swhkd" fi + if checkCommand fdfind; then + alias fd="fdfind" + fi - alias icat="kitty +kitten icat" + if [[ $TERM =~ ".*kitty*" ]]; then + alias icat="kitty +kitten icat" + alias ssh="kitten ssh" + fi } load_aliases unset -f load_aliases diff --git a/executable_dot_zshrc b/executable_dot_zshrc index 5112463..3403884 100644 --- a/executable_dot_zshrc +++ b/executable_dot_zshrc @@ -134,7 +134,7 @@ fi if checkCommand mcfly; then export MCFLY_KEY_SCHEME=vim export MCFLY_FUZZY=2 - zsh-defer _evalcache mcfly init zsh + eval "$(mcfly init zsh)" fi # set up zoxide if installed (lets you jump through folders easily using the z and zi commands instead of cd) diff --git a/private_dot_config/dunst/dunstrc b/private_dot_config/dunst/dunstrc index 12c691c..b3173db 100644 --- a/private_dot_config/dunst/dunstrc +++ b/private_dot_config/dunst/dunstrc @@ -36,7 +36,7 @@ offset = 10x50 # Scale factor. It is auto-detected if value is 0. - scale = 1.25 + scale = 0 # 1.5 # Maximum number of notification (0 means no limit) notification_limit = 20 @@ -123,7 +123,7 @@ ### Text ### - font = Atkinson Hyperlegible, FontAwesome 12 + font = Comic Shanns, Atkinson Hyperlegible, FontAwesome 12 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. diff --git a/private_dot_config/external_nvim b/private_dot_config/external_nvim index 44b00e0..c0d58e2 160000 --- a/private_dot_config/external_nvim +++ b/private_dot_config/external_nvim @@ -1 +1 @@ -Subproject commit 44b00e0b445672f9ef31c29a4853326638487ee9 +Subproject commit c0d58e2334df16128533abb0d6deb2d49c272e27 diff --git a/private_dot_config/git/executable_config.tmpl b/private_dot_config/git/executable_config.tmpl index 4c11293..61dbce9 100644 --- a/private_dot_config/git/executable_config.tmpl +++ b/private_dot_config/git/executable_config.tmpl @@ -73,6 +73,7 @@ autoSetupRemote = true [alias] lg = log --graph --branches --oneline st = status +gud = !git commit -am --no-edit --amend && git push --force-with-lease [filter "lfs"] process = git-lfs filter-process diff --git a/private_dot_config/mako/config b/private_dot_config/mako/config new file mode 100644 index 0000000..8608169 --- /dev/null +++ b/private_dot_config/mako/config @@ -0,0 +1,9 @@ +font=Atkinson Hyperlegible, FontAwesome 12 +max-icon-size=32 +height=300 +width=300 +background-color=#1e1b30cc +text-color=#fbfbff +border-radius=8 +border-color=#746e95 +default-timeout=10000 diff --git a/private_dot_config/sway/config b/private_dot_config/sway/config index 7b4fd5d..f97867c 100644 --- a/private_dot_config/sway/config +++ b/private_dot_config/sway/config @@ -42,14 +42,15 @@ exec_always dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CUR include "keybinds" #border size -default_border normal 1 +default_border normal 1 -gaps inner 10 +gaps inner 5 # polkit exec_always --no-startup-id /usr/bin/lxpolkit exec_always --no-startup-id /usr/bin/lxqt-policykit-agent #notif daemon -exec dunst +# exec dunst +exec mako # exec_always fcitx5 exec wl-paste --watch cliphist store exec gnome-keyring-daemon -r