14 Commits

Author SHA1 Message Date
a947bcda9b make gruvbox sign symbols transparent, and leave everything else as is
config.transparent didn't work because it made fidget non-transparrent.
Apprently it has default colors as black
2024-12-18 11:36:49 +02:00
0325d883bc add maps for quickfix, use telescope for references 2024-12-18 11:36:49 +02:00
67c2b52e4d advent of neovim suggestions to telescope and some remaps 2024-12-18 11:36:49 +02:00
23cf6254ec update colors for gruvbox, use transparent mode 2024-12-18 11:36:49 +02:00
f53b5f6905 add ft for helm and yaml 2024-12-18 11:36:49 +02:00
cb80bb1750 switch from neodev to lazydev 2024-12-18 11:36:49 +02:00
68ea39094c cleanup and refactor autocmd 2024-12-18 11:36:49 +02:00
0334178b6e add make filetype 2024-12-18 11:36:49 +02:00
4a596c757b remove code action keymap 2024-12-18 11:36:49 +02:00
a6bf1207d7 add make ft settings 2024-12-18 11:36:49 +02:00
a93c15e29e add none-ls 2024-12-18 11:36:49 +02:00
bcc806d349 fix hl for the symbol columns 2024-12-18 11:36:49 +02:00
6871470b6c add gitsigns in blace of gitgutter and git-blame 2024-12-18 11:36:49 +02:00
c49b758e86 configure folding 2024-12-18 11:36:49 +02:00
26 changed files with 336 additions and 98 deletions

7
.luarc.json Normal file
View File

@@ -0,0 +1,7 @@
{
"diagnostics.disable": [
"undefined-global",
"unused-local"
]
}

View File

@@ -1,3 +1,4 @@
# My nvim configuration # My nvim configuration
This mostly copies ThePrimeagen configs with some changes because I don't use dvorak This mostly copies ThePrimeagen configs with some changes because I don't use dvorak

5
after/ftplugin/helm.lua Normal file
View File

@@ -0,0 +1,5 @@
vim.opt_local.tabstop = 2
vim.opt_local.shiftwidth = 2
vim.opt_local.softtabstop = 2
vim.opt_local.expandtab = true

12
after/ftplugin/make.lua Normal file
View File

@@ -0,0 +1,12 @@
vim.opt_local.tabstop = 4
vim.opt_local.shiftwidth = 4
vim.opt_local.softtabstop = 4
vim.opt_local.expandtab = false
vim.api.nvim_create_autocmd("FileType", {
pattern = "make",
callback = function()
print("Makefile detected and ftplugin loaded!")
end,
})

View File

@@ -0,0 +1,2 @@
vim.opt_local.conceallevel = 2

5
after/ftplugin/yaml.lua Normal file
View File

@@ -0,0 +1,5 @@
vim.opt_local.tabstop = 2
vim.opt_local.shiftwidth = 2
vim.opt_local.softtabstop = 2
vim.opt_local.expandtab = true

View File

@@ -1,42 +1,48 @@
{ {
"LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, "LuaSnip": { "branch": "master", "commit": "0f7bbce41ea152a94d12aea286f2ce98e63c0f58" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-dotenv": { "branch": "main", "commit": "4dd53aab60982f1f75848aec5e6214986263325e" }, "cmp-dotenv": { "branch": "main", "commit": "4dd53aab60982f1f75848aec5e6214986263325e" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" }, "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
"fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" }, "fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
"git-blame.nvim": { "branch": "master", "commit": "2883a7460f611c2705b23f12d58d398d5ce6ec00" }, "gitsigns.nvim": { "branch": "main", "commit": "ac5aba6dce8c06ea22bea2c9016f51a2dbf90dc7" },
"gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" }, "gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" },
"harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, "harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" },
"hererocks": { "branch": "master", "commit": "8bd2fcfdd65cfa7535ce39ea372a63b0bdb8e528" }, "hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
"icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" }, "icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" },
"indent-blankline.nvim": { "branch": "master", "commit": "e7a4442e055ec953311e77791546238d1eaae507" }, "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" },
"lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
"lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" },
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
"nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" }, "none-ls.nvim": { "branch": "main", "commit": "b7cf202083b18bc9319e4c8ad5341a3d09241192" },
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
"nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" }, "nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" },
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" }, "nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" },
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
"nvim-treesitter": { "branch": "master", "commit": "5a2ff8b7ca5470b1011ed82ef3fdd53139ffc467" }, "nvim-treesitter": { "branch": "master", "commit": "37427012d1c77c544356bfff0c9acc88fd3256bc" },
"nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "nvim-ufo": { "branch": "main", "commit": "c070ee849bfedb2ed778f60419a1eae8c8544be8" },
"oil.nvim": { "branch": "master", "commit": "ccab9d5e09e2d0042fbbe5b6bd05e82426247067" }, "nvim-web-devicons": { "branch": "master", "commit": "e87554285f581047b1bf236794b0eb812b444b87" },
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
"oil.nvim": { "branch": "master", "commit": "8ea40b5506115b6d355e304dd9ee5089f7d78601" },
"plenary": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "plenary": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
"search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" }, "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" },
"telescope.nvim": { "branch": "master", "commit": "df534c3042572fb958586facd02841e10186707c" }, "statuscol.nvim": { "branch": "main", "commit": "8822f76e105549620ef9c0d96e7b95aedf14c490" },
"trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
"telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
"trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" },
"undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" }, "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
"vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
"vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" },
"vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" } "vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" }
} }

