diff --git a/home/dot_config/hypr/hyprland.conf b/home/dot_config/hypr/hyprland.conf index 43ac7b2..562cab7 100644 --- a/home/dot_config/hypr/hyprland.conf +++ b/home/dot_config/hypr/hyprland.conf @@ -1,44 +1,190 @@ +# This is an example Hyprland config file. +# Refer to the wiki for more information. +# https://wiki.hyprland.org/Configuring/ -######################################################################################## -AUTOGENERATED HYPR CONFIG. -PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT, -OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. -######################################################################################## - -# # Please note not all available settings / options are set here. # For a full list, see the wiki -# + +# You can split this configuration into multiple files +# Create your files separately and then link them to this file like this: +# source = ~/.config/hypr/myColors.conf + + +################ +### MONITORS ### +################ # See https://wiki.hyprland.org/Configuring/Monitors/ monitor=,preferred,auto,auto -monitor=eDP-1,preferred,auto,1 +monitor=eDP-1,preferred,auto,1.2 -# See https://wiki.hyprland.org/Configuring/Keywords/ for more +################### +### MY PROGRAMS ### +################### -# Execute your favorite apps at launch +# See https://wiki.hyprland.org/Configuring/Keywords/ + +# Set programs that you use +$terminal = alacritty +$fileManager = dolphin +$menu = wofi --show drun + + +################# +### AUTOSTART ### +################# + +# Autostart necessary processes (like notifications daemons, status bars, etc.) +# Or execute your favorite apps at launch like this: + +# exec-once = $terminal +# exec-once = nm-applet & # exec-once = waybar & hyprpaper & firefox -exec-once = dbus-update-activation-environment --all -exec-once = kanshi -exec-once = dex -a -e kypr -exec-once = swayidle -w timeout 300 'swaylock -f -i ~/.config/swaylock/bg.png -s fill' timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f -i ~/.config/swaylock/bg.png -s fill' -exec-once = waybar -exec-once = swaybg -i ~/.config/hypr/bg.png -m fill -exec-once = udiskie & -# start applications -# exec-once = telegram-desktop -# exec-once = slack - -# Source a file (multi-file configs) -# source = ~/.config/hypr/myColors.conf +############################# +### ENVIRONMENT VARIABLES ### +############################# + +# See https://wiki.hyprland.org/Configuring/Environment-variables/ -# Some default env vars. env = XCURSOR_SIZE,24 +env = HYPRCURSOR_SIZE,24 -# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ + +################### +### PERMISSIONS ### +################### + +# See https://wiki.hyprland.org/Configuring/Permissions/ +# Please note permission changes here require a Hyprland restart and are not applied on-the-fly +# for security reasons + +# ecosystem { +# enforce_permissions = 1 +# } + +# permission = /usr/(bin|local/bin)/grim, screencopy, allow +# permission = /usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland, screencopy, allow +# permission = /usr/(bin|local/bin)/hyprpm, plugin, allow + + +##################### +### LOOK AND FEEL ### +##################### + +# Refer to https://wiki.hyprland.org/Configuring/Variables/ + +# https://wiki.hyprland.org/Configuring/Variables/#general +general { + gaps_in = 5 + gaps_out = 20 + + border_size = 2 + + # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors + col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg + col.inactive_border = rgba(595959aa) + + # Set to true enable resizing windows by clicking and dragging on borders and gaps + resize_on_border = false + + # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on + allow_tearing = false + + layout = dwindle +} + +# https://wiki.hyprland.org/Configuring/Variables/#decoration +decoration { + rounding = 10 + rounding_power = 2 + + # Change transparency of focused and unfocused windows + active_opacity = 1.0 + inactive_opacity = 1.0 + + shadow { + enabled = true + range = 4 + render_power = 3 + color = rgba(1a1a1aee) + } + + # https://wiki.hyprland.org/Configuring/Variables/#blur + blur { + enabled = true + size = 3 + passes = 1 + + vibrancy = 0.1696 + } +} + +# https://wiki.hyprland.org/Configuring/Variables/#animations +animations { + enabled = yes, please :) + + # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more + + bezier = easeOutQuint,0.23,1,0.32,1 + bezier = easeInOutCubic,0.65,0.05,0.36,1 + bezier = linear,0,0,1,1 + bezier = almostLinear,0.5,0.5,0.75,1.0 + bezier = quick,0.15,0,0.1,1 + + animation = global, 1, 10, default + animation = border, 1, 5.39, easeOutQuint + animation = windows, 1, 4.79, easeOutQuint + animation = windowsIn, 1, 4.1, easeOutQuint, popin 87% + animation = windowsOut, 1, 1.49, linear, popin 87% + animation = fadeIn, 1, 1.73, almostLinear + animation = fadeOut, 1, 1.46, almostLinear + animation = fade, 1, 3.03, quick + animation = layers, 1, 3.81, easeOutQuint + animation = layersIn, 1, 4, easeOutQuint, fade + animation = layersOut, 1, 1.5, linear, fade + animation = fadeLayersIn, 1, 1.79, almostLinear + animation = fadeLayersOut, 1, 1.39, almostLinear + animation = workspaces, 1, 1.94, almostLinear, fade + animation = workspacesIn, 1, 1.21, almostLinear, fade + animation = workspacesOut, 1, 1.94, almostLinear, fade +} + +# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/ +# "Smart gaps" / "No gaps when only" +# uncomment all if you wish to use that. +# workspace = w[tv1], gapsout:0, gapsin:0 +# workspace = f[1], gapsout:0, gapsin:0 +# windowrule = bordersize 0, floating:0, onworkspace:w[tv1] +# windowrule = rounding 0, floating:0, onworkspace:w[tv1] +# windowrule = bordersize 0, floating:0, onworkspace:f[1] +# windowrule = rounding 0, floating:0, onworkspace:f[1] + +# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more +dwindle { + pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = true # You probably want this +} + +# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more +master { + new_status = master +} + +# https://wiki.hyprland.org/Configuring/Variables/#misc +misc { + force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers + disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :( +} + + +############# +### INPUT ### +############# + +# https://wiki.hyprland.org/Configuring/Variables/#input input { kb_layout = us kb_variant = @@ -46,116 +192,38 @@ input { kb_options = kb_rules = - follow_mouse = 2 + follow_mouse = 1 + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. touchpad { scroll_factor = 0.6 - natural_scroll = no + natural_scroll = false tap-to-click = true drag_lock = true } - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. -} - -general { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - gaps_in = 5 - gaps_out = 10 - border_size = 3 - # col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - # col.inactive_border = rgba(595959aa) - - # col.active_border = rgb(44475a) rgb(bd93f9) 90deg - # col.inactive_border = rgba(44475aaa) - # col.group_border = rgba(282a36dd) - # col.group_border_active = rgb(bd93f9) rgb(44475a) 90deg - # non-gradient alternative - col.active_border = rgb(bd93f9) - col.inactive_border = rgba(44475aaa) - col.group_border = rgba(282a36dd) - col.group_border_active = rgb(bd93f9) - # darker alternative - #col.active_border = rgb(44475a) # or rgb(6272a4) - #col.inactive_border = rgb(282a36) - #col.group_border = rgb(282a36) - #col.group_border_active = rgb(44475a) # or rgb(6272a4) - - layout = dwindle -} - -decoration { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - rounding = 5 - blur = yes - blur_size = 3 - blur_passes = 1 - blur_new_optimizations = on - - drop_shadow = yes - shadow_range = 4 - shadow_render_power = 3 - # col.shadow = rgba(1a1a1aee) - - col.shadow = rgba(1E202966) - # suggested shadow setting - drop_shadow = yes - shadow_range = 60 - shadow_offset = 1 2 - shadow_render_power = 3 - shadow_scale = 0.97 -} - -animations { - enabled = yes - - # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - - animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 7, default - animation = workspaces, 1, 6, default -} - -dwindle { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more - pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = yes # you probably want this -} - -master { - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_is_master = true } +# https://wiki.hyprland.org/Configuring/Variables/#gestures gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more workspace_swipe = false } # Example per-device config -# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more -device:epic-mouse-v1 { +# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more +device { + name = epic-mouse-v1 sensitivity = -0.5 } -# Example windowrule v1 -# windowrule = float, ^(kitty)$ -# Example windowrule v2 -# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +################### +### KEYBINDINGS ### +################### -# See https://wiki.hyprland.org/Configuring/Keywords/ for more +# See https://wiki.hyprland.org/Configuring/Keywords/ $mainMod = SUPER $altMod = ALT - # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more bind = $altMod SHIFT, C, exec, ~/bin/screenshot bind = $altMod SHIFT, M, exec, ~/bin/screenshot-monitor @@ -170,15 +238,6 @@ bind = $mainMod SHIFT, J, togglesplit, # dwindle bind = $mainMod SHIFT, P, exec, ~/.config/wofi/wofi-power.sh bind = $mainMod SHIFT, X, exec, swaylock -f -i ~/.config/swaylock/bg.png -s fill -binde = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+ -bindr = ,XF86AudioRaiseVolume, exec, pkill -RTMIN+8 waybar -binde = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -bindr = ,XF86AudioLowerVolume, exec, pkill -RTMIN+8 waybar -bind = ,XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle -bindr = ,XF86AudioMute, exec, pkill -RTMIN+8 waybar -bind = ,XF86MonBrightnessUp, exec, /home/jay/bin/backlight-control --path /sys/class/backlight/intel_backlight set +10% -bind = ,XF86MonBrightnessDown, exec, /home/jay/bin/backlight-control --path /sys/class/backlight/intel_backlight set -- -10% - bind = $mainMod, F, fullscreen, 1 bind = $mainMod SHIFT, F, fullscreen, 0 @@ -222,6 +281,10 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8 bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 0, movetoworkspace, 10 +# Example special workspace (scratchpad) +bind = $mainMod, S, togglespecialworkspace, magic +bind = $mainMod SHIFT, S, movetoworkspace, special:magic + # Scroll through existing workspaces with mainMod + scroll bind = $mainMod, mouse_down, workspace, e+1 bind = $mainMod, mouse_up, workspace, e-1 @@ -230,39 +293,32 @@ bind = $mainMod, mouse_up, workspace, e-1 bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow -# resize submap (mode) -bind=SUPER,R,submap,resize -submap=resize -binde=,right,resizeactive,40 0 -binde=,left,resizeactive,-40 0 -binde=,up,resizeactive,0 -40 -binde=,down,resizeactive,0 40 -bind=,escape,submap,reset -bind=,Return,submap,reset -submap=reset +# Laptop multimedia keys for volume and LCD brightness +bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+ +bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- +bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle +bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle +bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+ +bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%- -# set workspace default to monitor -workspace = eDP-1, 1 -workspace = HDMI-A-1, 2 +# Requires playerctl +bindl = , XF86AudioNext, exec, playerctl next +bindl = , XF86AudioPause, exec, playerctl play-pause +bindl = , XF86AudioPlay, exec, playerctl play-pause +bindl = , XF86AudioPrev, exec, playerctl previous -wsbind = 1, eDP-1 -wsbind = 2, HDMI-A-1 -wsbind = 3, HDMI-A-1 -wsbind = 4, HDMI-A-1 -wsbind = 5, HDMI-A-1 -wsbind = 6, HDMI-A-1 -wsbind = 2, DP-1 -wsbind = 3, DP-1 -wsbind = 4, DP-1 -wsbind = 5, DP-1 -wsbind = 6, DP-1 -wsbind = 7, eDP-1 -wsbind = 8, eDP-1 -wsbind = 9, eDP-1 -wsbind = 10, eDP-1 +############################## +### WINDOWS AND WORKSPACES ### +############################## -# set window rule -windowrulev2 = float,class:^(Slack)$ -windowrulev2 = workspace 8,class:^(Slack)$ -windowrulev2 = float,class:^(org.telegram.desktop)$ -windowrulev2 = workspace 8,class:^(org.telegram.desktop)$ +# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more +# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules + +# Example windowrule +# windowrule = float,class:^(kitty)$,title:^(kitty)$ + +# Ignore maximize requests from apps. You'll probably like this. +windowrule = suppressevent maximize, class:.* + +# Fix some dragging issues with XWayland +windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 diff --git a/home/dot_config/nvim/lua/plugins/ale.lua.tmpl b/home/dot_config/nvim/lua/plugins/ale.lua.tmpl index f7c5969..c9c3478 100644 --- a/home/dot_config/nvim/lua/plugins/ale.lua.tmpl +++ b/home/dot_config/nvim/lua/plugins/ale.lua.tmpl @@ -20,6 +20,8 @@ return { javascript = {'{{ if .nvim.js_fixer }}{{ .nvim.js_fixer }}{{ else }}eslint{{ end }}'}, typescript = {'{{ if .nvim.js_fixer }}{{ .nvim.js_fixer }}{{ else }}eslint{{ end }}'}, zig = {'zigfmt'}, + c = {'clang-format'}, + sh = {'shfmt'}, } g.ale_linters_explicit = 1 diff --git a/home/dot_config/nvim/lua/plugins/avante.lua b/home/dot_config/nvim/lua/plugins/avante.lua deleted file mode 100644 index d19cbcc..0000000 --- a/home/dot_config/nvim/lua/plugins/avante.lua +++ /dev/null @@ -1,61 +0,0 @@ --- ai 助手套件 -return { - "yetone/avante.nvim", - version = false, - lazy = true, - event = "VeryLazy", - opts = { - provider = "copilot", - ollama = { - model = "gemma3:4b", - endpoint = "http://127.0.0.1:11434", - timeout = 60000, -- Timeout in milliseconds - options = { - temperature = 0, - num_ctx = 10240, - keep_alive = "5m", - }, - }, - copilot = { - }, - }, - build = "make", - dependencies = { - "nvim-treesitter/nvim-treesitter", - "stevearc/dressing.nvim", - "nvim-lua/plenary.nvim", - "MunifTanjim/nui.nvim", - --- 以下依赖项是可选的， - "echasnovski/mini.pick", -- 用于文件选择器提供者 mini.pick - "nvim-telescope/telescope.nvim", -- 用于文件选择器提供者 telescope - "hrsh7th/nvim-cmp", -- avante 命令和提及的自动完成 - "ibhagwan/fzf-lua", -- 用于文件选择器提供者 fzf - "nvim-tree/nvim-web-devicons", -- 或 echasnovski/mini.icons - "zbirenbaum/copilot.lua", -- 用于 providers='copilot' - { - -- 支持图像粘贴 - "HakonHarnes/img-clip.nvim", - event = "VeryLazy", - opts = { - -- 推荐设置 - default = { - embed_image_as_base64 = false, - prompt_for_file_name = false, - drag_and_drop = { - insert_mode = true, - }, - -- Windows 用户必需 - use_absolute_path = true, - }, - }, - }, - { - -- 如果您有 lazy=true，请确保正确设置 - 'MeanderingProgrammer/render-markdown.nvim', - opts = { - file_types = { "markdown", "Avante" }, - }, - ft = { "markdown", "Avante" }, - }, - }, -} diff --git a/home/dot_tmux.conf b/home/dot_tmux.conf index ff1ed1d..4a956a5 100644 --- a/home/dot_tmux.conf +++ b/home/dot_tmux.conf @@ -158,8 +158,8 @@ set -g @batt_color_status_primary_charging '#3daee9' # what to be displayed on the right status set -g status-interval 1 -set -g status-right ' } Batt: #{battery_icon} #{battery_percentage} | Temp: #( ~/bin/tmux-right.sh ) | %Y-%m-%d %H:%M:%S' -set -g status-right-length 60 +set -g status-right ' } Batt: #{battery_icon} #{battery_percentage} | #( ~/bin/tmux-right.sh ) | %Y-%m-%d %H:%M:%S' +set -g status-right-length 80 # what to be displayed on the left status set -g status-left-length 30