diff --git a/.config/fish/conf.d/env.fish b/.config/fish/conf.d/env.fish index 8ea9b37..d7018da 100644 --- a/.config/fish/conf.d/env.fish +++ b/.config/fish/conf.d/env.fish @@ -15,6 +15,7 @@ set -gx XDG_DOWNLOAD_DIR /tmp set -gx GOPATH $XDG_DATA_HOME/go # GOOUT my home set -gx CARGO_HOME $XDG_DATA_HOME/cargo +# set -gx CARGO_TARGET_DIR ~/.exclude/cargo # bad idea set -gx CLIPPY_CONF_DIR $XDG_DATA_HOME/cargo/ # Can't use '~' in universal variables diff --git a/.config/git/config b/.config/git/config index e98226a..4239119 100644 --- a/.config/git/config +++ b/.config/git/config @@ -3,7 +3,7 @@ [fetch] prune = true [core] - editor = helix + editor = hx pager = delta [diff] tool = nvimdiff @@ -50,7 +50,8 @@ # gpgsign = true [includeIf "gitdir:~/src/"] path = ~/src/.gitconfig - +[includeIf "gitdir:~/uni/"] + path = ~/uni/.gitconfig # [filter "lfs"] # required = true diff --git a/.config/helix/config.toml b/.config/helix/config.toml index ff0e476..edecf2e 100644 --- a/.config/helix/config.toml +++ b/.config/helix/config.toml @@ -15,6 +15,7 @@ auto-format = true auto-info = true # TODO: idle-timeout? # true-color = true # undercurl = true +# terminal-background-color = true rulers = [80, 100] bufferline = "multiple" # never, always, multiple color-modes = false # mode indicator color diff --git a/.config/helix/languages.toml b/.config/helix/languages.toml index 993d6bd..d5bd6f6 100644 --- a/.config/helix/languages.toml +++ b/.config/helix/languages.toml @@ -192,9 +192,10 @@ extraArgs = [ "-Aclippy::cargo", # lints for the cargo manifest "-Aclippy::restriction", # lints which prevent the use of language and library features # Specific - "-Aclippy::must_use_candidate", # must_use is rather annoing + "-Aclippy::must_use_candidate", # must_use is rather annoing "-Aclippy::cognitive_complexity", "-Aclippy::too_many_lines", "-Aclippy::missing_errors_doc", + "-Aclippy::struct_excessive_bools", # "-Aclippy::from_iter_instead_of_collect", # formats better ] diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index 315d715..d5eef83 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -157,7 +157,7 @@ bind =, S, exec, killall signal-desktop || signal-desktop bind =, S, submap, reset bind =, M, exec, mpv --force-window --idle bind =, M, submap, reset -bind =, E, exec, kitty helix +bind =, E, exec, kitty hx bind =, E, submap, reset bind =, N, exec, nemo bind =, N, submap, reset @@ -188,7 +188,7 @@ bind = SHIFT, B, exec, flatpak run com.usebottles.bottles bind = SHIFT, B, submap, reset bind =, Q, exec, qbittorrent bind =, Q, submap, reset -bind =, A, exec, anki +bind =, A, exec, anytype bind =, A, submap, reset # utilities bind =, P, exec, pavucontrol diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index ddbbe94..9292654 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -69,28 +69,32 @@ focus_follows_mouse no # Mouse actions {{{ clear_all_mouse_actions yes +# Click the link under the mouse or move the cursor mouse_map left click ungrabbed mouse_handle_click selection link prompt +# Click the link under the mouse or move the cursor even when grabbed mouse_map shift+left click grabbed,ungrabbed mouse_handle_click selection link prompt +# Click the link under the mouse cursor. Present because simple click based version has delay of click_interval mouse_map ctrl+shift+left release grabbed,ungrabbed mouse_handle_click link +# Discard press event for link click mouse_map ctrl+shift+left press grabbed discard_event -mouse_map middle release ungrabbed paste_from_selection mouse_map left press ungrabbed mouse_selection normal -mouse_map ctrl+alt+left press ungrabbed mouse_selection rectangle mouse_map left doublepress ungrabbed mouse_selection word mouse_map left triplepress ungrabbed mouse_selection line -mouse_map ctrl+alt+left triplepress ungrabbed mouse_selection line_from_point -mouse_map right press ungrabbed mouse_selection extend - -mouse_map shift+middle release ungrabbed,grabbed paste_selection -mouse_map shift+middle press grabbed discard_event mouse_map shift+left press ungrabbed,grabbed mouse_selection normal -mouse_map ctrl+shift+alt+left press ungrabbed,grabbed mouse_selection rectangle mouse_map shift+left doublepress ungrabbed,grabbed mouse_selection word mouse_map shift+left triplepress ungrabbed,grabbed mouse_selection line -mouse_map ctrl+shift+alt+left triplepress ungrabbed,grabbed mouse_selection line_from_point +mouse_map ctrl+shift+left press ungrabbed,grabbed mouse_selection rectangle +mouse_map ctrl+shift+left doublepress ungrabbed,grabbed mouse_selection line_from_point + +mouse_map middle release ungrabbed paste_from_selection +mouse_map shift+middle release ungrabbed,grabbed paste_selection +mouse_map shift+middle press grabbed discard_event + +mouse_map right press ungrabbed mouse_selection extend mouse_map shift+right press ungrabbed,grabbed mouse_selection extend mouse_map ctrl+shift+right press ungrabbed mouse_show_command_output + # }}} # }}} @@ -221,7 +225,7 @@ background_opacity 0.65 # Advanced {{{ # shell . -editor nvim +# editor hx # close_on_child_death no # remote_control_password # allow_remote_control no @@ -278,7 +282,7 @@ map kitty_mod+u kitten unicode_input map kitty_mod+c copy_to_clipboard map kitty_mod+y open_url_with_hints map kitty_mod+s launch librewolf --search "@selection" -map ctrl+alt+s launch --stdin-source=@selection --type=tab nvim +map ctrl+alt+s launch --stdin-source=@selection --type=tab hx map kitty_mod+p kitten hints --type path --program yazi map ctrl+alt+p kitten hints --type hyperlink --program yazi map kitty_mod+/ show_kitty_doc overview @@ -303,7 +307,7 @@ map ctrl+alt+up scroll_page_up map ctrl+shift+alt+e scroll_end map ctrl+shift+alt+i scroll_home map ctrl+shift+alt+down scroll_end -map ctrl+shift+alt+up scroll_home +map ctrl+shift+alt+up scroll_home map kitty_mod+z scroll_to_prompt -1 map kitty_mod+x scroll_to_prompt 1 @@ -373,7 +377,7 @@ map ctrl+alt+= goto_tab 100 # }}} # Hints {{{ -map kitty_mod+h>n kitten hints --type linenum nvim +{line} {path} +map kitty_mod+h>n kitten hints --type linenum hx {path}:{line} # paste to cmd map kitty_mod+h>w kitten hints --type word --program - map kitty_mod+h>l kitten hints --type line --program - diff --git a/.config/nvim/after/lsp/rust_analyzer.lua b/.config/nvim/after/lsp/rust_analyzer.lua index d40ccf4..9399598 100644 --- a/.config/nvim/after/lsp/rust_analyzer.lua +++ b/.config/nvim/after/lsp/rust_analyzer.lua @@ -5,7 +5,7 @@ return { cargo = { features = "all", loadOutDirsFromCheck = true, - runBuildScripts = true, + -- runBuildScripts = true, }, -- Add clippy lints for Rust. checkOnSave = true, @@ -14,20 +14,23 @@ return { command = "clippy", extraArgs = { "--", - "--no-deps", -- run Clippy only on the given crate + "--no-deps", -- run Clippy only on the given crate -- Deny, Warn, Allow, Forbid - "-Wclippy::correctness", -- code that is outright wrong or useless - "-Wclippy::complexity", -- code that does something simple but in a complex way - "-Wclippy::suspicious", -- code that is most likely wrong or useless - "-Wclippy::style", -- code that should be written in a more idiomatic way - "-Wclippy::perf", -- code that can be written to run faster - "-Wclippy::pedantic", -- lints which are rather strict or have occasional false positives - "-Wclippy::nursery", -- new lints that are still under development - "-Wclippy::cargo", -- lints for the cargo manifest - -- Use in production - "-Aclippy::restriction", -- lints which prevent the use of language and library features - -- Other - "-Aclippy::must_use_candidate", -- must_use is rather annoing + "-Wclippy::correctness", -- code that is outright wrong or useless + "-Wclippy::complexity", -- code that does something simple but in a complex way + "-Wclippy::suspicious", -- code that is most likely wrong or useless + "-Wclippy::style", -- code that should be written in a more idiomatic way + "-Wclippy::perf", -- code that can be written to run faster + "-Wclippy::pedantic", -- lints which are rather strict or have occasional false positives + "-Wclippy::nursery", -- new lints that are still under development + "-Aclippy::cargo", -- lints for the cargo manifest + "-Aclippy::restriction", -- lints which prevent the use of language and library features + -- Specific + "-Aclippy::must_use_candidate", -- must_use is rather annoing + "-Aclippy::cognitive_complexity", + "-Aclippy::too_many_lines", + "-Aclippy::missing_errors_doc", + -- "-Aclippy::from_iter_instead_of_collect", -- formats better }, }, procMacro = { diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua index 9f0e792..ab76d78 100644 --- a/.config/nvim/lua/mappings.lua +++ b/.config/nvim/lua/mappings.lua @@ -105,7 +105,7 @@ end) Lmap("lcs", "Show", diag.show) Lmap("lch", "Hide", diag.hide) Lmap("lce", "Enable", diag.enable) -Lmap("lcd", "Disable", diag.disable) +-- Lmap("lcd", "Disable", diag.disable) -- List Lmap("lld", "Diagnostics all Q", diag.setqflist) Lmap("llD", "Diagnostics buf L", diag.setloclist) diff --git a/.config/paru/paru.conf b/.config/paru/paru.conf index f5685b9..403a975 100644 --- a/.config/paru/paru.conf +++ b/.config/paru/paru.conf @@ -17,6 +17,6 @@ UpgradeMenu #KeepRepoCache # keep old AUR package versions [bin] -Sudo = doas +# Sudo = doas FileManager = yazi #MFlags = --skippgpcheck diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index 66abe2d..ff34a8d 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -233,4 +233,4 @@ "format": "{}", "format-alt": "{alt}" } -} \ No newline at end of file +}