View File

@@ -4,6 +4,8 @@ local augroup = vim.api.nvim_create_augroup
local CrentistGroup = augroup('Crentist', {}) local CrentistGroup = augroup('Crentist', {})
local OnSaveGroup = augroup('CrentistOnSave', {}) local OnSaveGroup = augroup('CrentistOnSave', {})
local builtin = require('telescope.builtin')
autocmd('LspAttach', { autocmd('LspAttach', {
group = CrentistGroup, group = CrentistGroup,
callback = function(e) callback = function(e)
@@ -13,17 +15,17 @@ autocmd('LspAttach', {
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts) vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts) vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts) vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts) vim.keymap.set("n", "<leader>vrr", function() builtin.lsp_references() end, opts)
vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts) vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts) vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
vim.keymap.set("n", "<M-F>", "<cmd>lua vim.lsp.buf.format()<CR>") vim.keymap.set("n", "<M-F>", function() vim.lsp.buf.format() end, opts)
end end
}) })
-- Add new line to the end of the file -- Add new line to the end of the file
autocmd({ "BufWritePre" }, { autocmd({ 'BufWritePre' }, {
group = OnSaveGroup, group = OnSaveGroup,
pattern = '*', pattern = '*',
callback = function() callback = function()
@@ -37,7 +39,7 @@ autocmd({ "BufWritePre" }, {
}) })
-- Remove trailing spaces -- Remove trailing spaces
autocmd({ "BufWritePre" }, { autocmd({ 'BufWritePre' }, {
group = OnSaveGroup, group = OnSaveGroup,
pattern = { "*" }, pattern = { "*" },
callback = function() callback = function()

View File

@@ -1,7 +1,8 @@
require("crentist.remap") require("crentist.remap")
require("crentist.set") require("crentist.set")
require("crentist.autocmd")
require("crentist.lazy_init") require("crentist.lazy_init")
require("crentist.autocmd")
require("crentist.filetype") require("crentist.filetype")
require("crentist.luasnip") require("crentist.luasnip")
require("crentist.null-ls")

View File

@@ -1,20 +1,40 @@
return { return {
{ {
"ellisonleao/gruvbox.nvim", 'ellisonleao/gruvbox.nvim',
priority = 1000, priority = 1000,
config = function() config = function()
require("gruvbox").setup({ local gruvbox = require('gruvbox')
gruvbox.setup({
transparent_mode = false,
italic = { italic = {
strings = false, strings = false,
emphasis = true,
comments = true,
operators = false,
folds = true,
},
overrides = {
FoldColumn = { bg = '#282828', fg = '#808080' },
GruvboxRedSign = { bg = '' },
GruvboxGreenSign = { bg = '' },
GruvboxYellowSign = { bg = '' },
GruvboxBlueSign = { bg = '' },
GruvboxPurpleSign = { bg = '' },
GruvboxAquaSign = { bg = '' },
GruvboxOrangeSign = { bg = '' },
} }
}) })
vim.cmd("colorscheme gruvbox") vim.cmd('colorscheme gruvbox')
vim.api.nvim_set_hl(0, 'SignColumn', { link = 'FoldColumn' })
end end
}, },
{ {
"norcalli/nvim-colorizer.lua", 'norcalli/nvim-colorizer.lua',
config = function () config = function()
require('colorizer').setup({ '*' }) require('colorizer').setup({ '*' })
end end
} }
} }

View File

@@ -1,22 +0,0 @@
return {
'f-person/git-blame.nvim',
config = function()
local gitblame = require('gitblame')
gitblame.setup({
enabled = true,
date_format = '%r'
})
vim.keymap.set("n", "<leader>gbt", function()
gitblame.toggle()
end)
local CrentistGitBlame = vim.api.nvim_create_augroup("CrentistGitBlame", {})
vim.api.nvim_create_autocmd({ "FileType" }, {
group = CrentistGitBlame,
pattern = "netrw",
callback = function()
gitblame.disable()
end,
})
end
}

View File

@@ -1,3 +0,0 @@
return {
"airblade/vim-gitgutter",
}

View File

@@ -0,0 +1,11 @@
return {
"lewis6991/gitsigns.nvim",
opts = {
current_line_blame = true,
attach_to_untracked = true,
current_line_blame_opts = {
delay = 500,
},
}
}

View File

@@ -15,7 +15,7 @@ return {
table.insert(file_paths, item.value) table.insert(file_paths, item.value)
end end
require("telescope.pickers").new({}, { require('telescope.pickers').new({}, {
prompt_title = "Harpoon", prompt_title = "Harpoon",
finder = require("telescope.finders").new_table({ finder = require("telescope.finders").new_table({
results = file_paths, results = file_paths,

View File

@@ -1,6 +1,6 @@
return { return {
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
tag = "v1.0.0", tag = 'v1.0.0',
dependencies = { dependencies = {
'williamboman/mason.nvim', 'williamboman/mason.nvim',
'williamboman/mason-lspconfig.nvim', 'williamboman/mason-lspconfig.nvim',
@@ -15,6 +15,17 @@ return {
'j-hui/fidget.nvim', 'j-hui/fidget.nvim',
'rafamadriz/friendly-snippets', 'rafamadriz/friendly-snippets',
{ 'towolf/vim-helm', ft = 'helm' }, { 'towolf/vim-helm', ft = 'helm' },
{
'folke/lazydev.nvim',
ft = 'lua', -- only load on lua files
opts = {
library = {
-- See the configuration section for more details
-- Load luvit types when the `vim.uv` word is found
{ path = '${3rd}/luv/library', words = { 'vim%.uv' } },
},
},
},
}, },
config = function() config = function()
@@ -41,6 +52,7 @@ return {
'ansiblels', 'ansiblels',
'terraformls', 'terraformls',
'helm_ls', 'helm_ls',
'marksman',
}, },
handlers = { handlers = {
function(server_name) function(server_name)
@@ -106,6 +118,7 @@ return {
}) })
local capabilities = require('cmp_nvim_lsp').default_capabilities()
local pythonLineLength = 95 local pythonLineLength = 95
lspconfig.pylsp.setup { lspconfig.pylsp.setup {
settings = { settings = {
@@ -121,37 +134,8 @@ return {
} }
lspconfig.ansiblels.setup {} lspconfig.ansiblels.setup {}
lspconfig.lua_ls.setup { lspconfig.lua_ls.setup {}
on_init = function(client)
local path = client.workspace_folders[1].name
if vim.loop.fs_stat(path .. '/.luarc.json') or vim.loop.fs_stat(path .. '/.luarc.jsonc') then
return
end
client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, {
runtime = {
-- Tell the language server which version of Lua you're using
-- (most likely LuaJIT in the case of Neovim)
version = 'LuaJIT'
},
-- Make the server aware of Neovim runtime files
workspace = {
checkThirdParty = false,
library = {
vim.env.VIMRUNTIME
-- Depending on the usage, you might want to add additional paths here.
-- '${3rd}/luv/library'
-- '${3rd}/busted/library',
}
-- or pull in all of 'runtimepath'. NOTE: this is a lot slower
-- library = vim.api.nvim_get_runtime_file('', true)
}
})
end,
settings = {
Lua = {}
}
}
lspconfig.helm_ls.setup { lspconfig.helm_ls.setup {
settings = { settings = {
['helm-ls'] = { ['helm-ls'] = {
@@ -161,6 +145,11 @@ return {
} }
} }
} }
lspconfig.yamlls.setup {
capabilities = capabilities,
}
lspconfig.terraformls.setup { lspconfig.terraformls.setup {
filetypes = { 'terraform', 'terraform-vars', 'tf' } filetypes = { 'terraform', 'terraform-vars', 'tf' }
} }

View File

@@ -1,3 +0,0 @@
return {
{ "folke/neodev.nvim", opts = {} }
}

View File

@@ -0,0 +1,11 @@
return {
'nvimtools/none-ls.nvim',
-- Optional dependencies
dependencies = { 'nvim-lua/plenary.nvim' },
opts = {},
config = function()
local null_ls = require('null-ls')
null_ls.setup({})
end
}

View File

@@ -0,0 +1,62 @@
return {
'epwalsh/obsidian.nvim',
version = '*', -- recommended, use latest release instead of latest commit
-- lazy = true,
-- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault:
-- event = {
-- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'.
-- -- E.g. 'BufReadPre ' .. vim.fn.expand '~' .. '/my-vault/*.md'
-- -- refer to `:h file-pattern` for more examples
-- 'BufReadPre /Users/rtim/Documents/Notes/tech-work-hobby/*.md',
-- 'BufNewFile /Users/rtim/Documents/Notes/tech-work-hobby/*.md',
-- },
dependencies = {
-- Required.
'nvim-lua/plenary.nvim',
},
keys = {
{'<leader>ot', '<cmd>ObsidianToday<CR>', desc = "Open today's daily note"},
{'<leader>os', '<cmd>ObsidianQuickSwitch<CR>', desc = 'Search notes in my vault and switch to selected'},
},
mappings = {
-- Overrides the 'gf' mapping to work on markdown/wiki links within your vault.
["gf"] = {
action = function()
return require("obsidian").util.gf_passthrough()
end,
opts = { noremap = false, expr = true, buffer = true },
},
-- Toggle check-boxes.
["<leader>ch"] = {
action = function()
return require("obsidian").util.toggle_checkbox()
end,
opts = { buffer = true },
},
-- Smart action depending on context, either follow link or toggle checkbox.
["<cr>"] = {
action = function()
return require("obsidian").util.smart_action()
end,
opts = { buffer = true, expr = true },
},
},
opts = {
workspaces = {
{
name = 'tech-work-hobby',
path = '/Users/rtim/Documents/Notes/tech-work-hobby/',
},
},
daily_notes = {
folder = 'Daily',
date_format = '%d-%b-%y (%A)',
default_tags = { 'daily' },
template = 'Daily.md',
},
templates = {
folder = 'Templates',
}
},
}

View File

@@ -10,6 +10,9 @@ return {
}, },
keymaps = { keymaps = {
['<C-h>'] = false, ['<C-h>'] = false,
['<C-j>'] = false,
['<C-k>'] = false,
['<C-l>'] = false,
} }
}) })
end end

View File

@@ -2,7 +2,12 @@ return {
'FabianWirth/search.nvim', 'FabianWirth/search.nvim',
dependencies = { dependencies = {
'nvim-lua/plenary.nvim', 'nvim-lua/plenary.nvim',
{
'nvim-telescope/telescope.nvim', 'nvim-telescope/telescope.nvim',
dependencies = {
{ 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' }
}
},
}, },
config = function() config = function()
@@ -19,15 +24,16 @@ return {
vimgrep_arguments = vimgrep_arguments, vimgrep_arguments = vimgrep_arguments,
file_ignore_patterns = { file_ignore_patterns = {
'node_modules', 'node_modules',
'.git/'
} }
}, },
pickers = { extensions = {
find_files = { fzf = {}
find_command = { 'rg', '--files', '--hidden', '--glob', '!**/.git/*' },
}
} }
}) })
telescope.load_extension('fzf')
local search = require('search') local search = require('search')
local builtin = require('telescope.builtin') local builtin = require('telescope.builtin')

View File

@@ -1,5 +1,5 @@
return { return {
"nvim-treesitter/nvim-treesitter", 'nvim-treesitter/nvim-treesitter',
build = ":TSUpdate", build = ":TSUpdate",
config = function() config = function()
require("nvim-treesitter.configs").setup({ require("nvim-treesitter.configs").setup({
@@ -28,3 +28,4 @@ return {
}) })
end end
} }

43
lua/crentist/lazy/ufo.lua Normal file
View File

@@ -0,0 +1,43 @@
return {
'kevinhwang91/nvim-ufo',
event = 'BufReadPost',
dependencies = {
'kevinhwang91/promise-async',
'nvim-treesitter/nvim-treesitter',
{
'luukvbaal/statuscol.nvim',
config = function()
local builtin = require('statuscol.builtin')
require('statuscol').setup({
relculright = true,
segments = {
{ text = { builtin.foldfunc }, sign = { colwidth = 2 }, click = 'v:lua.ScFa', },
{ text = { '%s' }, click = 'v:lua.ScSa', hl = 'FoldColumn' },
{ text = { builtin.lnumfunc, ' ' }, click = 'v:lua.ScLa', hl = 'FoldColumn' },
},
})
end
}
},
init = function()
vim.opt.foldenable = true
vim.opt.foldcolumn = '1'
vim.opt.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
vim.opt.foldlevelstart = 99
vim.opt.fillchars = 'eob: ,fold: ,foldopen:,foldsep: ,foldclose:'
vim.opt.foldtext = ''
end,
opts = {
provider_selector = function(bufnr, filetype, buftype)
return { 'treesitter', 'indent' }
end
},
config = function()
require('ufo').setup({
provider_selector = function(bufnr, filetype, buftype)
return { 'treesitter', 'indent' }
end
})
end
}

View File

@@ -11,7 +11,9 @@ vim.keymap.set({ "i", "s" }, "<C-l>", function()
end end
end, { desc = "Snippet next argument", silent = true }) end, { desc = "Snippet next argument", silent = true })
-- nvim config --------------------
-- Snippets for LUA
--------------------
ls.add_snippets('lua', { ls.add_snippets('lua', {
s({ name = 'LuaSnip Snippet', trig = 'snipf' }, s({ name = 'LuaSnip Snippet', trig = 'snipf' },
fmt([[ fmt([[
@@ -44,7 +46,9 @@ ls.add_snippets('lua', {
), ),
}) })
-- Comment block --------------------
-- Generic snippets
--------------------
local function com_string(_, snip, to_multiply) local function com_string(_, snip, to_multiply)
local comment_string = vim.bo.commentstring local comment_string = vim.bo.commentstring
local repeats = snip.captures[1] local repeats = snip.captures[1]
@@ -78,3 +82,29 @@ ls.add_snippets('all', {
), ),
}) })
--------------------
-- Terraform
--------------------
ls.add_snippets('terraform', {
s({ name = 'data_assume', trig = 'tf_assume' },
fmt([[
data "aws_iam_policy_document" "<name>" {
statement {
actions = ["sts:AssumeRole"]
principals {
type = "Service"
identifiers = ["<service>.amazonaws.com"]
}
}
}
]],
{
name = i(1, 'assume'),
service = i(2, 'service')
},
{ delimiters = '<>' }
)
),
})

42
lua/crentist/null-ls.lua Normal file
View File

@@ -0,0 +1,42 @@
-- https://www.youtube.com/watch?v=q-oBU2fO1H4&t=189s
local null_ls = require("null-ls")
-- local function check_if_comment(node, params)
-- if node == 'nil' then return false
-- if node:type() ~= 'comment' or node:type() ~= 'comment_content' then return false end
--
-- if node:type() == 'comment' then
-- local child = node:child()
--
-- if child == 'nil' then return false end
-- end
--
-- -- node exists and is a part of comment
-- if node == 'nil' or node:type() ~= 'comment' or node:type() ~= 'comment_content' then return false end
--
-- local parent = node:parent()
-- if parent == 'nil' or parent:type() ~= 'comment' then return false end
--
-- local text = vim.treesitter.get_node_text(node, )
-- end
-- null_ls.register({
-- name = 'Comment actions',
-- method = null_ls.methods.CODE_ACTION,
-- filetypes = {},
-- generator = {
-- fn = function(params)
-- local out = {}
--
-- table.insert(out,
-- {
-- title = 'Test',
-- action = function()
-- print(vim.treesitter.get_node())
-- end
-- })
-- return out
-- end
-- }
-- })

View File

@@ -31,3 +31,10 @@ vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><
vim.keymap.set("n", "<C-s>", "<cmd>silent !tmux neww tmux-sessionizer<CR>") vim.keymap.set("n", "<C-s>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
vim.keymap.set("n", "<space><space>x", "<cmd>source %<CR>")
vim.keymap.set("n", "<space>x", ":.lua<CR>")
vim.keymap.set("v", "<space>x", ":lua<CR>")
vim.keymap.set("n", "<M-j>", "<cmd>cnext<CR>")
vim.keymap.set("n", "<M-k>", "<cmd>cprev<CR>")

View File

@@ -23,7 +23,7 @@ vim.opt.incsearch = true
vim.opt.termguicolors = true vim.opt.termguicolors = true
vim.opt.scrolloff = 8 vim.opt.scrolloff = 8
vim.opt.signcolumn = "yes" vim.opt.signcolumn = "yes:1"
vim.opt.isfname:append("@-@") vim.opt.isfname:append("@-@")
vim.opt.updatetime = 50 vim.opt.updatetime = 50