Compare commits

..

No commits in common. "8d926473e058803384825c47a131d9424af22ccc" and "a01fcc846a7b3901b916d1c78b38179358fef276" have entirely different histories.

2 changed files with 35 additions and 22 deletions

View File

@ -201,7 +201,6 @@ local mappings = {
['rr'] = 'Search and replace all', ['rr'] = 'Search and replace all',
['rs'] = 'Search and replace', ['rs'] = 'Search and replace',
['q'] = { '<cmd>lua UnMapDHM()<cr>', 'Qwerty' }, ['q'] = { '<cmd>lua UnMapDHM()<cr>', 'Qwerty' },
['d'] = { '<cmd>bd<cr>', 'Delete buffer' },
['b'] = { ['b'] = {
function() function()
require('buffer_manager.ui').toggle_quick_menu() require('buffer_manager.ui').toggle_quick_menu()

View File

@ -139,7 +139,7 @@ return {
disable_builtin_notifications = false, disable_builtin_notifications = false,
use_magit_keybindings = false, use_magit_keybindings = false,
-- Change the default way of opening neogit -- Change the default way of opening neogit
kind = 'tab', kind = 'replace',
-- The time after which an output console is shown for slow running commands -- The time after which an output console is shown for slow running commands
console_timeout = 2000, console_timeout = 2000,
-- Automatically show console if a command takes more than console_timeout milliseconds -- Automatically show console if a command takes more than console_timeout milliseconds
@ -210,25 +210,12 @@ return {
-- lazy = false, -- lazy = false,
event = 'Syntax', event = 'Syntax',
opts = { opts = {
columns = {
"icon",
"permissions",
"size",
"mtime",
},
-- Buffer-local options to use for oil buffers -- Buffer-local options to use for oil buffers
buf_options = { buf_options = {
buflisted = false, buflisted = false,
}, },
-- Window-local options to use for oil buffers -- Window-local options to use for oil buffers
win_options = { win_options = {
wrap = false,
signcolumn = "no",
cursorcolumn = false,
foldcolumn = "0",
spell = false,
list = false,
conceallevel = 3,
concealcursor = 'nvic', concealcursor = 'nvic',
}, },
keymaps = { keymaps = {
@ -298,13 +285,13 @@ return {
-- dependencies = 'windwp/nvim-ts-autotag', -- dependencies = 'windwp/nvim-ts-autotag',
event = 'VeryLazy', event = 'VeryLazy',
config = function() config = function()
require('nvim-treesitter.parsers').get_parser_configs().asm = { -- require('nvim-treesitter.parsers').get_parser_configs().asm = {
install_info = { -- install_info = {
url = 'https://github.com/rush-rs/tree-sitter-asm.git', -- url = 'https://github.com/rush-rs/tree-sitter-asm.git',
files = { 'src/parser.c' }, -- files = { 'src/parser.c' },
branch = 'main', -- branch = 'main',
}, -- },
} -- }
local configs = require 'nvim-treesitter.configs' local configs = require 'nvim-treesitter.configs'
configs.setup { configs.setup {
@ -344,6 +331,33 @@ return {
width = 0.6, width = 0.6,
}, },
}, },
{
"nvim-neorg/neorg",
cmd = { "Neorg" },
ft = { "norg" },
build = ":Neorg sync-parsers",
dependencies = { "nvim-lua/plenary.nvim" },
config = function()
require("neorg").setup {
load = {
["core.integrations.treesitter"] = {},
["core.defaults"] = {}, -- Loads default behaviour
["core.concealer"] = {}, -- Adds pretty icons to your documents
["core.export"] = {},
["core.ui"] = {},
["core.completion"] = { config = { engine = "nvim-cmp" } },
["core.dirman"] = { -- Manages Neorg workspaces
config = {
workspaces = {
notes = "~/notes",
},
default_workspace = "notes",
},
},
},
}
end,
},
{ {
"ecthelionvi/NeoSwap.nvim", "ecthelionvi/NeoSwap.nvim",
opts = {} opts = {}