Compare commits

..

No commits in common. "38d3e0e2219e1422508cebe50afab5fc912cf7c4" and "0401b8aa8c2ef23271bbddc3a3258c72dc6a4efc" have entirely different histories.

4 changed files with 76 additions and 57 deletions

View File

@ -34,7 +34,7 @@ source ~/.config/nvim/plugin-confs/lsplines.lua
source ~/.config/nvim/plugin-confs/null-ls.lua source ~/.config/nvim/plugin-confs/null-ls.lua
source ~/.config/nvim/plugin-confs/nvim-cmp.lua source ~/.config/nvim/plugin-confs/nvim-cmp.lua
source ~/.config/nvim/plugin-confs/fidget.lua source ~/.config/nvim/plugin-confs/fidget.lua
" source ~/.config/nvim/plugin-confs/symbols-outline.lua source ~/.config/nvim/plugin-confs/symbols-outline.lua
source ~/.config/nvim/plugin-confs/chatgpt.lua source ~/.config/nvim/plugin-confs/chatgpt.lua
source ~/.config/nvim/plugin-confs/nvim-colorizer.lua source ~/.config/nvim/plugin-confs/nvim-colorizer.lua
source ~/.config/nvim/plugin-confs/nvim-dap-python.lua source ~/.config/nvim/plugin-confs/nvim-dap-python.lua

View File

@ -89,25 +89,6 @@ require('packer').startup(function(use)
end end
} }
use {
"nvim-neorg/neorg",
-- tag = "*",
ft = "norg",
after = "nvim-treesitter", -- You may want to specify Telescope here as well
config = function()
require('neorg').setup {
load = {
["core.defaults"] = {}, -- Loads default behaviour
["core.concealer"] = {}, -- Adds pretty icons to your documents
["core.completion"] = { config = { engine = "nvim-cmp" } }, -- Adds completion
["core.dirman"] = { -- Manages Neorg workspaces
config = { workspaces = { notes = "~/notes" } }
}
}
}
end
}
use { 'junegunn/fzf', run = function() vim.fn['fzf#install']() end } use { 'junegunn/fzf', run = function() vim.fn['fzf#install']() end }
use 'norcalli/nvim-colorizer.lua' use 'norcalli/nvim-colorizer.lua'

View File

@ -159,7 +159,6 @@ cmp.setup({
{ name = 'nvim_lsp', group_index = 2 }, { name = 'nvim_lsp', group_index = 2 },
{ name = 'nvim_lsp_signature_help', group_index = 2 }, { name = 'nvim_lsp_signature_help', group_index = 2 },
{ name = 'nvim_lsp_document_symbol', group_index = 2 }, { name = 'nvim_lsp_document_symbol', group_index = 2 },
{ name = 'neorg', group_index = 2 }, -- For luasnip users.
{ name = 'luasnip', group_index = 2 }, -- For luasnip users. { name = 'luasnip', group_index = 2 }, -- For luasnip users.
{ {
name = 'buffer', name = 'buffer',

View File

@ -13,30 +13,56 @@ require 'nvim-tree'.setup {
-- }, -- },
diagnostics = { diagnostics = {
enable = true, enable = true,
icons = { hint = "", info = "", warning = "", error = "" } icons = {
hint = "",
info = "",
warning = "",
error = "",
}
},
update_focused_file = {
enable = false,
update_cwd = false,
ignore_list = {}
},
system_open = {
cmd = nil,
args = {}
},
filters = {
dotfiles = false,
custom = {}
},
git = {
enable = true,
ignore = true,
timeout = 500,
}, },
update_focused_file = { enable = false, update_cwd = false, ignore_list = {} },
system_open = { cmd = nil, args = {} },
filters = { dotfiles = false, custom = {} },
git = { enable = true, ignore = true, timeout = 500 },
view = { view = {
width = 35, width = 35,
-- height = 35, -- height = 35,
hide_root_folder = false, hide_root_folder = false,
side = 'left', side = 'left',
-- auto_resize = false, -- auto_resize = false,
-- mappings = { mappings = {
-- custom_only = false, custom_only = false,
-- list = {} list = {}
-- }, },
number = false, number = false,
relativenumber = false, relativenumber = false,
signcolumn = "yes" signcolumn = "yes"
}, },
trash = { cmd = "trash", require_confirm = true }, trash = {
cmd = "trash",
require_confirm = true
},
actions = { actions = {
change_dir = { global = false }, change_dir = {
open_file = { quit_on_open = false } global = false,
},
open_file = {
quit_on_open = false,
}
} }
} }
@ -47,21 +73,34 @@ local list = {
{ key = { "<CR>", "o", "<2-LeftMouse>" }, action = "edit" }, { key = { "<CR>", "o", "<2-LeftMouse>" }, action = "edit" },
{ key = { "O" }, action = "edit_no_picker" }, { key = { "O" }, action = "edit_no_picker" },
{ key = { "<2-RightMouse>", "<C-]>" }, action = "cd" }, { key = { "<2-RightMouse>", "<C-]>" }, action = "cd" },
{ key = "<C-v>", action = "vsplit" }, { key = "<C-x>", action = "split" }, { key = "<C-v>", action = "vsplit" },
{ key = "<C-t>", action = "tabnew" }, { key = "<", action = "prev_sibling" }, { key = "<C-x>", action = "split" },
{ key = ">", action = "next_sibling" }, { key = "P", action = "parent_node" }, { key = "<C-t>", action = "tabnew" },
{ key = "<BS>", action = "close_node" }, { key = "<Tab>", action = "preview" }, { key = "<", action = "prev_sibling" },
{ key = "K", action = "first_sibling" }, { key = "J", action = "last_sibling" }, { key = ">", action = "next_sibling" },
{ key = "P", action = "parent_node" },
{ key = "<BS>", action = "close_node" },
{ key = "<Tab>", action = "preview" },
{ key = "K", action = "first_sibling" },
{ key = "J", action = "last_sibling" },
{ key = "I", action = "toggle_ignored" }, { key = "I", action = "toggle_ignored" },
{ key = "H", action = "toggle_dotfiles" }, { key = "R", action = "refresh" }, { key = "H", action = "toggle_dotfiles" },
{ key = "a", action = "create" }, { key = "d", action = "remove" }, { key = "R", action = "refresh" },
{ key = "D", action = "trash" }, { key = "r", action = "rename" }, { key = "a", action = "create" },
{ key = "<C-r>", action = "full_rename" }, { key = "x", action = "cut" }, { key = "d", action = "remove" },
{ key = "c", action = "copy" }, { key = "p", action = "paste" }, { key = "D", action = "trash" },
{ key = "y", action = "copy_name" }, { key = "Y", action = "copy_path" }, { key = "r", action = "rename" },
{ key = "<C-r>", action = "full_rename" },
{ key = "x", action = "cut" },
{ key = "c", action = "copy" },
{ key = "p", action = "paste" },
{ key = "y", action = "copy_name" },
{ key = "Y", action = "copy_path" },
{ key = "gy", action = "copy_absolute_path" }, { key = "gy", action = "copy_absolute_path" },
{ key = "[c", action = "prev_git_item" }, { key = "[c", action = "prev_git_item" },
{ key = "]c", action = "next_git_item" }, { key = "-", action = "dir_up" }, { key = "]c", action = "next_git_item" },
{ key = "s", action = "system_open" }, { key = "q", action = "close" }, { key = "-", action = "dir_up" },
{ key = "g?", action = "toggle_help" } { key = "s", action = "system_open" },
{ key = "q", action = "close" },
{ key = "g?", action = "toggle_help" },
} }