From 67f511bd9691af011bc574e8affff1bc0e770e69 Mon Sep 17 00:00:00 2001 From: Jovan Djokic-Sumarac Date: Mon, 22 Jul 2024 23:30:31 +0200 Subject: [PATCH] update gitconfig and zshrc --- .config/aerc/accounts.conf | 6 +++--- .config/foot/foot.ini | 5 +++-- .config/hypr/decoration.conf | 2 +- .config/hypr/env.conf | 1 - .config/hypr/general.conf | 4 ++++ .config/hypr/hyprland.conf | 2 +- .config/hypr/keybinds.conf | 4 +--- .config/hypr/monitors.conf | 10 +++++++--- .config/nvim | 2 +- .config/zsh-abbr/user-abbreviations | 1 + .gitconfig | 2 +- .zshrc | 9 +++++++++ 12 files changed, 32 insertions(+), 16 deletions(-) diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf index d11ea1c..9ff3e83 100644 --- a/.config/aerc/accounts.conf +++ b/.config/aerc/accounts.conf @@ -1,7 +1,7 @@ [bonsai] -source = imaps://brk%40bonsai.cool:jedandvatricetiripet@mail.bonsai.cool -outgoing = smtps://brk%40bonsai.cool:jedandvatricetiripet@mail.bonsai.cool +source = imaps://brk%40bonsai.cool:panda@mail.bonsai.cool +outgoing = smtps://brk%40bonsai.cool:panda@mail.bonsai.cool default = INBOX -from = "Jovan Djokic-Sumarac" +from = Jovan Djokic-Sumarac cache-headers = true copy-to = Sent diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini index f875085..688672d 100644 --- a/.config/foot/foot.ini +++ b/.config/foot/foot.ini @@ -8,7 +8,8 @@ # title=foot # locked-title=no -font = FiraCode Nerd Font:size=12 +font = 0xProto Nerd Font:size=12,Noto Sans CJK JP:size=12 + # font-bold= # font-italic= # font-bold-italic= @@ -19,7 +20,7 @@ font = FiraCode Nerd Font:size=12 # vertical-letter-offset=0 # underline-offset= # underline-thickness= -# box-drawings-uses-font-glyphs=no +box-drawings-uses-font-glyphs=no # dpi-aware=no # initial-window-size-pixels=700x500 # Or, diff --git a/.config/hypr/decoration.conf b/.config/hypr/decoration.conf index af3ec37..13c5333 100644 --- a/.config/hypr/decoration.conf +++ b/.config/hypr/decoration.conf @@ -4,7 +4,7 @@ decoration { active_opacity = 1 inactive_opacity = 1 - rounding = 15 + rounding = 0 blur { enabled = false diff --git a/.config/hypr/env.conf b/.config/hypr/env.conf index 158777a..884e1b3 100644 --- a/.config/hypr/env.conf +++ b/.config/hypr/env.conf @@ -5,7 +5,6 @@ exec-once = dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKT env = LIBVA_DRIVER_NAME, nvidia env = __GLX_VENDOR_LIBRARY_NAME, nvidia -env = WLR_NO_HARDWARE_CURSORS, 1 env = WLR_RENDERER_ALLOW_SOFTWARE, 1 env = LIBSEAT_BACKEND, logind diff --git a/.config/hypr/general.conf b/.config/hypr/general.conf index ea3f587..94f28a5 100644 --- a/.config/hypr/general.conf +++ b/.config/hypr/general.conf @@ -25,6 +25,10 @@ input { } +cursor { + allow_dumb_copy = true +} + general { col.inactive_border = 0xff45475a col.active_border = rgba(cba6f7ff) rgba(89b4faff) rgba(94e2d5ff) 10deg diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 7bc3c74..75775a7 100755 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -19,6 +19,7 @@ source = ~/.config/hypr/env.conf # STARTUP exec-once = dunst +exec-once = foot --server exec-once = avizo-service exec-once = avizo-client exec-once = waybar @@ -28,4 +29,3 @@ exec-once = wl-paste --watch cliphist store exec-once = hypridle exec-once = wayland-pipewire-idle-inhibit exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -exec-once = foot --server diff --git a/.config/hypr/keybinds.conf b/.config/hypr/keybinds.conf index 9ddeb45..2b016ec 100644 --- a/.config/hypr/keybinds.conf +++ b/.config/hypr/keybinds.conf @@ -9,7 +9,7 @@ bind = SUPERSHIFT, Q, exit bind = SUPER, F, fakefullscreen bind = SUPERSHIFT, F, togglefloating bind = SUPER, Return, exec, footclient -bind = SUPER, W, exec, thorium-browser --enable-features=UseOzonePlatform,WaylandWindowDecorations --ozone-platform=wayland +bind = SUPER, W, exec, firefox-nightly bind = SUPER, R, exec, footclient -e yazi bind = SUPER, D, exec, fuzzel bind = SUPER, L, exec, hyprlock @@ -20,7 +20,6 @@ bind = CTRLSHIFT, Escape, exec, footclient --title btoppy -e bto bind = SUPER, E, exec, iwgtk bind = SUPER, C, exec, /usr/bin/discord --enable-features=UseOzonePlatform,WaylandWindowDecorations --ozone-platform=wayland bind = SUPERSHIFT, E, exec, footclient --title blueterm -e bluetuith -bind = SUPER, P, exec, wlogout --layout ~/.config/wlogout/layout -css ~/.config/wlogout/style.css --protocol layer-shell -b 4 -c 0 -m 0 bind = SUPER, S, exec, grimblast copy area @@ -61,4 +60,3 @@ bind=,XF86MonBrightnessUp,exec,light -A 5 bind=,XF86AudioPlay,exec,playerctl play-pause - diff --git a/.config/hypr/monitors.conf b/.config/hypr/monitors.conf index 3e7c2ea..2c8f085 100644 --- a/.config/hypr/monitors.conf +++ b/.config/hypr/monitors.conf @@ -9,9 +9,13 @@ # monitor=eDP-1,1920x1080@120,0x0,1.0,bitdepth,10 # monitor=DP-1,1920x1080@165,4480x0,1.0,bitdepth,10 -monitor = eDP-1, 1920x1080@120, 0x0, 1.0, bitdepth, 10 -monitor = HDMI-A-1, 2560x1440@75, 1920x0, 1.0, bitdepth, 10 -monitor = DP-1, 1920x1080@165, 4480x0, 1.0, bitdepth, 10 +# monitor = eDP-1, 1920x1080@120, 0x0, 1.0, bitdepth, 10 +# monitor = HDMI-A-1, 2560x1440@75, 1920x0, 1.0 +# monitor = DP-1, 1920x1080@165, 4480x0, 1.0, bitdepth, 10 + +monitor = eDP-1, disabled +monitor = HDMI-A-1, 2560x1440@75, 0x0, 1.0 +monitor = DP-1, 1920x1080@165, 2560x0, 1.0, bitdepth, 10 #monitor = HDMI-A-1, disabled # 1920x1080@60, 0x0, 1 #monitor = eDP-1, disabled diff --git a/.config/nvim b/.config/nvim index 9aa3dd7..ca0d4fa 160000 --- a/.config/nvim +++ b/.config/nvim @@ -1 +1 @@ -Subproject commit 9aa3dd7cb776482d85015e5da42027161b509b84 +Subproject commit ca0d4faec420a99de6141fccbdcad0ecc085d1ff diff --git a/.config/zsh-abbr/user-abbreviations b/.config/zsh-abbr/user-abbreviations index ed4fe47..f5f7f61 100644 --- a/.config/zsh-abbr/user-abbreviations +++ b/.config/zsh-abbr/user-abbreviations @@ -2,4 +2,5 @@ abbr -g "aur"="sudo aura" abbr -g "aura"="sudo aura" abbr -g "cat"="bat" abbr -g "neo"="nvim +'Telescope oldfiles'" +abbr -g "mann"="nvim +'Telescope man_pages'" abbr "wt"="webtorrent --mpv \"%\"" diff --git a/.gitconfig b/.gitconfig index effc150..d5e0ff2 100644 --- a/.gitconfig +++ b/.gitconfig @@ -38,7 +38,7 @@ flatten = !git rebase -i $(git log $(git rev-parse --abbrev-ref HEAD) --oneline | tail -1 | cut -d' ' -f1) new = !git fetch --all && git pull && git checkout -b publish = !git push origin $(git rev-parse --abbrev-ref HEAD) - ship = !git add . && git commit -S && git publish + ship = !git commit -aS && git publish [core] pager = bat diff --git a/.zshrc b/.zshrc index ca87641..c3f282f 100644 --- a/.zshrc +++ b/.zshrc @@ -108,3 +108,12 @@ export ABBR_SET_EXPANSION_CURSOR=1 autoload -Uz compinit zstyle ':completion:*' menu select fpath+=~/.zfunc + +kat=" + ／l、 +（ﾟ､ ｡ ７ + l ~ヽ_ + じしf_,)ノ +" + +echo $kat