Compare commits

...

2 Commits

8 changed files with 73 additions and 32 deletions

View File

@@ -1,5 +1,6 @@
-- Set mapleader
vim.g.mapleader = "<Space>"
vim.g.maplocalleader = ","
-- Lazy
require("config.lazy")
@@ -59,7 +60,7 @@ vim.keymap.set("n", "<down>", '<cmd>echo "Use j to move!!"<CR>')
vim.keymap.set("i", "<C-BS>", "<C-W>", { noremap = true })
-- Keybinds for MiniSessions
vim.keymap.set("n", "<leader>qs", function() -- quit and save session local
vim.keymap.set("n", "<leader>qj", function() -- quit and save session local
MiniSessions.write(".session")
vim.cmd("wqa")
end, { noremap = true })
@@ -73,15 +74,3 @@ vim.keymap.set("n", "<leader>qd", function() -- quit and delete session
MiniSessions.delete(".session")
vim.cmd("wqa")
end, { noremap = true })
vim.api.nvim_create_autocmd("User", {
pattern = "TSUpdate",
callback = function()
require("nvim-treesitter.parsers").norg = {
install_info = {
url = "https://github.com/nvim-neorg/tree-sitter-norg",
revision = "HEAD",
},
}
end,
})

View File

@@ -19,7 +19,6 @@ vim.opt.rtp:prepend(lazypath)
-- loading lazy.nvim so that mappings are correct.
-- This is also a good place to setup other settings (vim.opt)
vim.g.mapleader = " "
vim.g.maplocalleader = "\\"
-- Setup lazy.nvim
require("lazy").setup({
@@ -29,6 +28,7 @@ require("lazy").setup({
{ import = "plugins.completion" },
{ import = "plugins.ui" },
{ import = "plugins.functional" },
{ import = "plugins.functional.neorg" },
},
-- Configure any other settings here. See the documentation for more details.
-- colorscheme that will be used when installing plugins.

View File

@@ -1,18 +1,29 @@
return {
"nvim-treesitter/nvim-treesitter",
lazy = false,
branch = "master",
build = ":TSUpdate",
config = function()
vim.api.nvim_create_autocmd("User", {
pattern = "TSUpdate",
callback = function()
require("nvim-treesitter.parsers").norg = {
install_info = {
url = "https://github.com/nvim-neorg/tree-sitter-norg",
revision = "HEAD",
require("nvim-treesitter.configs").setup({
highlight = { enable = true },
ensure_installed = {
"bash",
"html",
"javascript",
"json",
"lua",
"norg",
"norg_meta",
"markdown",
"markdown_inline",
"python",
"query",
"regex",
"tsx",
"typescript",
"vim",
"yaml",
},
}
end,
})
end,
}

View File

@@ -25,7 +25,9 @@ return {
file = ".session",
force = { read = false, write = true, delete = true },
})
require("mini.notify").setup() -- Better Notifications
require("mini.notify").setup({
window = { winblend = 0 },
}) -- Better Notifications
require("mini.surround").setup() -- Suround selections with characters
require("mini.move").setup({
mappings = {

View File

@@ -0,0 +1 @@
return { "nvim-neorg/neorg-telescope" }

View File

@@ -0,0 +1,33 @@
return {
"nvim-neorg/neorg",
lazy = false,
version = "*",
dependencies = { { "nvim-lua/plenary.nvim" }, { "nvim-neorg/neorg-telescope" } },
config = function()
require("neorg").setup({
load = {
["core.defaults"] = {},
["core.concealer"] = {},
["core.dirman"] = {
config = {
workspaces = {
notes = "~/Notes",
},
default_workspace = "notes",
},
},
["core.integrations.telescope"] = {
config = {
insert_file_link = {
-- Whether to show the title preview in telescope. Affects performance with a large
-- number of files.
show_title_preview = true,
},
},
},
},
})
vim.wo.foldlevel = 99
vim.wo.conceallevel = 2
end,
}

View File

@@ -1,18 +1,12 @@
return {
"nvim-telescope/telescope.nvim",
tag = "0.1.8",
dependencies = { "nvim-lua/plenary.nvim" },
dependencies = { "nvim-lua/plenary.nvim", { "nvim-telescope/telescope-fzf-native.nvim", build = "make" } },
config = function()
require("telescope").setup({
defaults = {
file_ignore_patterns = { ".git", ".node_modules" },
},
pickers = {
find_files = {
-- `hidden = true` will still show the inside of `.git/` as it's not `.gitignore`d.
find_command = { "rg", "--files", "--hidden", "--glob", "!**/.git/*", "-L" },
},
},
extensions = {
file_browser = {
theme = "ivy",

11
lua/plugins/ui/noice.lua Normal file
View File

@@ -0,0 +1,11 @@
return {
"folke/noice.nvim",
event = "VeryLazy",
opts = {
-- add any options here
},
dependencies = {
-- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
"MunifTanjim/nui.nvim",
},
}