diff --git a/.config/fish/conf.d/abbr.fish b/.config/fish/conf.d/abbr.fish index 929cef9..26afda3 100644 --- a/.config/fish/conf.d/abbr.fish +++ b/.config/fish/conf.d/abbr.fish @@ -4,7 +4,7 @@ status is-login; and abbr H Hyprland abbr m mkdir abbr o open -abbr t trash +abbr t trash put # abbr m mpv abbr mm -- mpv --shuffle \$XDG_MUSIC_DIR diff --git a/.config/helix/config.toml b/.config/helix/config.toml index 2c2fee8..8341f42 100644 --- a/.config/helix/config.toml +++ b/.config/helix/config.toml @@ -1,10 +1,9 @@ theme = "custom" # monokai_soda, kaolin-valley-dark, material_deep_ocean, carbonfox [editor] -# no you don't -mouse = false -middle-click-paste = false -scroll-lines = 0 +# mouse = false +# middle-click-paste = false +# scroll-lines = 0 shell = ["fish", "-c"] line-number = "relative" @@ -34,8 +33,6 @@ max-diagnostics = 5 # 10 mode = { normal = "N", insert = "I", select = "S" } left = [ "mode", - "spinner", - "version-control", "file-name", "read-only-indicator", "file-modification-indicator", @@ -44,9 +41,12 @@ left = [ "file-encoding", ] right = [ - "register", + "spinner", + "spacer", "diagnostics", "workspace-diagnostics", + "version-control", + "register", "selections", "primary-selection-length", "position", @@ -97,6 +97,7 @@ wrap-indicator = "↪" [keys.insert] +A-tab = "insert_tab" C-space = "signature_help" S-tab = "move_parent_node_start" @@ -105,8 +106,17 @@ x = "extend_line" # a = ["append_mode", "collapse_selection"] tab = "extend_parent_node_end" S-tab = "extend_parent_node_start" +A-tab = "insert_tab" ";" = ["collapse_selection", "normal_mode"] +L = "goto_next_buffer" +H = "goto_previous_buffer" + +C-k = "jump_view_up" +C-h = "jump_view_left" +C-j = "jump_view_down" +C-l = "jump_view_right" + V = ["extend_to_line_bounds", "trim_selections"] D = ["ensure_selections_forward", "extend_to_line_end"] @@ -115,23 +125,24 @@ x = "extend_line" "=" = ":format" "A-=" = "format_selections" -V = ["extend_to_line_bounds", "trim_selections"] -D = ["ensure_selections_forward", "extend_to_line_end"] - L = "goto_next_buffer" H = "goto_previous_buffer" -C-space = "signature_help" - -tab = "move_parent_node_end" -S-tab = "move_parent_node_start" - # C-q = "wclose" C-k = "jump_view_up" C-h = "jump_view_left" C-j = "jump_view_down" C-l = "jump_view_right" +V = ["extend_to_line_bounds", "trim_selections"] +D = ["ensure_selections_forward", "extend_to_line_end"] + +C-space = "signature_help" + +tab = "move_parent_node_end" +S-tab = "move_parent_node_start" +A-tab = "insert_tab" + A-j = ["extend_to_line_bounds", "delete_selection", "paste_after"] A-k = [ "extend_to_line_bounds", @@ -139,13 +150,13 @@ A-k = [ "move_line_up", "paste_before", ] -A-J = ["extend_to_line_bounds", "yank", "paste_after"] -A-K = ["extend_to_line_bounds", "yank", "paste_before"] +# A-J = ["extend_to_line_bounds", "yank", "paste_after"] +A-K = ["extend_to_line_bounds", "yank", "paste_after"] [keys.normal.space] '.' = ":config-reload" -e = ":reload" -E = ":reload-all" +i = ":reload" +I = ":reload-all" q = ":buffer-close" Q = ":buffer-close-all" o = ":buffer-close-others" @@ -166,8 +177,8 @@ R = ":set-option rulers [80,100]" g = ":toggle indent-guides.render" i = ":toggle lsp.display-inlay-hints" e = ":toggle end-of-line-diagnostics disable hint" -d = ":toggle inline-diagnostics.other-lines disable error" -D = ":toggle inline-diagnostics.cursor-line disable warning" +d = ":toggle inline-diagnostics.cursor-line disable warning" +D = ":toggle inline-diagnostics.other-lines disable error" z = [ # TODO: not work ":set-option cursorline true", diff --git a/.config/helix/themes/custom.toml b/.config/helix/themes/custom.toml index 80eebfb..232a1f5 100644 --- a/.config/helix/themes/custom.toml +++ b/.config/helix/themes/custom.toml @@ -5,5 +5,13 @@ error = "red" info = "blue" hint = "orange" +"comment.block.documentation" = { fg = "comment", modifiers = [ + "dim", # hard to distinguish otherwise +] } # Block doc comments, e.g '/** */' in rust. +"comment.line.documentation" = { fg = "comment", modifiers = [ + "italic", +] } # Line doc comments, e.g '///' in rust. + + # ui.background = {} # ui.gutter = {} diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 86eae56..dbe4cf8 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -40,15 +40,15 @@ column_meter_modes_0=1 1 column_meters_1=DateTime Uptime LoadAverage Tasks Battery DiskIO NetworkIO Memory Swap column_meter_modes_1=2 2 2 2 2 2 2 1 1 tree_view=0 -sort_key=46 -tree_sort_key=49 +sort_key=39 +tree_sort_key=0 sort_direction=-1 tree_sort_direction=-1 tree_view_always_by_pid=0 all_branches_collapsed=0 screen:Main=PID USER PRIORITY NICE M_VIRT M_SHARE M_RESIDENT STATE NLWP PROCESSOR PERCENT_CPU PERCENT_MEM TIME Command -.sort_key=PERCENT_CPU -.tree_sort_key=TIME +.sort_key=M_RESIDENT +.tree_sort_key=PID .tree_view_always_by_pid=0 .tree_view=0 .sort_direction=-1 diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index d28c433..240bd4f 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -163,7 +163,8 @@ bind =, K, exec, klavaro bind =, K, submap, reset bind = SHIFT, S, exec, gamemoderun steam-native bind = SHIFT, S, submap, reset -bind =, D, exec, discord --enable-features=UseOzonePlatform --ozone-platform=wayland +# bind =, D, exec, discord --enable-features=UseOzonePlatform --ozone-platform=wayland +bind =, D, exec, drawio bind =, D, submap, reset bind = SHIFT, V, exec, QT_SCALE_FACTOR=1.5 virtualbox bind = SHIFT, V, submap, reset diff --git a/.config/hypr/rules.conf b/.config/hypr/rules.conf index 4fc5012..7e64232 100644 --- a/.config/hypr/rules.conf +++ b/.config/hypr/rules.conf @@ -6,47 +6,50 @@ #workspace = 4, monitor:HDMI-A-1 #workspace = 5, monitor:eDP-1 -windowrulev2 = monitor 1, class:Liftoff.* -windowrulev2 = workspace 10, class:Liftoff.* -windowrulev2 = immediate, class:Liftoff.* -windowrulev2 = fullscreen, class:Liftoff.* +windowrule = monitor 1, class:Liftoff.* +windowrule = workspace 10, class:Liftoff.* +windowrule = immediate, class:Liftoff.* +windowrule = fullscreen, class:Liftoff.* -windowrulev2 = monitor 1, initialTitle:Minecraft.* -windowrulev2 = workspace 10, initialTitle:Minecraft.* -windowrulev2 = immediate, initialTitle:Minecraft.* -windowrulev2 = fullscreen, initialTitle:Minecraft.* +windowrule = monitor 1, initialTitle:Minecraft.* +windowrule = workspace 10, initialTitle:Minecraft.* +windowrule = immediate, initialTitle:Minecraft.* +windowrule = fullscreen, initialTitle:Minecraft.* workspace = 10, border:false, rounding:false workspace = w[tv1], gapsout:0, gapsin:0 workspace = f[1], gapsout:0, gapsin:0 -windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1] -windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1] -windowrulev2 = bordersize 0, floating:0, onworkspace:f[1] -windowrulev2 = rounding 0, floating:0, onworkspace:f[1] +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] -# windowrulev2 = float, class:^(LibreWolf)$ +# windowrule = float, class:^(LibreWolf)$ -windowrulev2 = float, class:^(Bitwarden)$ -windowrulev2 = float, class:^(cmst)$ -windowrulev2 = float, class:^(nemo)$ -windowrulev2 = float, class:^(qt5ct)$ -#windowrulev2 = float, class:^(Logseq)$ -#windowrulev2 = float, class:^(obsidian)$ -windowrulev2 = float, class:^(waypaper)$ -windowrulev2 = float, class:^(nwg-look)$ -windowrulev2 = float, class:^(wdisplays)$ -windowrulev2 = float, class:^(VirtualBox)$ -windowrulev2 = float, class:^(pavucontrol)$ -windowrulev2 = float, class:^(connman-gtk)$ -windowrulev2 = float, class:^(boulder_dash)$ -windowrulev2 = float, class:^(blueman-manager)$ -windowrulev2 = float, class:^(org.gnome.Software)$ -windowrulev2 = float, class:^(nm-connection-editor)$ -#windowrulev2 = float, class:^(org.qbittorrent.qBittorrent)$ -windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ -windowrulev2 = float, class:^(org.telegram.desktop|telegramdesktop)$, title:^(Media viewer)$ +# windowrule = noscreenshare, class:^(Bitwarden)$ +# windowrule = noscreenshare, class:^(org.telegram.desktop)$ -windowrulev2 = workspace 4 silent, class:^(discord)$ -windowrulev2 = workspace 4 silent, class:^(org.telegram.desktop)$ +windowrule = float, class:^(Bitwarden)$ +windowrule = float, class:^(cmst)$ +windowrule = float, class:^(nemo)$ +windowrule = float, class:^(qt5ct)$ +#windowrule = float, class:^(Logseq)$ +#windowrule = float, class:^(obsidian)$ +windowrule = float, class:^(waypaper)$ +windowrule = float, class:^(nwg-look)$ +windowrule = float, class:^(wdisplays)$ +windowrule = float, class:^(VirtualBox)$ +windowrule = float, class:^(pavucontrol)$ +windowrule = float, class:^(connman-gtk)$ +windowrule = float, class:^(boulder_dash)$ +windowrule = float, class:^(blueman-manager)$ +windowrule = float, class:^(org.gnome.Software)$ +windowrule = float, class:^(nm-connection-editor)$ +#windowrule = float, class:^(org.qbittorrent.qBittorrent)$ +windowrule = float, class:^(org.kde.polkit-kde-authentication-agent-1)$ +windowrule = float, class:^(org.telegram.desktop|telegramdesktop)$, title:^(Media viewer)$ + +windowrule = workspace 4 silent, class:^(discord)$ +windowrule = workspace 4 silent, class:^(org.telegram.desktop)$ diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 33a2b4b..f1030dc 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -269,7 +269,7 @@ clear_all_shortcuts yes # Miscellaneous {{{ map ctrl+[ send_text all  -map shift+space send_text all \033[32;2u +# map shift+space send_text all \033[32;2u map kitty_mod+v paste_from_clipboard map ctrl+alt+v paste_from_selection