Compare commits

..

No commits in common. "237a855ae5219c0615a5fc5dc148594c598af4cc" and "a8771d5166be5c5533f839f908d3ab64c8507cf4" have entirely different histories.

7 changed files with 11 additions and 138 deletions

View file

@ -1,9 +1,5 @@
theme = "catppuccin_macchiato" theme = "catppuccin_macchiato"
[keys.normal]
H = ":buffer-previous"
L = ":buffer-next"
[keys.normal.g] [keys.normal.g]
u = "switch_to_lowercase" u = "switch_to_lowercase"
U = "switch_to_uppercase" U = "switch_to_uppercase"

View file

@ -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 = "<Tab>"
let g:NERDTreeMapJumpParent = "h"
nmap <leader>e :NERDTree<CR>
" surround
Plug "tpope/vim-surround"
" Don't use Ex mode, use Q for formatting.
map Q gq
" Prevent movement
nmap <Space> <nop>
vmap <Space> <nop>
let g:WhichKeyDesc_Nop = "<Space>"
"" find
let g:WhichKeyDesc_Find = "<leader>f Find"
nmap <leader>fF <Action>(SearchEverywhere)
let g:WhichKeyDesc_Find_Everywhere = "<leader>fF Everywhere"
nmap <leader>ff <Action>(GotoFile)
let g:WhichKeyDesc_Find_Files = "<leader>ff Files"
nmap <leader>fr <Action>(RecentFiles)
let g:WhichKeyDesc_Find_Recents = "<leader>fr Recent"
"" code jump
" nmap gd <Action>(GotoSuperMethod)
" nmap gD <Action>(GotoDeclaration)
" nmap gy <Action>(GotoTypeDeclaration)
" nmap gri <Action>(GotoImplementation)
" nmap grr <Action>(FindUsages)
" nmap <leader>lR <Action>(FindUsages)
"" editing
let g:WhichKeyDesc_Commentary = "<leader>gc Comment"
" nmap gco o<Action>(CommentByLineComment)<ESC>
" nmap gcO O<Action>(CommentByLineComment)<ESC>
" nmap <leader>lf <Action>(ReformatCode)
" vmap <leader>lf <Action>(ReformatCode)<ESC>
" nmap <leader>lr <Action>(RenameElement)
"" git operation
nmap <leader>gt <Action>(ActivateCommitToolWindow)
" nmap <leader>gC <Action>(Vcs.ShowTabbedFileHistory)
nmap <leader>gr <Action>(Vcs.RollbackChangedLines)
nmap <leader>gR <Action>(ChangesView.Revert)
" nmap <leader>gl <Action>(Annotate)
"" tabs
nmap H <Action>(PreviousTab)
nmap L <Action>(NextTab)
" nmap <leader>bc <Action>(CloseAllEditorsButActive)
" nmap <leader>bC <Action>(CloseAllEditors)
" nmap <leader>c <Action>(CloseContent)
"" panels
nmap <C-h> <C-w>h
nmap <C-l> <C-w>l
nmap <C-k> <C-w>k
nmap <C-j> <C-w>j
nmap <Bar> <Action>(SplitVertically)
nmap ° <Action>(SplitHorizontally)
"" debug
" nmap <leader>dc <Action>(Debug)
" nmap <leader>dq <Action>(Stop)
" nmap <leader>db <Action>(ToggleLineBreakpoint)
" nmap <leader>do <Action>(StepOver)
" nmap <leader>di <Action>(StepInto)
" nmap <leader>dO <Action>(StepOut)
" nmap <leader>dE <Action>(EvaluateExpression)
"" 快速关闭上次搜索结果高亮
nmap <ESC> :nohlsearch<CR>

View file

@ -3,7 +3,7 @@
"blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" }, "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
"catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" }, "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" },
"comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" }, "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" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
"fzf-lua": { "branch": "main", "commit": "6488ada2f376e47789391dc353b6d91a3f9de6f6" }, "fzf-lua": { "branch": "main", "commit": "6488ada2f376e47789391dc353b6d91a3f9de6f6" },
"grapple.nvim": { "branch": "main", "commit": "b41ddfc1c39f87f3d1799b99c2f0f1daa524c5f7" }, "grapple.nvim": { "branch": "main", "commit": "b41ddfc1c39f87f3d1799b99c2f0f1daa524c5f7" },

View file

@ -24,15 +24,14 @@ return {
markdown = { "markdownlint" }, markdown = { "markdownlint" },
php = { "pint" }, php = { "pint" },
python = { "ruff_format", "ruff_organize_imports" }, python = { "ruff_format", "ruff_organize_imports" },
rust = { "rustfmt" },
scss = { "biome", "prettierd", "prettier", stop_after_first = true }, scss = { "biome", "prettierd", "prettier", stop_after_first = true },
sh = { "shfmt" }, sh = { "shfmt" },
sql = { "sleek" },
toml = { "taplo" }, toml = { "taplo" },
typescript = { "biome" }, typescript = { "biome" },
typescriptreact = { "biome" }, typescriptreact = { "biome" },
xml = { "lemminx" }, xml = { "lemminx" },
zsh = { "shfmt" }, zsh = { "shfmt" },
sql = { "sleek" }
}, },
formatters = { formatters = {
djlint = { djlint = {

View file

@ -20,5 +20,5 @@ hash = "aef2b1a805b80cce573bb766f1459d88"
[[flavor.deps]] [[flavor.deps]]
use = "yazi-rs/flavors:catppuccin-macchiato" use = "yazi-rs/flavors:catppuccin-macchiato"
rev = "c023460" rev = "df95930"
hash = "3ec21bcfd2735cfcbab61faaf43e59e4" hash = "c34feed32d555e79ab9a0c0a7bdda2be"

View file

@ -49,7 +49,7 @@ rules = [
{ mime = "image/*", use = ["open", "reveal"] }, { mime = "image/*", use = ["open", "reveal"] },
# Media # Media
{ mime = "{audio,video}/*", use = ["play", "open", "reveal"] }, { mime = "{audio,video}/*", use = ["play", "reveal"] },
{ mime = "inode/x-empty", use = ["edit", "reveal"] }, { mime = "inode/x-empty", use = ["edit", "reveal"] },
# JSON # JSON

View file

@ -22,6 +22,11 @@ update_path "/usr/local/bin"
export NPM_PACKAGES="$HOME/.npm-packages" export NPM_PACKAGES="$HOME/.npm-packages"
export NODE_PATH="$NPM_PACKAGES/lib/node_modules${NODE_PATH:+:$NODE_PATH}" 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" update_path "$NPM_PACKAGES/bin"
{{ /if }} {{ /if }}
@ -45,7 +50,7 @@ source "$HOME/.rye/env"
{{ /if }} {{ /if }}
{{ #if (is_executable "cargo") }} {{ #if (is_executable "cargo") }}
# . "$HOME/.cargo/env" . "$HOME/.cargo/env"
update_path "$HOME/.cargo/bin/" update_path "$HOME/.cargo/bin/"
{{ /if }} {{ /if }}