diff options
| author | littleblack111 <littleblack11111@gmail.com> | 2026-01-01 13:02:00 +0800 |
|---|---|---|
| committer | littleblack111 <littleblack11111@gmail.com> | 2026-01-01 13:02:00 +0800 |
| commit | 388abd19a69e1997e4eec721a2fab2f931cac4ef (patch) | |
| tree | d18a56efeb7ae119b4a2606d63f5a91b34e8d247 | |
| parent | f9600b3ac3b1dad83cb5874e757aca36d456861a (diff) | |
bump: dots
23 files changed, 688 insertions, 479 deletions
diff --git a/dot-config/Thunar/accels.scm b/dot-config/Thunar/accels.scm index 6da979fa..5214a9ca 100755 --- a/dot-config/Thunar/accels.scm +++ b/dot-config/Thunar/accels.scm @@ -2,6 +2,7 @@ ; this file is an automated accelerator map dump ; ; (gtk_accel_path "<Actions>/ThunarBookmarks/25078f7c4b1b447498db786655330d9f" "") +; (gtk_accel_path "<Actions>/ThunarDetailsView/expandable-folders" "") ; (gtk_accel_path "<Actions>/ThunarStandardView/sort-by-type" "") ; (gtk_accel_path "<Actions>/ThunarStatusBar/toggle-last-modified" "") ; (gtk_accel_path "<Actions>/Thunarwindow/menu" "") @@ -93,6 +94,7 @@ ; (gtk_accel_path "<Actions>/ThunarWindow/view-as-icons" "<Primary>1") ; (gtk_accel_path "<Actions>/ThunarActionManager/delete-2" "<Shift>Delete") ; (gtk_accel_path "<Actions>/ThunarWindow/zoom-in" "<Primary>plus") +; (gtk_accel_path "<Actions>/ThunarStandardView/configure-columns" "") ; (gtk_accel_path "<Actions>/ThunarStandardView/rename" "F2") ; (gtk_accel_path "<Actions>/ThunarBookmarks/269652eb42aca936b9f6c0740d553c7d" "") ; (gtk_accel_path "<Actions>/ThunarWindow/open-location" "<Primary>l") diff --git a/dot-config/btop/btop.conf b/dot-config/btop/btop.conf index 993f4b5b..c405bd06 100644 --- a/dot-config/btop/btop.conf +++ b/dot-config/btop/btop.conf @@ -1,18 +1,18 @@ -#? Config file for btop v. 1.4.5 +#? Config file for btop v.1.4.6 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes. #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes" color_theme = "Default" #* If the theme set background should be shown, set to False if you want terminal background transparency. -theme_background = False +theme_background = false #* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false. -truecolor = True +truecolor = true #* Set to true to force tty mode regardless if a real tty has been detected or not. #* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols. -force_tty = False +force_tty = false #* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets. #* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box. @@ -22,10 +22,13 @@ presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:defaul #* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists. #* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift. -vim_keys = True +vim_keys = true #* Rounded corners on boxes, is ignored if TTY mode is ON. -rounded_corners = True +rounded_corners = true + +#* Use terminal synchronized output sequences to reduce flickering on supported terminals. +terminal_sync = true #* Default symbols to use for graph creation, "braille", "block" or "tty". #* "braille" offers the highest resolution but might not be included in all fonts. @@ -50,47 +53,50 @@ graph_symbol_net = "default" graph_symbol_proc = "default" #* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace. -shown_boxes = "cpu mem net proc" +shown_boxes = "cpu mem proc net" #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs. update_ms = 1500 #* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct", #* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly. -proc_sorting = "cpu direct" +proc_sorting = "memory" #* Reverse sorting order, True or False. -proc_reversed = False +proc_reversed = false #* Show processes as a tree. -proc_tree = True +proc_tree = true #* Use the cpu graph colors in the process list. -proc_colors = True +proc_colors = true #* Use a darkening gradient in the process list. -proc_gradient = True +proc_gradient = true #* If process cpu usage should be of the core it's running on or usage of the total available cpu power. -proc_per_core = False +proc_per_core = false #* Show process memory as bytes instead of percent. -proc_mem_bytes = True +proc_mem_bytes = true #* Show cpu graph for each process. -proc_cpu_graphs = True +proc_cpu_graphs = true #* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate) -proc_info_smaps = False +proc_info_smaps = false #* Show proc box on left side of screen instead of right. -proc_left = False +proc_left = false #* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop). -proc_filter_kernel = False +proc_filter_kernel = false #* In tree-view, always accumulate child process resources in the parent process. -proc_aggregate = True +proc_aggregate = true + +#* Should cpu and memory usage display be preserved for dead processes when paused. +keep_dead_proc_usage = false #* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available. #* Select from a list of detected attributes from the options menu. @@ -104,28 +110,28 @@ cpu_graph_lower = "Auto" show_gpu_info = "Auto" #* Toggles if the lower CPU graph should be inverted. -cpu_invert_lower = True +cpu_invert_lower = true #* Set to True to completely disable the lower CPU graph. -cpu_single_graph = False +cpu_single_graph = false #* Show cpu box at bottom of screen instead of top. -cpu_bottom = False +cpu_bottom = false #* Shows the system uptime in the CPU box. -show_uptime = True +show_uptime = true #* Shows the CPU package current power consumption in watts. Requires running `make setcap` or `make setuid` or running with sudo. -show_cpu_watts = True +show_cpu_watts = true #* Show cpu temperature. -check_temp = True +check_temp = true #* Which sensor to use for cpu temperature, use options menu to select from list of available sensors. cpu_sensor = "Auto" #* Show temperatures for cpu cores also if check_temp is True and sensors has been found. -show_coretemp = True +show_coretemp = true #* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core. #* Use lm-sensors or similar to see which cores are reporting temperatures on your machine. @@ -137,17 +143,20 @@ cpu_core_map = "" temp_scale = "celsius" #* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024. -base_10_sizes = False +base_10_sizes = false #* Show CPU frequency. -show_cpu_freq = True +show_cpu_freq = true + +#* How to calculate CPU frequency, available values: "first", "range", "lowest", "highest" and "average". +freq_mode = "first" #* Draw a clock at top of screen, formatting according to strftime, empty string to disable. #* Special formatting: /host = hostname | /user = username | /uptime = system uptime clock_format = "%X" #* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort. -background_update = True +background_update = true #* Custom cpu model name, empty string to disable. custom_cpu_name = "" @@ -157,43 +166,43 @@ custom_cpu_name = "" disks_filter = "" #* Show graphs instead of meters for memory values. -mem_graphs = True +mem_graphs = true #* Show mem box below net box instead of above. -mem_below_net = False +mem_below_net = false #* Count ZFS ARC in cached and available memory. -zfs_arc_cached = True +zfs_arc_cached = true #* If swap memory should be shown in memory box. -show_swap = True +show_swap = true #* Show swap as a disk, ignores show_swap value above, inserts itself after first disk. -swap_disk = True +swap_disk = true #* If mem box should be split to also show disks info. -show_disks = True +show_disks = true #* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar. -only_physical = True +only_physical = true #* Read disks list from /etc/fstab. This also disables only_physical. -use_fstab = True +use_fstab = true #* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool) -zfs_hide_datasets = False +zfs_hide_datasets = false #* Set to true to show available disk space for privileged users. -disk_free_priv = False +disk_free_priv = false #* Toggles if io activity % (disk busy time) should be shown in regular disk usage view. -show_io_stat = True +show_io_stat = true #* Toggles io mode for disks, showing big graphs for disk read/write speeds. -io_mode = True +io_mode = true #* Set to True to show combined read/write io graphs in io mode. -io_graph_combined = False +io_graph_combined = false #* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ". #* Example: "/mnt/media:100 /:20 /boot:1". @@ -205,10 +214,10 @@ net_download = 100 net_upload = 100 #* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest. -net_auto = True +net_auto = true #* Sync the auto scaling for download and upload to whichever currently has the highest scale. -net_sync = True +net_sync = true #* Starts with the Network Interface specified here. net_iface = "" @@ -217,26 +226,32 @@ net_iface = "" base_10_bitrate = "Auto" #* Show battery stats in top right if battery is present. -show_battery = True +show_battery = true #* Which battery to use if multiple are present. "Auto" for auto detection. selected_battery = "Auto" #* Show power stats of battery next to charge indicator. -show_battery_watts = True +show_battery_watts = true -#* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG". +#* Set loglevel for "~/.local/state/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG". #* The level set includes all lower levels, i.e. "DEBUG" will show all logging info. log_level = "WARNING" +#* Automatically save current settings to config file on exit. +save_config_on_exit = true + #* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards. -nvml_measure_pcie_speeds = True +nvml_measure_pcie_speeds = true #* Measure PCIe throughput on AMD cards, may impact performance on certain cards. -rsmi_measure_pcie_speeds = True +rsmi_measure_pcie_speeds = true #* Horizontally mirror the GPU graph. -gpu_mirror_graph = True +gpu_mirror_graph = true + +#* Set which GPU vendors to show. Available values are "nvidia amd intel" +shown_gpus = "nvidia amd intel" #* Custom gpu0 model name, empty string to disable. custom_gpu_name0 = "" diff --git a/dot-config/cava/shaders/eye_of_phi.frag b/dot-config/cava/shaders/eye_of_phi.frag new file mode 100644 index 00000000..e499ee78 --- /dev/null +++ b/dot-config/cava/shaders/eye_of_phi.frag @@ -0,0 +1,117 @@ +#version 330 + +// this shader was stolen from shadertoy user ChunderFPV + +#define SCALE 8.0 +#define PI radians(180.0) +#define TAU (PI * 2.0) +#define CS(a) vec2(cos(a), sin(a)) +#define PT(u, r) smoothstep(0.0, r, r - length(u)) + +in vec2 fragCoord; +out vec4 fragColor; + +uniform float bars[512]; + +uniform int bars_count; // number of bars (left + right) (configurable) +uniform float shader_time; // shader execution time s +uniform int bar_width; // bar width (configurable), not used here +uniform int bar_spacing; // space bewteen bars (configurable) + +uniform vec3 u_resolution; // window resolution + +// colors, configurable in cava config file (r,g,b) (0.0 - 1.0) +uniform vec3 bg_color; // background color +uniform vec3 fg_color; // foreground color + +uniform int gradient_count; +uniform vec3 gradient_colors[8]; // gradient colors + +// gradient map ( color, equation, time, width, shadow, reciprocal ) +vec3 gm(vec3 c, float n, float t, float w, float d, bool i) { + float g = min(abs(n), 1.0 / abs(n)); + float s = abs(sin(n * PI - t)); + if (i) + s = min(s, abs(sin(PI / n + t))); + return (1.0 - pow(abs(s), w)) * c * pow(g, d) * 6.0; +} + +// denominator spiral, use 1/n for numerator +// ( screen xy, spiral exponent, decimal, line width, hardness, rotation ) +float ds(vec2 u, float e, float n, float w, float h, float ro) { + float ur = length(u); // unit radius + float sr = pow(ur, e); // spiral radius + float a = round(sr) * n * TAU; // arc + vec2 xy = CS(a + ro) * ur; // xy coords + float l = PT(u - xy, w); // line + float s = mod(sr + 0.5, 1.0); // gradient smooth + s = min(s, 1.0 - s); // darken filter + return l * s * h; +} + +void main() { + float t = shader_time / PI * 2.0; + vec4 m = vec4(0, 0, 0, 0); // iMouse; + m.xy = m.xy * 2.0 / u_resolution.xy - 1.0; // ±1x, ±1y + if (m.z > 0.0) + t += m.y * SCALE; // move time with mouse y + float z = (m.z > 0.0) ? pow(1.0 - abs(m.y), sign(m.y)) : 1.0; // zoom (+) + float e = (m.z > 0.0) ? pow(1.0 - abs(m.x), -sign(m.x)) + : 1.0; // screen exponent (+) + float se = (m.z > 0.0) ? e * -sign(m.y) : 1.0; // spiral exponent + vec3 bg = vec3(0); // black background + + float aa = 3.0; // anti-aliasing + + for (float j = 0.0; j < aa; j++) + for (float k = 0.0; k < aa; k++) { + vec3 c = vec3(0); + vec2 o = vec2(j, k) / aa; + vec2 uv = (fragCoord * u_resolution.xy - 0.5 * u_resolution.xy + o) / + u_resolution.y * SCALE * z; // apply cartesian, scale and zoom + if (m.z > 0.0) + uv = + exp(log(abs(uv)) * e) * sign(uv); // warp screen space with exponent + + float px = length(fwidth(uv)); // pixel width + float x = uv.x; // every pixel on x + float y = uv.y; // every pixel on y + float l = length(uv); // hypot of xy: sqrt(x*x+y*y) + + float mc = (x * x + y * y - 1.0) / y; // metallic circle at xy + float g = min(abs(mc), 1.0 / abs(mc)); // gradient + vec3 gold = vec3(1.0, 0.6, 0.0) * g * l; + vec3 blue = vec3(0.3, 0.5, 0.9) * (1.0 - g); + vec3 rgb = max(gold, blue); + + float w = 0.1; // line width + float d = 0.4; // shadow depth + c = max(c, gm(rgb, mc, -t, w * bars[0], d, false)); // metallic + c = max(c, gm(rgb, abs(y / x) * sign(y), -t, w * bars[1], d, + false)); // tangent + c = max(c, gm(rgb, (x * x) / (y * y) * sign(y), -t, w * bars[2], d, + false)); // sqrt cotangent + c = max(c, gm(rgb, (x * x) + (y * y), t, w * bars[3], d, + true)); // sqrt circles + + c += rgb * ds(uv, se, t / TAU, px * 2.0 * bars[4], 2.0, 0.0); // spiral 1a + c += rgb * ds(uv, se, t / TAU, px * 2.0 * bars[5], 2.0, PI); // spiral 1b + c += + rgb * ds(uv, -se, t / TAU, px * 2.0 * bars[6], 2.0, 0.0); // spiral 2a + c += rgb * ds(uv, -se, t / TAU, px * 2.0 * bars[7], 2.0, PI); // spiral 2b + c = max(c, 0.0); // clear negative color + + c += pow(max(1.0 - l, 0.0), 3.0 / z); // center glow + + if (m.z > 0.0) // display grid on click + { + vec2 xyg = abs(fract(uv + 0.5) - 0.5) / px; // xy grid + c.gb += 0.2 * (1.0 - min(min(xyg.x, xyg.y), 1.0)); + } + bg += c; + } + bg /= aa * aa; + bg *= sqrt(bg) * 1.5; + + fragColor = vec4(bg, 1.0); +}
\ No newline at end of file diff --git a/dot-config/cava/themes/solarized_dark b/dot-config/cava/themes/solarized_dark new file mode 100644 index 00000000..200057ca --- /dev/null +++ b/dot-config/cava/themes/solarized_dark @@ -0,0 +1,15 @@ +[color] +background = '#001e26' +foreground = '#708183' + +gradient = 1 +gradient_color_1 = '#268bd2' +gradient_color_2 = '#6c71c4' +gradient_color_3 = '#cb4b16' + +horizontal_gradient = 1 +horizontal_gradient_color_1 = '#586e75' +horizontal_gradient_color_2 = '#b58900' +horizontal_gradient_color_3 = '#839496' + +blend_direction = 'up'
\ No newline at end of file diff --git a/dot-config/cava/themes/tricolor b/dot-config/cava/themes/tricolor new file mode 100644 index 00000000..b9081370 --- /dev/null +++ b/dot-config/cava/themes/tricolor @@ -0,0 +1,10 @@ +[color] +horizontal_gradient = 1 +horizontal_gradient_color_1 = '#c45161' +horizontal_gradient_color_2 = '#e094a0' +horizontal_gradient_color_3 = '#f2b6c0' +horizontal_gradient_color_4 = '#f2dde1' +horizontal_gradient_color_5 = '#cbc7d8' +horizontal_gradient_color_6 = '#8db7d2' +horizontal_gradient_color_7 = '#5e62a9' +horizontal_gradient_color_8 = '#434279'
\ No newline at end of file diff --git a/dot-config/dconf/user b/dot-config/dconf/user Binary files differindex 70eaa89f..150b64ff 100644 --- a/dot-config/dconf/user +++ b/dot-config/dconf/user diff --git a/dot-config/fcitx5/conf/pinyin.conf b/dot-config/fcitx5/conf/pinyin.conf index 16b33344..0b3701ef 100644 --- a/dot-config/fcitx5/conf/pinyin.conf +++ b/dot-config/fcitx5/conf/pinyin.conf @@ -30,6 +30,8 @@ PreeditCursorPositionAtBeginning=True PinyinInPreedit=False # Enable Prediction Prediction=False +# Keep the current typed text for next input prediction +KeepCurrentContext=True # Number of Predictions PredictionSize=49 # Backspace behavior on prediction diff --git a/dot-config/fish/fish_variables b/dot-config/fish/fish_variables index 9250db64..008e2931 100644 --- a/dot-config/fish/fish_variables +++ b/dot-config/fish/fish_variables @@ -1,42 +1,6 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR Z_DATA_DIR:/home/system/\x2elocal/share/z -SETUVAR __fish_initialized:3800 +SETUVAR __fish_initialized:4300 SETUVAR _fisher_upgraded_to_4_4:\x1d -SETUVAR fish_color_autosuggestion:brblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:normal -SETUVAR fish_color_comment:red -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:green -SETUVAR fish_color_error:brred -SETUVAR fish_color_escape:brcyan -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:brcyan -SETUVAR fish_color_param:cyan -SETUVAR fish_color_quote:yellow -SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold -SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack\x1e\x2d\x2dbold -SETUVAR fish_color_selection:white\x1e\x2d\x2dbackground\x3dbrblack\x1e\x2d\x2dbold -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline SETUVAR fish_greeting:\x1d -SETUVAR fish_key_bindings:fish_vi_key_bindings -SETUVAR fish_pager_color_background:\x1d -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:yellow\x1e\x2di -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan\x1e\x2d\x2dbold -SETUVAR fish_pager_color_secondary_background:\x1d -SETUVAR fish_pager_color_secondary_completion:\x1d -SETUVAR fish_pager_color_secondary_description:\x1d -SETUVAR fish_pager_color_secondary_prefix:\x1d -SETUVAR fish_pager_color_selected_background:\x2dr -SETUVAR fish_pager_color_selected_completion:\x1d -SETUVAR fish_pager_color_selected_description:\x1d -SETUVAR fish_pager_color_selected_prefix:\x1d diff --git a/dot-config/fish/fish_variables06jiTm8EqD b/dot-config/fish/fish_variables06jiTm8EqD new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/dot-config/fish/fish_variables06jiTm8EqD diff --git a/dot-config/fish/fish_variablesBkSuo2WZYy b/dot-config/fish/fish_variablesBkSuo2WZYy new file mode 100644 index 00000000..008e2931 --- /dev/null +++ b/dot-config/fish/fish_variablesBkSuo2WZYy @@ -0,0 +1,6 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR Z_DATA_DIR:/home/system/\x2elocal/share/z +SETUVAR __fish_initialized:4300 +SETUVAR _fisher_upgraded_to_4_4:\x1d +SETUVAR fish_greeting:\x1d diff --git a/dot-config/hypr/autostart.conf b/dot-config/hypr/autostart.conf index 9293e378..78224eca 100644 --- a/dot-config/hypr/autostart.conf +++ b/dot-config/hypr/autostart.conf @@ -58,7 +58,7 @@ exec-once = hyprswitch init --size-factor 5 # audio auto adjust # exec-once = $HOME/scripts/audio-autoAdjust.sh --daemon -exec-once = $HOME/.cargo/bin/audio-adjuster +exec-once = while true; do $HOME/.cargo/bin/audio-adjuster; done # effect for audio exec-once = while true; do easyeffects --gapplication-service; done diff --git a/dot-config/hypr/binds.conf b/dot-config/hypr/binds.conf index e866839d..8cde0f64 100644 --- a/dot-config/hypr/binds.conf +++ b/dot-config/hypr/binds.conf @@ -71,8 +71,8 @@ bind = ,XF86AudioNext, execr, playerctl position 5+ bindo = ,XF86AudioNext, execr, playerctl -p spotify next bind = ,XF86AudioPrev, execr, playerctl position 5- bindo = ,XF86AudioPrev, execr, playerctl -p spotify previous -bindl = ,XF86AudioPlay, exec, [workspace 7 silent; noinitialfocus] playerctl -p spotify play-pause || LD_PRELOAD=/usr/lib64/spotify-adblock.so spotify -bindol = ,XF86AudioPlay, exec, [workspace 7 silent; noinitialfocus] playerctl --all-players pause || LD_PRELOAD=/usr/lib64/spotify-adblock.so spotify +bindl = ,XF86AudioPlay, exec, [workspace 7 silent; noinitialfocus] playerctl -p spotify play-pause || LD_PRELOAD=/usr/lib/spotify-adblock.so spotify +bindol = ,XF86AudioPlay, exec, [workspace 7 silent; noinitialfocus] playerctl --all-players pause || LD_PRELOAD=/usr/lib/spotify-adblock.so spotify bind = ,XF86AudioStop, execr, playerctl -p spotify stop bind = ,XF86PowerOff, execr, $rofiexec/rofi_shutdown @@ -95,7 +95,8 @@ bind = $mod, d, execr, hyprctl dispatch movetoworkspacesilent special:minimized bind = $mod, i, togglespecialworkspace, minimized bind = $mod, i, execr, hyprctl dispatch movetoworkspace +0 binde = $mod, q, killactive -bind = $mod shift, q, execr, kill -9 $(hyprctl activewindow | grep pid | tail -1 | awk '{print$2}') +# bind = $mod shift, q, execr, kill -9 $(hyprctl activewindow | grep pid | tail -1 | awk '{print$2}') +bind = $mod shift, q, forcekillactive bind = ctrl alt, escape, execr, hyprctl kill bind = ctrl $mod shift, r, execr, hyprctl reload # restart bar diff --git a/dot-config/hypr/hyprlandd.conf b/dot-config/hypr/hyprlandd.conf index 3416207a..17e9a1fd 100644 --- a/dot-config/hypr/hyprlandd.conf +++ b/dot-config/hypr/hyprlandd.conf @@ -149,7 +149,7 @@ dwindle { misc { force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers focus_on_activate = true - disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :( + # disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :( # vfr = false # vrr = 1 # 1 = always, 2 = only in full screen mouse_move_enables_dpms = true @@ -379,3 +379,14 @@ debug { } general:float_gaps = -1 + +layerrule = blur, quickshell::launcher.* +layerrule = ignorezero, quickshell::launcher.* +layerrule = dimaround, quickshell::launcher.* +layerrule = animation popin 45%, quickshell::launcher.* + + +source = ~/.config/hypr/env.conf +source = ~/.config/hypr/rules.conf +source = ~/.config/hypr/binds.conf + diff --git a/dot-config/hypr/hyprtoolkit.conf b/dot-config/hypr/hyprtoolkit.conf index 8b137891..3a9167a8 100644 --- a/dot-config/hypr/hyprtoolkit.conf +++ b/dot-config/hypr/hyprtoolkit.conf @@ -1 +1,7 @@ - +background = FF1A1B16 +base = FF444640 +text = FFD0C9B8 +alternate_base = FF7E7766 +bright_text = FFB4A991 +accent = FF726E4F +accent_secondary = FF8B7F5C diff --git a/dot-config/rustfmt/rustfmt.toml b/dot-config/rustfmt/rustfmt.toml index a2bc37cf..f4f57214 100644 --- a/dot-config/rustfmt/rustfmt.toml +++ b/dot-config/rustfmt/rustfmt.toml @@ -2,7 +2,7 @@ max_width = 104400000000 use_small_heuristics = "Max" chain_width = 0 -# fn_call_width = 0 +fn_call_width = 0 attr_fn_like_width = 0 array_width = 0 struct_lit_width = 0 diff --git a/dot-config/spicetify/config-xpui.ini b/dot-config/spicetify/config-xpui.ini index c37d60d5..2733d001 100644 --- a/dot-config/spicetify/config-xpui.ini +++ b/dot-config/spicetify/config-xpui.ini @@ -28,5 +28,5 @@ expose_apis = 1 ; DO NOT CHANGE! [Backup] -version = 1.2.74.477.g3be53afe -with = 2.42.0 +version = 1.2.79.425.g1d0fcf61 +with = 2.42.7 diff --git a/dot-config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/dot-config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml index d4dbc777..8c62e1c1 100644 --- a/dot-config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml +++ b/dot-config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml @@ -7,13 +7,13 @@ <property name="last-window-height" type="int" value="143"/> <property name="last-window-maximized" type="bool" value="true"/> <property name="last-separator-position" type="int" value="172"/> - <property name="last-show-hidden" type="bool" value="true"/> + <property name="last-show-hidden" type="bool" value="false"/> <property name="misc-single-click" type="bool" value="false"/> <property name="last-sort-column" type="string" value="THUNAR_COLUMN_DATE_MODIFIED"/> <property name="last-sort-order" type="string" value="GTK_SORT_DESCENDING"/> <property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_38_PERCENT"/> <property name="last-details-view-visible-columns" type="string" value="THUNAR_COLUMN_DATE_MODIFIED,THUNAR_COLUMN_NAME,THUNAR_COLUMN_SIZE,THUNAR_COLUMN_TYPE"/> - <property name="last-details-view-column-widths" type="string" value="50,50,138,127,50,94,50,50,514,50,50,90,50,552"/> + <property name="last-details-view-column-widths" type="string" value="50,50,138,127,50,1877,50,50,514,50,50,89,50,286"/> <property name="misc-status-bar-active-info" type="uint" value="31"/> <property name="misc-text-beside-icons" type="bool" value="false"/> <property name="misc-folders-first" type="bool" value="false"/> diff --git a/dot-config/zed/keymap.json b/dot-config/zed/keymap.json index ce52766a..d84fcae1 100644 --- a/dot-config/zed/keymap.json +++ b/dot-config/zed/keymap.json @@ -10,915 +10,915 @@ "context": "Workspace", "bindings": { // "shift shift": "file_finder::Toggle" - } + }, }, { "context": "Editor && vim_mode == insert", "bindings": { // "j k": "vim::NormalBefore" - } + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space w": "workspace::Save" - } + "space w": "workspace::Save", + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space c": "pane::CloseActiveItem" - } + "space c": "pane::CloseActiveItem", + }, }, { "context": "Pane", "bindings": { - "ctrl-1": ["pane::ActivateItem", 0] - } + "ctrl-1": ["pane::ActivateItem", 0], + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space 1": ["pane::ActivateItem", 0] - } + "space 1": ["pane::ActivateItem", 0], + }, }, { "context": "Pane", "bindings": { - "ctrl-2": ["pane::ActivateItem", 1] - } + "ctrl-2": ["pane::ActivateItem", 1], + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space 2": ["pane::ActivateItem", 1] - } + "space 2": ["pane::ActivateItem", 1], + }, }, { "context": "Pane", "bindings": { - "ctrl-3": ["pane::ActivateItem", 2] - } + "ctrl-3": ["pane::ActivateItem", 2], + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space 3": ["pane::ActivateItem", 2] - } + "space 3": ["pane::ActivateItem", 2], + }, }, { "context": "Pane", "bindings": { - "ctrl-4": ["pane::ActivateItem", 3] - } + "ctrl-4": ["pane::ActivateItem", 3], + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space 4": ["pane::ActivateItem", 3] - } + "space 4": ["pane::ActivateItem", 3], + }, }, { "context": "Pane", "bindings": { - "ctrl-5": ["pane::ActivateItem", 4] - } + "ctrl-5": ["pane::ActivateItem", 4], + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space 5": ["pane::ActivateItem", 4] - } + "space 5": ["pane::ActivateItem", 4], + }, }, { "context": "Pane", "bindings": { - "ctrl-6": ["pane::ActivateItem", 5] - } + "ctrl-6": ["pane::ActivateItem", 5], + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space 6": ["pane::ActivateItem", 5] - } + "space 6": ["pane::ActivateItem", 5], + }, }, { "context": "Pane", "bindings": { - "ctrl-7": ["pane::ActivateItem", 6] - } + "ctrl-7": ["pane::ActivateItem", 6], + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space 7": ["pane::ActivateItem", 6] - } + "space 7": ["pane::ActivateItem", 6], + }, }, { "context": "Pane", "bindings": { - "ctrl-8": ["pane::ActivateItem", 7] - } + "ctrl-8": ["pane::ActivateItem", 7], + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space 8": ["pane::ActivateItem", 7] - } + "space 8": ["pane::ActivateItem", 7], + }, }, { "context": "Pane", "bindings": { - "ctrl-9": ["pane::ActivateItem", 8] - } + "ctrl-9": ["pane::ActivateItem", 8], + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space 9": ["pane::ActivateItem", 8] - } + "space 9": ["pane::ActivateItem", 8], + }, }, { "context": "(VimControl && !menu)", "bindings": { - "ctrl-w d": null - } + "ctrl-w d": null, + }, }, { "context": "(VimControl && !menu)", "bindings": { - "ctrl-w ]": null - } + "ctrl-w ]": null, + }, }, { "context": "(VimControl && !menu)", "bindings": { - "ctrl-w g d": null - } + "ctrl-w g d": null, + }, }, { "context": "(VimControl && !menu)", "bindings": { - "ctrl-w ctrl-]": null - } + "ctrl-w ctrl-]": null, + }, }, { "context": "(VimControl && !menu)", "bindings": { - "ctrl-w g shift-d": null - } + "ctrl-w g shift-d": null, + }, }, { "context": "(VimControl && !menu)", "bindings": { - "ctrl-w g space": null - } + "ctrl-w g space": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-g shift-t": null - } + "ctrl-w ctrl-g shift-t": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-c": null - } + "ctrl-w ctrl-c": null, + }, }, { "context": "(VimControl && !menu)", "bindings": { - "ctrl-w shift-d": null - } + "ctrl-w shift-d": null, + }, }, { "context": "(VimControl && !menu)", "bindings": { - "ctrl-w space": null - } + "ctrl-w space": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w g t": null - } + "ctrl-w g t": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-g t": null - } + "ctrl-w ctrl-g t": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w g shift-t": null - } + "ctrl-w g shift-t": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w shift-up": null - } + "ctrl-w shift-up": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w shift-down": null - } + "ctrl-w shift-down": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w shift-k": null - } + "ctrl-w shift-k": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w shift-l": null - } + "ctrl-w shift-l": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-k": null - } + "ctrl-w ctrl-k": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w up": null - } + "ctrl-w up": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w l": null - } + "ctrl-w l": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-l": null - } + "ctrl-w ctrl-l": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w right": null - } + "ctrl-w right": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w h": null - } + "ctrl-w h": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-h": null - } + "ctrl-w ctrl-h": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-j": null - } + "ctrl-w ctrl-j": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-w": null - } + "ctrl-w ctrl-w": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w left": null - } + "ctrl-w left": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w k": null - } + "ctrl-w k": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w p": null - } + "ctrl-w p": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w shift-w": null - } + "ctrl-w shift-w": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-o": null - } + "ctrl-w ctrl-o": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w o": null - } + "ctrl-w o": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w shift-right": null - } + "ctrl-w shift-right": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w shift-left": null - } + "ctrl-w shift-left": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-n": null - } + "ctrl-w ctrl-n": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w n": null - } + "ctrl-w n": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w shift-j": null - } + "ctrl-w shift-j": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w shift-h": null - } + "ctrl-w shift-h": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-p": null - } + "ctrl-w ctrl-p": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-shift-w": null - } + "ctrl-w ctrl-shift-w": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w j": null - } + "ctrl-w j": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w down": null - } + "ctrl-w down": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w w": null - } + "ctrl-w w": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w +": null - } + "ctrl-w +": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w >": null - } + "ctrl-w >": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w <": null - } + "ctrl-w <": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w =": null - } + "ctrl-w =": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w _": null - } + "ctrl-w _": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w -": null - } + "ctrl-w -": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w v": null - } + "ctrl-w v": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-v": null - } + "ctrl-w ctrl-v": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w s": null - } + "ctrl-w s": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w shift-s": null - } + "ctrl-w shift-s": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-s": null - } + "ctrl-w ctrl-s": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w a": null - } + "ctrl-w a": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-a": null - } + "ctrl-w ctrl-a": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w q": null - } + "ctrl-w q": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w ctrl-q": null - } + "ctrl-w ctrl-q": null, + }, }, { "context": "((VimControl && !menu) || (!Editor && !Terminal))", "bindings": { - "ctrl-w c": null - } + "ctrl-w c": null, + }, }, { "context": "KeystrokeInput", "bindings": { - "escape escape escape": null - } + "escape escape escape": null, + }, }, { "context": "Workspace", "bindings": { - "ctrl-1": ["workspace::ActivatePane", 0] - } + "ctrl-1": ["workspace::ActivatePane", 0], + }, }, { "context": "(VimControl && !menu)", "bindings": { - "ctrl-j": "vim::Down" - } + "ctrl-j": "vim::Down", + }, }, { "context": "(Editor && (showing_code_actions || showing_completions))", "bindings": { - "ctrl-j": "editor::ContextMenuNext" - } + "ctrl-j": "editor::ContextMenuNext", + }, }, { "bindings": { - "ctrl-j": "menu::SelectNext" - } + "ctrl-j": "menu::SelectNext", + }, }, { "context": "(Picker || menu)", "bindings": { - "ctrl-j": "menu::SelectNext" - } + "ctrl-j": "menu::SelectNext", + }, }, { "context": "(GitPanel && ChangesList)", "bindings": { - "ctrl-j": "menu::SelectNext" - } + "ctrl-j": "menu::SelectNext", + }, }, { "context": "Picker > Editor", "bindings": { - "ctrl-j": "menu::SelectNext" - } + "ctrl-j": "menu::SelectNext", + }, }, { "context": "KeybindEditorModal > Editor", "bindings": { - "ctrl-j": "menu::SelectNext" - } + "ctrl-j": "menu::SelectNext", + }, }, { "context": "(Editor && (showing_code_actions || showing_completions))", "bindings": { - "ctrl-k": "editor::ContextMenuPrevious" - } + "ctrl-k": "editor::ContextMenuPrevious", + }, }, { "bindings": { - "ctrl-k": "menu::SelectPrevious" - } + "ctrl-k": "menu::SelectPrevious", + }, }, { "context": "(Picker || menu)", "bindings": { - "ctrl-k": "menu::SelectPrevious" - } + "ctrl-k": "menu::SelectPrevious", + }, }, { "context": "(GitPanel && ChangesList)", "bindings": { - "ctrl-k": "menu::SelectPrevious" - } + "ctrl-k": "menu::SelectPrevious", + }, }, { "context": "Picker > Editor", "bindings": { - "ctrl-k": "menu::SelectPrevious" - } + "ctrl-k": "menu::SelectPrevious", + }, }, { "context": "KeybindEditorModal > Editor", "bindings": { - "ctrl-k": "menu::SelectPrevious" - } + "ctrl-k": "menu::SelectPrevious", + }, }, { "context": "ContextStrip", "bindings": { - "ctrl-j": "agent::FocusDown" - } + "ctrl-j": "agent::FocusDown", + }, }, { "context": "ContextStrip", "bindings": { - "ctrl-k": "agent::FocusUp" - } + "ctrl-k": "agent::FocusUp", + }, }, { "context": "(Editor && showing_completions)", "bindings": { - "ctrl-y": "editor::ConfirmCompletion" - } + "ctrl-y": "editor::ConfirmCompletion", + }, }, { "context": "(Editor && showing_completions)", "bindings": { - "enter": "editor::Newline" - } + "enter": "editor::Newline", + }, }, { "context": "(Editor && edit_prediction)", "bindings": { - "tab": "editor::Tab" - } + "tab": "editor::Tab", + }, }, { "context": "(((Editor && in_snippet) && has_next_tabstop) && !showing_completions)", "bindings": { - "ctrl-f": "editor::NextSnippetTabstop" - } + "ctrl-f": "editor::NextSnippetTabstop", + }, }, { "context": "Picker > Editor", "bindings": { - "ctrl-y": "picker::ConfirmCompletion" - } + "ctrl-y": "picker::ConfirmCompletion", + }, }, { "context": "Picker > Editor", "bindings": { - "tab": null - } + "tab": null, + }, }, { "context": "(((Editor && in_snippet) && has_next_tabstop) && !showing_completions)", "bindings": { - "tab": null - } + "tab": null, + }, }, { "context": "(Editor && showing_completions)", "bindings": { - "tab": "editor::Tab" - } + "ctrl-f": "editor::Tab", + }, }, { "context": "(Picker || menu)", "bindings": { - "down": null - } + "down": null, + }, }, { "context": "(GitPanel && ChangesList)", "bindings": { - "down": null - } + "down": null, + }, }, { "context": "Picker > Editor", "bindings": { - "down": null - } + "down": null, + }, }, { "context": "KeybindEditorModal > Editor", "bindings": { - "down": null - } + "down": null, + }, }, { "context": "((Editor && showing_signature_help) && !showing_completions)", "bindings": { - "down": null - } + "down": null, + }, }, { "context": "(((vim_mode == insert || vim_mode == normal) && showing_signature_help) && !showing_completions)", "bindings": { - "ctrl-l": "editor::SignatureHelpNext" - } + "ctrl-l": "editor::SignatureHelpNext", + }, }, { "context": "(Editor && (showing_code_actions || showing_completions))", "bindings": { - "down": "editor::MoveDown" - } + "down": "editor::MoveDown", + }, }, { "context": "(ProjectPanel && not_editing)", "bindings": { - "ctrl-j": "vim::MenuSelectNext" - } + "ctrl-j": "vim::MenuSelectNext", + }, }, { "context": "(ProjectPanel && not_editing)", "bindings": { - "down": null - } + "down": null, + }, }, { "context": "(Picker || menu)", "bindings": { - "up": null - } + "up": null, + }, }, { "context": "(GitPanel && ChangesList)", "bindings": { - "up": null - } + "up": null, + }, }, { "context": "Picker > Editor", "bindings": { - "up": null - } + "up": null, + }, }, { "context": "KeybindEditorModal > Editor", "bindings": { - "up": null - } + "up": null, + }, }, { "context": "(ProjectPanel && not_editing)", "bindings": { - "up": null - } + "up": null, + }, }, { "context": "(ProjectPanel && not_editing)", "bindings": { - "ctrl-k": "vim::MenuSelectPrevious" - } + "ctrl-k": "vim::MenuSelectPrevious", + }, }, { "context": "(((vim_mode == insert || vim_mode == normal) && showing_signature_help) && !showing_completions)", "bindings": { - "ctrl-h": "editor::SignatureHelpPrevious" - } + "ctrl-h": "editor::SignatureHelpPrevious", + }, }, { "context": "((Editor && showing_signature_help) && !showing_completions)", "bindings": { - "up": null - } + "up": null, + }, }, { "context": "(Editor && (showing_code_actions || showing_completions))", "bindings": { - "up": "editor::MoveUp" - } + "up": "editor::MoveUp", + }, }, { "context": "(((vim_mode == insert || vim_mode == normal) && showing_signature_help) && !showing_completions)", "bindings": { - "ctrl-n": null - } + "ctrl-n": null, + }, }, { "context": "Editor", "bindings": { - "ctrl-i": null - } + "ctrl-i": null, + }, }, { "context": "vim_mode == insert", "bindings": { - "ctrl-i": "editor::ShowSignatureHelp" - } + "ctrl-i": "editor::ShowSignatureHelp", + }, }, { "context": "(((vim_mode == insert || vim_mode == normal) && showing_signature_help) && !showing_completions)", "bindings": { - "ctrl-p": null - } + "ctrl-p": null, + }, }, { "context": "Picker > Editor", "bindings": { - "ctrl-p": null - } + "ctrl-p": null, + }, }, { "bindings": { - "ctrl-n": null - } + "ctrl-n": null, + }, }, { "bindings": { - "ctrl-p": null - } + "ctrl-p": null, + }, }, { "context": "Editor", "bindings": { - "ctrl-l": null - } + "ctrl-l": null, + }, }, { "context": "vim_mode == insert", "bindings": { - "ctrl-s": null - } + "ctrl-s": null, + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space ,": "editor::ToggleCodeActions" - } + "space ,": "editor::ToggleCodeActions", + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space a": null - } + "space a": null, + }, }, { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "space g b": "editor::ToggleGitBlameInline" - } + "space g b": "editor::ToggleGitBlameInline", + }, }, { "context": "!ContextEditor > (Editor && (vim_mode == helix_normal || vim_mode == helix_select))", "bindings": { - "shift-i": "assistant::InlineAssist" - } + "shift-i": "assistant::InlineAssist", + }, }, { - "context": "Terminal", + "context": "(Terminal && (vim_mode == helix_normal || vim_mode == helix_select))", "bindings": { - "shift-i": "assistant::InlineAssist" - } + "shift-i": "assistant::InlineAssist", + }, }, { "context": "Terminal", "bindings": { - "ctrl-enter": null - } + "ctrl-enter": null, + }, }, { "context": "!ContextEditor > (Editor && mode == full)", "bindings": { - "ctrl-enter": null - } + "ctrl-enter": null, + }, }, { "context": "!menu", "bindings": { - "ctrl-shift-l": "workspace::ActivatePaneRight" - } + "ctrl-shift-l": "workspace::ActivatePaneRight", + }, }, { "context": "!menu", "bindings": { - "ctrl-shift-h": "workspace::ActivatePaneLeft" - } + "ctrl-shift-h": "workspace::ActivatePaneLeft", + }, }, { "context": "!menu", "bindings": { - "ctrl-shift-k": "workspace::ActivatePaneUp" - } + "ctrl-shift-k": "workspace::ActivatePaneUp", + }, }, { "context": "!menu", "bindings": { - "ctrl-shift-j": "workspace::ActivatePaneDown" - } + "ctrl-shift-j": "workspace::ActivatePaneDown", + }, }, { "context": "(VimControl && !menu)", "bindings": { - "ctrl-i": "pane::GoForward" - } + "ctrl-i": "pane::GoForward", + }, }, { "context": "Picker > Editor", "bindings": { - "ctrl-n": null - } + "ctrl-n": null, + }, }, { "context": "Workspace", "bindings": { - "ctrl-alt-shift-j": "workspace::ToggleBottomDock" - } + "ctrl-alt-shift-j": "workspace::ToggleBottomDock", + }, }, { "context": "Workspace", "bindings": { - "ctrl-j": null - } + "ctrl-j": null, + }, }, { "context": "Workspace", "bindings": { - "ctrl-alt-shift-h": "workspace::ToggleLeftDock" - } + "ctrl-alt-shift-h": "workspace::ToggleLeftDock", + }, }, { "context": "Workspace", "bindings": { - "ctrl-alt-shift-l": "workspace::ToggleRightDock" - } + "ctrl-alt-shift-l": "workspace::ToggleRightDock", + }, }, { "context": "Workspace", "bindings": { - "ctrl-b": null - } + "ctrl-b": null, + }, }, { "context": "Workspace", "bindings": { - "ctrl-alt-b": null - } + "ctrl-alt-b": null, + }, }, { "context": "(VimControl && !menu)", "bindings": { - "space g d": "editor::OpenExcerpts" - } + "space g d": "editor::OpenExcerpts", + }, }, // { // "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", @@ -929,13 +929,43 @@ { "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", "bindings": { - "p": "editor::Paste" - } + "p": "editor::Paste", + }, }, { "context": "(Editor && mode == full)", "bindings": { - "ctrl-h": null - } - } + "ctrl-h": null, + }, + }, + { + "context": "((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", + "bindings": { + "space f": null, + }, + }, + { + "context": "EmptyPane || ((vim_mode == helix_normal || vim_mode == helix_select) && !menu)", + "bindings": { + "space f": "file_finder::Toggle", + }, + }, + { + "context": "!(Editor && in_snippet) && BufferSearchBar", + "bindings": { + "ctrl-f": "search::FocusSearch", + }, + }, + { + "context": "!(Editor && in_snippet) && KeymapEditor", + "bindings": { + "ctrl-f": "search::FocusSearch", + }, + }, + { + "context": "!(Editor && in_snippet) && SettingsWindow", + "bindings": { + "ctrl-f": "search::FocusSearch", + }, + }, ] diff --git a/dot-config/zed/settings.json b/dot-config/zed/settings.json index 24c6a711..5f9e12ee 100644 --- a/dot-config/zed/settings.json +++ b/dot-config/zed/settings.json @@ -7,73 +7,79 @@ // custom settings, run `zed: open default settings` from the // command palette (cmd-shift-p / ctrl-shift-p) { + "session": { + "trust_all_worktrees": true, + }, + "colorize_brackets": true, "collaboration_panel": { - "dock": "left" + "dock": "left", }, "diagnostics": { "inline": { - "enabled": true - } + "enabled": true, + "max_severity": "all", + }, }, "context_servers": { "mcp-server-context7": { - "source": "extension", - "enabled": true, + "enabled": true, "settings": { - "context7_api_key": "ctx7sk-8e011f3f-f864-4383-98ac-f1a2ec2b2d7f" - } - } + "context7_api_key": "ctx7sk-8e011f3f-f864-4383-98ac-f1a2ec2b2d7f", + }, + }, }, "when_closing_with_no_tabs": "platform_default", "use_system_path_prompts": true, "expand_excerpt_lines": 4, "vim_mode": true, "vim": { - "use_system_clipboard": "on_yank" + "use_system_clipboard": "on_yank", }, "features": { - "edit_prediction_provider": "copilot" + "edit_prediction_provider": "copilot", }, "edit_predictions": { "disabled_globs": [], - "mode": "subtle" + "mode": "subtle", }, "git": { "inline_blame": { "show_commit_summary": true, - "enabled": false - } + "enabled": false, + }, }, "inlay_hints": { "show_background": false, - "enabled": true + "enabled": true, }, "use_system_prompts": true, "calls": { - "mute_on_join": true + "mute_on_join": true, }, "project_panel": { + "sort_mode": "mixed", + "sticky_scroll": true, "hide_root": false, - "git_status": true, + "git_status": true, "button": true, - "indent_size": 20.0 + "indent_size": 20.0, }, "active_pane_modifiers": { "border_size": 0.0, - "inactive_opacity": 0.5 + "inactive_opacity": 0.5, }, "use_system_window_tabs": false, "bottom_dock_layout": "contained", "preview_tabs": { - "enable_preview_from_file_finder": false + "enable_preview_from_file_finder": false, }, "tabs": { "show_diagnostics": "all", "file_icons": true, - "git_status": false + "git_status": false, }, "tab_bar": { - "show": true + "show": true, }, "title_bar": { "show_sign_in": true, @@ -82,19 +88,23 @@ "show_menus": false, "show_user_picture": false, "show_onboarding_banner": false, - "show_branch_icon": true + "show_branch_icon": true, }, "cursor_shape": "bar", "relative_line_numbers": "wrapped", "agent": { + "inline_assistant_model": { + "provider": "copilot_chat", + "model": "claude-opus-4.5", + }, "default_profile": "write", "always_allow_tool_actions": true, "default_model": { "provider": "copilot_chat", - "model": "claude-opus-4.5" + "model": "claude-opus-4.5", }, "play_sound_when_agent_done": true, - "model_parameters": [] + "model_parameters": [], }, "icon_theme": "Colored Zed Icons Theme Dark", "ui_font_family": "Inter Variable", @@ -102,17 +112,17 @@ "helix_mode": true, "telemetry": { "diagnostics": false, - "metrics": false + "metrics": false, }, "node": { - "npm_path": "bun" + "npm_path": "bun", }, "base_keymap": "VSCode", "status_bar": { - "experimental.show": true + "experimental.show": true, }, "minimap": { - "show": "never" + "show": "never", }, "cursor_blink": true, "buffer_font_fallbacks": ["Menlo", "Monaco", "Courier New", "monospace"], @@ -121,5 +131,5 @@ "tab_size": 4, "ui_font_size": 18.0, "buffer_font_size": 15.0, - "theme": "wal" + "theme": "wal", } diff --git a/dot-config/zed/settings_backup.json b/dot-config/zed/settings_backup.json index f7e0e329..21848870 100644 --- a/dot-config/zed/settings_backup.json +++ b/dot-config/zed/settings_backup.json @@ -7,59 +7,79 @@ // custom settings, run `zed: open default settings` from the // command palette (cmd-shift-p / ctrl-shift-p) { + "session": { + "trust_all_worktrees": true, + }, + "colorize_brackets": true, + "collaboration_panel": { + "dock": "left", + }, + "diagnostics": { + "inline": { + "enabled": true, + "max_severity": "all", + }, + }, "context_servers": { - "mcp-server-context7": { - "enabled": true, - "settings": { - "context7_api_key": "ctx7sk-8e011f3f-f864-4383-98ac-f1a2ec2b2d7f" - } - } - }, - "when_closing_with_no_tabs": "platform_default", - "use_system_path_prompts": false, - "expand_excerpt_lines": 4, - "vim_mode": true, - "features": { - "edit_prediction_provider": "copilot" + "mcp-server-context7": { + "enabled": true, + "settings": { + "context7_api_key": "ctx7sk-8e011f3f-f864-4383-98ac-f1a2ec2b2d7f", + }, + }, + }, + "when_closing_with_no_tabs": "platform_default", + "use_system_path_prompts": true, + "expand_excerpt_lines": 4, + "vim_mode": true, + "vim": { + "use_system_clipboard": "on_yank", + }, + "features": { + "edit_prediction_provider": "copilot", }, "edit_predictions": { - "mode": "subtle" + "disabled_globs": [], + "mode": "subtle", }, "git": { "inline_blame": { "show_commit_summary": true, - "enabled": false - } + "enabled": false, + }, }, "inlay_hints": { "show_background": false, - "enabled": true + "enabled": true, }, "use_system_prompts": true, "calls": { - "mute_on_join": true + "mute_on_join": true, }, "project_panel": { + "sort_mode": "mixed", + "sticky_scroll": true, + "hide_root": false, "git_status": true, "button": true, - "indent_size": 20.0 + "indent_size": 20.0, }, "active_pane_modifiers": { "border_size": 0.0, - "inactive_opacity": 0.5 + "inactive_opacity": 0.5, }, "use_system_window_tabs": false, "bottom_dock_layout": "contained", "preview_tabs": { - "enable_preview_from_file_finder": false + "enable_preview_from_file_finder": false, }, "tabs": { "show_diagnostics": "all", "file_icons": true, - "git_status": true + "git_status": false, }, "tab_bar": { - "show": true + "show": true, }, "title_bar": { "show_sign_in": true, @@ -68,18 +88,23 @@ "show_menus": false, "show_user_picture": false, "show_onboarding_banner": false, - "show_branch_icon": true + "show_branch_icon": true, }, "cursor_shape": "bar", "relative_line_numbers": "wrapped", "agent": { + "inline_assistant_model": { + "provider": "copilot_chat", + "model": "oswe-vscode-prime", + }, + "default_profile": "write", "always_allow_tool_actions": true, - "default_model": { + "default_model": { "provider": "copilot_chat", - "model": "gpt-5.1-codex" + "model": "oswe-vscode-prime", }, "play_sound_when_agent_done": true, - "model_parameters": [] + "model_parameters": [], }, "icon_theme": "Colored Zed Icons Theme Dark", "ui_font_family": "Inter Variable", @@ -87,29 +112,24 @@ "helix_mode": true, "telemetry": { "diagnostics": false, - "metrics": false + "metrics": false, }, "node": { - "npm_path": "bun" + "npm_path": "bun", }, "base_keymap": "VSCode", "status_bar": { - "experimental.show": true + "experimental.show": true, }, "minimap": { - "show": "never" + "show": "never", }, "cursor_blink": true, - "buffer_font_fallbacks": [ - "Menlo", - "Monaco", - "Courier New", - "monospace" - ], + "buffer_font_fallbacks": ["Menlo", "Monaco", "Courier New", "monospace"], "buffer_font_family": "JetBrainsMono Nerd Font", "hard_tabs": true, "tab_size": 4, "ui_font_size": 18.0, "buffer_font_size": 15.0, - "theme": "wal" -}
\ No newline at end of file + "theme": "wal", +} diff --git a/dot-zen/main/chrome/Zen-Nebula b/dot-zen/main/chrome/Zen-Nebula -Subproject 35d2ffa96126410dbe58e9d6ab05b4198c505eb +Subproject 07ad877d24b0e165c424b9010f02a18e5c4df22 diff --git a/dot-zen/main/chrome/zen-themes.css b/dot-zen/main/chrome/zen-themes.css index 4b99af43..5205fb5a 100644 --- a/dot-zen/main/chrome/zen-themes.css +++ b/dot-zen/main/chrome/zen-themes.css @@ -1,5 +1,5 @@ /* Zen Mods - Generated by ZenMods. -* FILE GENERATED AT: Saturday, November 22, 2025 at 12:15:53 PM Hong Kong Standard Time +* FILE GENERATED AT: Wednesday, December 31, 2025 at 8:40:31 PM Hong Kong Standard Time * DO NOT EDIT THIS FILE DIRECTLY! * Your changes will be overwritten. * Instead, go to the preferences and edit the mods there. diff --git a/pkgbuilds/hyprland-git/PKGBUILD b/pkgbuilds/hyprland-git/PKGBUILD index 4f4b1bf7..9abb7838 100644 --- a/pkgbuilds/hyprland-git/PKGBUILD +++ b/pkgbuilds/hyprland-git/PKGBUILD @@ -5,7 +5,7 @@ _pkgname="hyprland" pkgname="$_pkgname-git" -pkgver=0.51.0.r78.g2a88726 +pkgver=0.51.0.r91.g07bae27 pkgrel=1 pkgdesc="Hyprland is an independent, highly customizable, dynamic tiling Wayland compositor that doesn't sacrifice on its looks" arch=('x86_64' 'aarch64') @@ -97,7 +97,7 @@ prepare() { git remote add fork https://github.com/3l0w/Hyprland.git git pull fork feat/input-capture-impl git submodule init - git revert 5a2086 --no-edit --no-gpg-sign + # git revert 5a2086 --no-edit --no-gpg-sign git config submodule.subprojects/udis86.url "${srcdir}/udis86" git config submodule.subprojects/tracy.update none git -c protocol.file.allow=always submodule update |
