diff --git a/Configs/helix/.config/helix/config.toml b/Configs/helix/.config/helix/config.toml index 2553571..f1a4ddf 100644 --- a/Configs/helix/.config/helix/config.toml +++ b/Configs/helix/.config/helix/config.toml @@ -1,9 +1,5 @@ theme = "catppuccin_macchiato" -[keys.normal] -H = ":buffer-previous" -L = ":buffer-next" - [keys.normal.g] u = "switch_to_lowercase" U = "switch_to_uppercase" diff --git a/Configs/jetbrains/.ideavimrc b/Configs/jetbrains/.ideavimrc deleted file mode 100644 index d09e662..0000000 --- a/Configs/jetbrains/.ideavimrc +++ /dev/null @@ -1,127 +0,0 @@ -" .ideavimrc is a configuration file for IdeaVim plugin. It uses -" the same commands as the original .vimrc configuration. -" You can find a list of commands here: https://jb.gg/h38q75 -" Find more examples here: https://jb.gg/share-ideavimrc - -" UI/UX -set scrolloff=15 -set autoindent -set relativenumber -set showcmd -set showmode -set ideajoin -set startofline - -" search -set hlsearch -set incsearch -set smartcase - -" system clipboard -set clipboard+=unnamed - -let mapleader=" " -let g:mapleader=" " - - -"" Plugins -" --- Enable IdeaVim plugins https://jb.gg/ideavim-plugins - -" set sneak -set highlightedyank -set exchange -set commentary -set matchit -set mini-ai -set vim-paragraph-motion -set peekaboo -set surround - -" More text objects -set argtextobj -set functiontextobj -set textobj-indent - -set which-key -set notimeout -let g:WhichKey_ShowVimActions = "true" -let g:WhichKey_SortOrder = "by_key_prefix_first" - -set NERDTree -let g:NERDTreeMapActivateNode = "l" -let g:NERDTreeMapPreview = "" -let g:NERDTreeMapJumpParent = "h" -nmap e :NERDTree - -" surround -Plug "tpope/vim-surround" - -" Don't use Ex mode, use Q for formatting. -map Q gq -" Prevent movement -nmap -vmap -let g:WhichKeyDesc_Nop = "" - -"" find -let g:WhichKeyDesc_Find = "f Find" -nmap fF (SearchEverywhere) -let g:WhichKeyDesc_Find_Everywhere = "fF Everywhere" - -nmap ff (GotoFile) -let g:WhichKeyDesc_Find_Files = "ff Files" - -nmap fr (RecentFiles) -let g:WhichKeyDesc_Find_Recents = "fr Recent" - -"" code jump -" nmap gd (GotoSuperMethod) -" nmap gD (GotoDeclaration) -" nmap gy (GotoTypeDeclaration) -" nmap gri (GotoImplementation) -" nmap grr (FindUsages) -" nmap lR (FindUsages) - -"" editing -let g:WhichKeyDesc_Commentary = "gc Comment" -" nmap gco o(CommentByLineComment) -" nmap gcO O(CommentByLineComment) - -" nmap lf (ReformatCode) -" vmap lf (ReformatCode) -" nmap lr (RenameElement) - -"" git operation -nmap gt (ActivateCommitToolWindow) -" nmap gC (Vcs.ShowTabbedFileHistory) -nmap gr (Vcs.RollbackChangedLines) -nmap gR (ChangesView.Revert) -" nmap gl (Annotate) - -"" tabs -nmap H (PreviousTab) -nmap L (NextTab) -" nmap bc (CloseAllEditorsButActive) -" nmap bC (CloseAllEditors) -" nmap c (CloseContent) - -"" panels -nmap h -nmap l -nmap k -nmap j - -nmap (SplitVertically) -nmap ° (SplitHorizontally) - -"" debug -" nmap dc (Debug) -" nmap dq (Stop) -" nmap db (ToggleLineBreakpoint) -" nmap do (StepOver) -" nmap di (StepInto) -" nmap dO (StepOut) -" nmap dE (EvaluateExpression) - -"" 快速关闭上次搜索结果高亮 -nmap :nohlsearch \ No newline at end of file diff --git a/Configs/nvim_unstable/.config/nvim_unstable/lazy-lock.json b/Configs/nvim_unstable/.config/nvim_unstable/lazy-lock.json index 8fce00c..38cc8e4 100644 --- a/Configs/nvim_unstable/.config/nvim_unstable/lazy-lock.json +++ b/Configs/nvim_unstable/.config/nvim_unstable/lazy-lock.json @@ -3,7 +3,7 @@ "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" }, "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" }, "comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" }, - "conform.nvim": { "branch": "master", "commit": "b1a75324ddf96b7bb84963a297b1ed334db087c0" }, + "conform.nvim": { "branch": "master", "commit": "6632e7d788a85bf8405ea0c812d343fc308b7b8c" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, "fzf-lua": { "branch": "main", "commit": "6488ada2f376e47789391dc353b6d91a3f9de6f6" }, "grapple.nvim": { "branch": "main", "commit": "b41ddfc1c39f87f3d1799b99c2f0f1daa524c5f7" }, diff --git a/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/formatter.lua b/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/formatter.lua index 58deae9..66311e9 100644 --- a/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/formatter.lua +++ b/Configs/nvim_unstable/.config/nvim_unstable/lua/aleidk/plugins/formatter.lua @@ -24,15 +24,14 @@ return { markdown = { "markdownlint" }, php = { "pint" }, python = { "ruff_format", "ruff_organize_imports" }, - rust = { "rustfmt" }, scss = { "biome", "prettierd", "prettier", stop_after_first = true }, sh = { "shfmt" }, - sql = { "sleek" }, toml = { "taplo" }, typescript = { "biome" }, typescriptreact = { "biome" }, xml = { "lemminx" }, zsh = { "shfmt" }, + sql = { "sleek" } }, formatters = { djlint = { diff --git a/Configs/yazi/.config/yazi/package.toml b/Configs/yazi/.config/yazi/package.toml index 2b66268..7629b7a 100644 --- a/Configs/yazi/.config/yazi/package.toml +++ b/Configs/yazi/.config/yazi/package.toml @@ -20,5 +20,5 @@ hash = "aef2b1a805b80cce573bb766f1459d88" [[flavor.deps]] use = "yazi-rs/flavors:catppuccin-macchiato" -rev = "c023460" -hash = "3ec21bcfd2735cfcbab61faaf43e59e4" +rev = "df95930" +hash = "c34feed32d555e79ab9a0c0a7bdda2be" diff --git a/Configs/yazi/.config/yazi/yazi.toml b/Configs/yazi/.config/yazi/yazi.toml index 3600ca2..c5152a1 100644 --- a/Configs/yazi/.config/yazi/yazi.toml +++ b/Configs/yazi/.config/yazi/yazi.toml @@ -49,7 +49,7 @@ rules = [ { mime = "image/*", use = ["open", "reveal"] }, # Media - { mime = "{audio,video}/*", use = ["play", "open", "reveal"] }, + { mime = "{audio,video}/*", use = ["play", "reveal"] }, { mime = "inode/x-empty", use = ["edit", "reveal"] }, # JSON diff --git a/Configs/zsh/zprofile b/Configs/zsh/zprofile index dd20b5a..7704fba 100644 --- a/Configs/zsh/zprofile +++ b/Configs/zsh/zprofile @@ -22,6 +22,11 @@ update_path "/usr/local/bin" export NPM_PACKAGES="$HOME/.npm-packages" export NODE_PATH="$NPM_PACKAGES/lib/node_modules${NODE_PATH:+:$NODE_PATH}" +# Unset manpath so we can inherit from /etc/manpath via the `manpath` +# command +unset MANPATH # delete if you already modified MANPATH elsewhere in your config +export MANPATH="$NPM_PACKAGES/share/man:$(manpath)" + update_path "$NPM_PACKAGES/bin" {{ /if }} @@ -45,7 +50,7 @@ source "$HOME/.rye/env" {{ /if }} {{ #if (is_executable "cargo") }} -# . "$HOME/.cargo/env" +. "$HOME/.cargo/env" update_path "$HOME/.cargo/bin/" {{ /if }}