diff --git a/config/.bashrc b/config/.bashrc index addd707..3a57b9e 100644 --- a/config/.bashrc +++ b/config/.bashrc @@ -219,9 +219,9 @@ alias csi='rlwrap csi' alias chicken-csi='rlwrap chicken-csi' alias icyc='rlwrap icyc' export DCONF_PROFILE -export FZF_DEFAULT_OPTS=" - --color=fg:#908caa,bg:#191724,hl:#ebbcba - --color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba - --color=border:#403d52,header:#31748f,gutter:#191724 - --color=spinner:#f6c177,info:#9ccfd8 - --color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa" +# export FZF_DEFAULT_OPTS=" +# --color=fg:#908caa,bg:#191724,hl:#ebbcba +# --color=fg+:#e0def4,bg+:#26233a,hl+:#ebbcba +# --color=border:#403d52,header:#31748f,gutter:#191724 +# --color=spinner:#f6c177,info:#9ccfd8 +# --color=pointer:#c4a7e7,marker:#eb6f92,prompt:#908caa" diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json index b68fd8d..2aea0f2 100644 --- a/config/.config/nvim/lazy-lock.json +++ b/config/.config/nvim/lazy-lock.json @@ -19,6 +19,7 @@ "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "leap.nvim": { "branch": "main", "commit": "8b03b5d62d11cd9da5ea8be62ab8e9ff3fabab8f" }, "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" }, + "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1ec4da522fa49dcecee8d190efda273464dd2192" }, "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, @@ -33,10 +34,13 @@ "nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" }, "nelua.vim": { "branch": "main", "commit": "330f34d017df92dd1a1a7283e302982256e169db" }, "neogit": { "branch": "master", "commit": "49d0527143fe748196ae9a20b8c9ff54cbf45fab" }, + "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" }, "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-highlight-colors": { "branch": "main", "commit": "1ce0a09bfc28c7274e649d20927cea51e440b65c" }, "nvim-lspconfig": { "branch": "master", "commit": "34c9ecfdcc19d579f51c072300a71445fbec9da8" }, + "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-surround": { "branch": "main", "commit": "d56752df477ebd808cb82cea2fc68cf7455abb21" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, @@ -47,6 +51,7 @@ "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" }, "one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" }, "onedark.nvim": { "branch": "master", "commit": "de495fabe171d48aed5525f002d14414efcecbb2" }, + "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, "plantuml-syntax": { "branch": "master", "commit": "9d4900aa16674bf5bb8296a72b975317d573b547" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "range-highlight.nvim": { "branch": "master", "commit": "f54aec737f138e52c187a8bea77b41347fd86f12" }, diff --git a/config/.config/nvim/lua/config/keymap.lua b/config/.config/nvim/lua/config/keymap.lua index 0f1f64a..e4b3e5e 100644 --- a/config/.config/nvim/lua/config/keymap.lua +++ b/config/.config/nvim/lua/config/keymap.lua @@ -41,6 +41,8 @@ set('t', '', '') setnx('\'', '`', 'Goto mark with column') setnx('`', '\'', 'Goto mark without column') +setnx('x', 'bd!', 'Close Current Buffer') + setnx('grR', tele.lsp_references, 'Search lsp references') setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls') setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls') @@ -61,3 +63,7 @@ setnx('gr', tele.git_bcommits_range, 'List buffers git commits over visu setnx('n', require('nabla').popup, 'Show popup for nabla preview') setnx('p', '"+p', 'Paste from system clipboard') setnx('y', '"+y', 'Yank to system clipboard') + +setnx('', '(leap)', 'Activate leap') +setnx('', '(leap-anywhere)', 'Activate leap anywhere') +setnx('gs', require('leap.remote').action, 'Activate remote leap') diff --git a/config/.config/nvim/lua/plugins/filetypes.lua b/config/.config/nvim/lua/plugins/filetypes.lua index cd40ae2..a30c8e8 100644 --- a/config/.config/nvim/lua/plugins/filetypes.lua +++ b/config/.config/nvim/lua/plugins/filetypes.lua @@ -41,5 +41,13 @@ return { version = "2.*", opts = { }, }, + + { + "nvim-neorg/neorg", + -- lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default + ft = 'norg', + version = "*", -- Pin Neorg to the latest stable release + config = true, + }, } diff --git a/config/.config/nvim/lua/plugins/util.lua b/config/.config/nvim/lua/plugins/util.lua index 26dc80c..f3bd762 100644 --- a/config/.config/nvim/lua/plugins/util.lua +++ b/config/.config/nvim/lua/plugins/util.lua @@ -21,9 +21,9 @@ return { "sindrets/diffview.nvim", -- optional - Diff integration -- Only one of these is needed. - -- "nvim-telescope/telescope.nvim", -- optional + "nvim-telescope/telescope.nvim", -- optional -- "ibhagwan/fzf-lua", -- optional - "echasnovski/mini.pick", -- optional + -- "echasnovski/mini.pick", -- optional -- "folke/snacks.nvim", -- optional }, }, @@ -41,12 +41,6 @@ return { dependencies = { 'tpope/vim-repeat', }, - config = function() - -- local leap = require('leap') - vim.keymap.set({'n', 'x', 'o'}, '', '(leap)') - vim.keymap.set({'n', 'x', 'o'}, '', '(leap-anywhere)') - vim.keymap.set({'n', 'x', 'o'}, 'gs', require('leap.remote').action) - end, }, { @@ -113,6 +107,9 @@ return { { mode = 'n', keys = 'o', desc = '+Open' }, { mode = 'x', keys = 'o', desc = '+Open' }, + + { mode = 'n', keys = 'g', desc = '+Git' }, + { mode = 'x', keys = 'g', desc = '+Git' }, }, } end