From 15ee8a707052fe97fbdf9e5a8de2269785a04b50 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 2 Dec 2023 18:55:00 +0800 Subject: [PATCH] Update --- .config/hypr/hyprland.conf.d/autoexec.conf | 9 ++++--- .config/hypr/hyprland.conf.d/keybind.conf | 12 ++++++---- .config/hypr/hyprland.conf.d/ui.conf | 3 +-- .config/hypr/plugins/hy3 | 1 + .config/sway/Wallpaper | 1 + .config/sway/config | 2 ++ .config/sway/config.d/custom.d/fedora | 4 ++++ .config/sway/config.d/custom.d/input-settings | 14 +++++++++++ .config/sway/config.d/custom.d/outputs | 24 +++++++++++++++++++ .gitmodules | 3 +++ .zshrc | 3 ++- 11 files changed, 64 insertions(+), 12 deletions(-) create mode 160000 .config/hypr/plugins/hy3 create mode 120000 .config/sway/Wallpaper create mode 100644 .config/sway/config.d/custom.d/fedora create mode 100644 .config/sway/config.d/custom.d/input-settings create mode 100644 .config/sway/config.d/custom.d/outputs diff --git a/.config/hypr/hyprland.conf.d/autoexec.conf b/.config/hypr/hyprland.conf.d/autoexec.conf index 35a173b..61cf0f9 100644 --- a/.config/hypr/hyprland.conf.d/autoexec.conf +++ b/.config/hypr/hyprland.conf.d/autoexec.conf @@ -7,11 +7,10 @@ env = __GLX_VENDOR_LIBRARY_NAME,nvidia env = WLR_NO_HARDWARE_CURSORS,1 # Execute your favorite apps at launch -exec=pidof hyprpaper || hyprpaper -exec=pidof wlsunset || wlsunset -S 08:00 -s 19:00 -exec=pidof waybar || waybar +exec=pidof -q hyprpaper || hyprpaper +exec=pidof -q wlsunset || wlsunset -S 08:00 -s 19:00 +exec=pidof -q waybar || waybar exec=~/.config/hypr/scripts/clamshell.sh exec-once=fcitx5 -d -# ssh agent -env = SSH_AUTH_SOCK,"${XDG_RUNTIME_DIR}/ssh-agent.socket" +env = SSH_AUTH_SOCK,$XDG_RUNTIME_DIR/ssh-agent.socket diff --git a/.config/hypr/hyprland.conf.d/keybind.conf b/.config/hypr/hyprland.conf.d/keybind.conf index cc7c21a..9c720fe 100644 --- a/.config/hypr/hyprland.conf.d/keybind.conf +++ b/.config/hypr/hyprland.conf.d/keybind.conf @@ -22,10 +22,14 @@ bind = $mainMod, k, movefocus, u bind = $mainMod, j, movefocus, d # Move windows with hjkl -bind = $mainMod + SHIFT, h, movewindow, l -bind = $mainMod + SHIFT, l, movewindow, r -bind = $mainMod + SHIFT, k, movewindow, u -bind = $mainMod + SHIFT, j, movewindow, d +bind = $mainMod + SHIFT, h, swapwindow, l +bind = $mainMod + SHIFT, l, swapwindow, r +bind = $mainMod + SHIFT, k, swapwindow, u +bind = $mainMod + SHIFT, j, swapwindow, d + +# Grouping +bind = $mainMod, t, togglegroup +bind = $mainMod, TAB, changegroupactive # Switch workspaces with mainMod + [0-9] bind = $mainMod, 1, workspace, 1 diff --git a/.config/hypr/hyprland.conf.d/ui.conf b/.config/hypr/hyprland.conf.d/ui.conf index 545fdcb..288f038 100644 --- a/.config/hypr/hyprland.conf.d/ui.conf +++ b/.config/hypr/hyprland.conf.d/ui.conf @@ -22,8 +22,7 @@ decoration { } animations { - enabled = yes - animation=specialWorkspace,1,4,default,slidefadevert + enabled = false } dwindle { diff --git a/.config/hypr/plugins/hy3 b/.config/hypr/plugins/hy3 new file mode 160000 index 0000000..4db9b1f --- /dev/null +++ b/.config/hypr/plugins/hy3 @@ -0,0 +1 @@ +Subproject commit 4db9b1f37a5f429aa5d103143176ba2f5dd20f16 diff --git a/.config/sway/Wallpaper b/.config/sway/Wallpaper new file mode 120000 index 0000000..4e640f7 --- /dev/null +++ b/.config/sway/Wallpaper @@ -0,0 +1 @@ +/home/ryan/Pictures/wall/sway/dark \ No newline at end of file diff --git a/.config/sway/config b/.config/sway/config index 3e7034f..a5d2b0a 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -3,3 +3,5 @@ include ~/.config/sway/config.d/theme include ~/.config/sway/config.d/keybinds include ~/.config/sway/config.d/custom include ~/.config/sway/config.d/exec + +exec kitty diff --git a/.config/sway/config.d/custom.d/fedora b/.config/sway/config.d/custom.d/fedora new file mode 100644 index 0000000..b7010c1 --- /dev/null +++ b/.config/sway/config.d/custom.d/fedora @@ -0,0 +1,4 @@ +# vim: filetype=swayconfig + +include /etc/sway/config.d/* +exec /usr/libexec/polkit-gnome-authentication-agent-1 diff --git a/.config/sway/config.d/custom.d/input-settings b/.config/sway/config.d/custom.d/input-settings new file mode 100644 index 0000000..550d369 --- /dev/null +++ b/.config/sway/config.d/custom.d/input-settings @@ -0,0 +1,14 @@ +# vim: filetype=swayconfig + +input type:mouse { + accel_profile flat + pointer_accel -0.3 +} + +input type:touchpad { + accel_profile adaptive + natural_scroll enabled + tap enabled + dwt enabled + # events disabled_on_external_mouse +} diff --git a/.config/sway/config.d/custom.d/outputs b/.config/sway/config.d/custom.d/outputs new file mode 100644 index 0000000..4438f66 --- /dev/null +++ b/.config/sway/config.d/custom.d/outputs @@ -0,0 +1,24 @@ +# 75hz monitor +output 'Lectron Company Ltd LECOO M2412HL GG30A137' mode 2560x1440@74.968Hz +output 'Lectron Company Ltd LECOO M2412HL GG30A137' subpixel rgb +# output 'Lectron Company Ltd LECOO M2412HL GG30A137' max_render_time 5 +# output 'Lectron Company Ltd LECOO M2412HL GG30A137' render_bit_depth 10 + +output * adaptive_sync on + +# laptop screen +output 'Thermotrex Corporation TL160ADMP03-0 Unknown' subpixel rgb +# output 'Thermotrex Corporation TL160ADMP03-0 Unknown' mode 2560x1600@60.000Hz +# output 'Thermotrex Corporation TL160ADMP03-0 Unknown' max_render_time 5 +output 'Thermotrex Corporation TL160ADMP03-0 Unknown' mode 2560x1600@240.000Hz +output 'Thermotrex Corporation TL160ADMP03-0 Unknown' max_render_time 8 +# output 'Thermotrex Corporation TL160ADMP03-0 Unknown' render_bit_depth 10 + +# TV at home +output 'Unknown HUAWEI INC 0x00000000' mode 3840x2160@60.000Hz +output 'Unknown HUAWEI INC 0x00000000' scale 2 + +# lab screen +output "XMI Redmi 27 NU 3948622WH08F4" transform 90 +# output "XMI Redmi 27 NU 3948622WH08F4" max_render_time 5 +# output "XMI Redmi 27 NU 3948622WH08F4" subpixel rgb diff --git a/.gitmodules b/.gitmodules index c868336..3b793f6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule ".config/mpv/default-shader-pack"] path = .config/mpv/default-shader-pack url = https://github.com/iwalton3/default-shader-pack.git +[submodule ".config/hypr/plugins/hy3"] + path = .config/hypr/plugins/hy3 + url = https://github.com/outfoxxed/hy3.git diff --git a/.zshrc b/.zshrc index fdf1487..139de06 100644 --- a/.zshrc +++ b/.zshrc @@ -109,8 +109,9 @@ export HISTORY_SUBSTRING_SEARCH_FUZZY=1 #colored output export MANWIDTH=${MANWIDTH:-78} +test -e /bin/nvim && export MANPAGER='nvim +Man!' || \ + export MANLESS="Manual\ \$MAN_PN\ ?ltline\ %lt?L/%L.:byte\ %bB?s/%s..?\:?pB\ %pB\\%.." test -n "$LS_COLORS" || eval $(dircolors) || echo 'Warning: Unable to set LS_COLORS' -export MANLESS="Manual\ \$MAN_PN\ ?ltline\ %lt?L/%L.:byte\ %bB?s/%s..?\:?pB\ %pB\\%.." export LESS="--use-color -RSM~" #local path