From aff050df73fa3708a2481eebc14e3550ddaeb09f Mon Sep 17 00:00:00 2001 From: caandt Date: Tue, 25 Feb 2025 17:06:17 -0600 Subject: [PATCH] misc --- user/config/bash/custom | 2 +- user/config/lazygit/config.yml | 6 +++--- user/config/nvim/default.nix | 2 ++ user/config/nvim/lua/init.lua | 1 + user/config/nvim/lua/u/bindings.lua | 1 + user/config/nvim/lua/u/plugins/init.lua | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/user/config/bash/custom b/user/config/bash/custom index 5c39aec..2ed8710 100644 --- a/user/config/bash/custom +++ b/user/config/bash/custom @@ -34,7 +34,6 @@ if _exists fzf; then export FZF_DEFAULT_OPTS="--bind=ctrl-u:page-up,ctrl-d:page-down" eval "$(fzf --bash)" fi -_exists zoxide && eval "$(zoxide init bash)" # use starship prompt, unless in linux terminal if [[ "$TERM" != "linux" ]]; then @@ -67,6 +66,7 @@ else export SHLVL=0 fi fi +_exists zoxide && eval "$(zoxide init bash)" # set vi mode diff --git a/user/config/lazygit/config.yml b/user/config/lazygit/config.yml index bf9dc0c..f8f2b5f 100644 --- a/user/config/lazygit/config.yml +++ b/user/config/lazygit/config.yml @@ -6,6 +6,6 @@ os: edit: "nvim {{filename}}" editAtLine: "nvim {{filename}} +{{line}}" open: "nvim {{filename}}" -keybinding: - universal: - quit: +git: + autoFetch: false + autoRefresh: false diff --git a/user/config/nvim/default.nix b/user/config/nvim/default.nix index a33fcd1..4bee627 100644 --- a/user/config/nvim/default.nix +++ b/user/config/nvim/default.nix @@ -46,6 +46,8 @@ lua-language-server ]; withRuby = false; + withPython3 = false; + withNodeJs = false; }; xdg.configFile."nvim/init.lua".text = "require('init')"; xdg.configFile."nvim/lua".source = config.u.lib.lnn "user/config/nvim/lua"; diff --git a/user/config/nvim/lua/init.lua b/user/config/nvim/lua/init.lua index bc939d7..da05902 100644 --- a/user/config/nvim/lua/init.lua +++ b/user/config/nvim/lua/init.lua @@ -1,3 +1,4 @@ +vim.loader.enable() require('u.options') require('u.plugins') require('u.bindings') diff --git a/user/config/nvim/lua/u/bindings.lua b/user/config/nvim/lua/u/bindings.lua index 16e84d6..23d6ae9 100644 --- a/user/config/nvim/lua/u/bindings.lua +++ b/user/config/nvim/lua/u/bindings.lua @@ -9,3 +9,4 @@ map('n', 'v', 'vs', {desc = "split [V]ertical"}) map('n', 'h', 'sp', {desc = "split [H]orizontal"}) map('n', 'q:', '') map('n', 'cd', vim.diagnostic.open_float, {desc = "[C]ode [D]iagnostic"}) +map('n', 'x', '"_x') diff --git a/user/config/nvim/lua/u/plugins/init.lua b/user/config/nvim/lua/u/plugins/init.lua index 8cdc7b8..bba6590 100644 --- a/user/config/nvim/lua/u/plugins/init.lua +++ b/user/config/nvim/lua/u/plugins/init.lua @@ -49,10 +49,10 @@ require('undotree').setup({ ['H'] = "nop", } }) -require('colorizer').setup() require('lazydev').setup() require('neorg').setup({ + lazy_loading = true, load = { ["core.defaults"] = {}, ["core.concealer"] = {},