10 files changed, 42 insertions, 38 deletions
diff --git a/store/config/home/bash_profile b/store/config/home/bash_profile
index b65f405..92375ee 100644
--- a/store/config/home/bash_profile
+++ b/store/config/home/bash_profile
@@ -1 +1,5 @@
+if [ -r ~/.profile ]; then . ~/.profile; fi
+
 export PATH="$HOME/.local/bin:$PATH"
+
+case "$-" in *i*) if [ -r ~/.bashrc ]; then . ~/.bashrc; fi;; esac
diff --git a/store/config/home/bashrc b/store/config/home/bashrc
index e59b2a4..162c250 100644
--- a/store/config/home/bashrc
+++ b/store/config/home/bashrc
@@ -1,3 +1,9 @@
+[[ $- != *i* ]] && return
+
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
+PS1='[\u@\h \W]\$ '
+
 set-proxy() {
   export http_proxy="http://127.0.0.1:7897"
   export https_proxy="http://127.0.0.1:7897"
diff --git a/store/config/mihomo/config.yaml b/store/config/mihomo/config.yaml
index c455409..bac2ac6 100644
--- a/store/config/mihomo/config.yaml
+++ b/store/config/mihomo/config.yaml
@@ -50,19 +50,19 @@ sniffer:
 rule-providers:
   cn:
     type: file
-    path: has-rule
+    path: has-rule.txt
     behavior: classical
     format: text
 
   non-cn:
     type: file
-    path: not-has-rule
+    path: not-has-rule.txt
     behavior: classical
     format: text
 
   need:
     type: file
-    path: need-rule
+    path: need-rule.txt
     behavior: classical
     format: text
 
@@ -71,15 +71,6 @@ rules:
   - RULE-SET,non-cn,node-select
   - RULE-SET,need,node-select
 #  - NOT,((GEOIP,CN)),node-select
-  - DOMAIN-SUFFIX,gnu.org,node-select
-  - DOMAIN-SUFFIX,nongnu.org,node-select
-  - DOMAIN-SUFFIX,ietf.org,node-select
-  - DOMAIN-SUFFIX,metacubex.one,node-select
-  - DOMAIN-SUFFIX,winehq.org,node-select
-  - DOMAIN-SUFFIX,freedesktop.org,node-select
-  - DOMAIN-SUFFIX,eff.org,node-select
-  - DOMAIN-SUFFIX,typescriptlang.org,node-select
-  - DOMAIN-SUFFIX,arxiv.org,node-select
 #  - MATCH,node-select
   - MATCH,DIRECT
 
diff --git a/store/config/mihomo/need-rule b/store/config/mihomo/need-rule
deleted file mode 100644
index 7ffcf49..0000000
--- a/store/config/mihomo/need-rule
+++ /dev/null
@@ -1,4 +0,0 @@
-IP-CIDR,185.199.108.153/32
-IP-CIDR,185.199.109.153/32
-IP-CIDR,185.199.110.153/32
-IP-CIDR,185.199.111.153/32
-\ No newline at end of file
diff --git a/store/config/nvim/init.lua b/store/config/nvim/init.lua
index ac6961a..70eb8ef 100644
--- a/store/config/nvim/init.lua
+++ b/store/config/nvim/init.lua
@@ -16,11 +16,18 @@ require("lazy").setup {
     spec = { { import = "plugins" } }
 }
 
-if vim.g.neovide then
+vim.cmd([[
+    if has('nvim') && executable('nvr')
+        let $GIT_EDITOR = 'nvr -cc split --remote-wait'
+    endif
+]])
+
+if vim.g.neovide or vim.env.ALACRITTY_WINDOW_ID then
     vim.opt.guifont = "Maple Mono";
     vim.g.neovide_normal_opacity = 0.95;
     vim.g.neovide_input_ime = false;
     vim.g.neovide_cursor_animate_in_insert_mode = false
+    vim.g.neovide_scroll_animation_far_lines = 0
     vim.g.neovide_input_macos_option_key_is_meta = 'only_left'
     vim.cmd("colorscheme catppuccin-macchiato")
 end
diff --git a/store/config/nvim/lazy-lock.json b/store/config/nvim/lazy-lock.json
index 4f6c2b5..eb28615 100644
--- a/store/config/nvim/lazy-lock.json
+++ b/store/config/nvim/lazy-lock.json
@@ -1,19 +1,21 @@
 {
-  "catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" },
+  "catppuccin": { "branch": "main", "commit": "3aaf3ab60221bca8edb1354e41bd514a22c89de2" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
-  "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
-  "gitsigns.nvim": { "branch": "main", "commit": "731b581428ec6c1ccb451b95190ebbc6d7006db7" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
+  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
+  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
+  "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
+  "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
+  "mini.bufremove": { "branch": "main", "commit": "a1bbb2af40f7773c8cee9e364aac4a724b5c10de" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "cea666ef965884414b1b71f6b39a537f9238bdb2" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
-  "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
+  "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
-  "nvim-lint": { "branch": "master", "commit": "2b0039b8be9583704591a13129c600891ac2c596" },
-  "nvim-lspconfig": { "branch": "master", "commit": "7ad4a11cc5742774877c529fcfb2702f7caf75e4" },
+  "nvim-lint": { "branch": "master", "commit": "7ef127aaede2a4d5ad8df8321e2eb4e567f29594" },
+  "nvim-lspconfig": { "branch": "master", "commit": "4da7247b2b348b4f6cade30a7a7fcb299879d275" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
-  "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
+  "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }
 }
diff --git a/store/config/nvim/lua/plugins.lua b/store/config/nvim/lua/plugins.lua
index 85de362..b511c5a 100644
--- a/store/config/nvim/lua/plugins.lua
+++ b/store/config/nvim/lua/plugins.lua
@@ -31,10 +31,12 @@ return {
         dependencies = { 'nvim-lua/plenary.nvim' }
     },
     { "lewis6991/gitsigns.nvim" },
+    { "sindrets/diffview.nvim" },
     { "hrsh7th/nvim-cmp" },
     { "hrsh7th/cmp-nvim-lsp" },
     { "hrsh7th/cmp-buffer" },
     { "hrsh7th/cmp-path" },
+    { "echasnovski/mini.bufremove" },
     { "windwp/nvim-autopairs" },
     { "mfussenegger/nvim-lint" },
 }
diff --git a/store/config/nvim/lua/setup/init.lua b/store/config/nvim/lua/setup/init.lua
index bbce01c..d5522d2 100644
--- a/store/config/nvim/lua/setup/init.lua
+++ b/store/config/nvim/lua/setup/init.lua
@@ -22,6 +22,9 @@ local function setup()
     vim.keymap.set("n", "<c-tab>", "<cmd>bnext<cr>")
     vim.keymap.set("n", "<c-s-tab>", "<cmd>bNext<cr>")
     vim.keymap.set("n", "<esc>", close_float)
+    vim.keymap.set("n", "<C-q>", function ()
+        require("mini.bufremove").delete()
+    end)
     vim.keymap.set('t', '<A-n>', '<C-\\><C-n>')
     vim.keymap.set('t', '<A-p>', function()
         local register = vim.fn.input("Enter register: ")
diff --git a/store/config/nvim/lua/setup/lsp.lua b/store/config/nvim/lua/setup/lsp.lua
index 4216f1c..45aa100 100644
--- a/store/config/nvim/lua/setup/lsp.lua
+++ b/store/config/nvim/lua/setup/lsp.lua
@@ -13,19 +13,10 @@ local function client_name_is(ev, name)
 end
 
 local function setup_clangd()
-    local clangd = "clangd"
-    local brew_clangd_path = "/usr/local/opt/llvm/bin/clangd"
-
-    if vim.uv.fs_stat(brew_clangd_path) ~= nil then
-        clangd = brew_clangd_path
-    end
-
-    vim.lsp.config("clangd", { cmd = { clangd } })
-
     vim.api.nvim_create_autocmd("LspAttach", {
         callback = function(ev)
             if client_name_is(ev, "clangd") then
-                vim.keymap.set("n", "grs", "<cmd>ClangdSwitchSourceHeader<cr>", {
+                vim.keymap.set("n", "grs", "<cmd>LspClangdSwitchSourceHeader<cr>", {
                     buffer = ev.buf
                 })
             end
diff --git a/store/config/nvim/lua/setup/plugins/init.lua b/store/config/nvim/lua/setup/plugins/init.lua
index 8f1346b..ac99886 100644
--- a/store/config/nvim/lua/setup/plugins/init.lua
+++ b/store/config/nvim/lua/setup/plugins/init.lua
@@ -12,11 +12,13 @@ local function setup()
 
     require("setup.plugins.telescope").setup()
     require("setup.plugins.gitsigns").setup()
+    require("diffview").setup {}
 
     require("setup.plugins.tree-sitter").setup()
     require("setup.plugins.lint").setup()
     require("setup.plugins.cmp").setup()
     require("nvim-autopairs").setup {}
+    require('mini.bufremove').setup {}
 end
 
 return {