summaryrefslogtreecommitdiffstats
path: root/lua
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--lua/core/auto.lua22
-rw-r--r--lua/core/init.lua1
-rw-r--r--lua/core/maps.lua18
-rw-r--r--lua/core/opts.lua20
-rw-r--r--lua/core/overrides/cmp.lua3
-rw-r--r--lua/core/overrides/codewindow.lua1
-rw-r--r--lua/core/overrides/init.lua5
-rw-r--r--lua/core/overrides/lualine.lua10
-rw-r--r--lua/core/overrides/neorg.lua1
-rw-r--r--lua/core/overrides/telescope.lua1
-rw-r--r--lua/core/plugins.lua51
11 files changed, 106 insertions, 27 deletions
diff --git a/lua/core/auto.lua b/lua/core/auto.lua
index 2733b59..e68032e 100644
--- a/lua/core/auto.lua
+++ b/lua/core/auto.lua
@@ -44,7 +44,8 @@ a.nvim_create_autocmd('FileType', {
"packer",
"vim",
"Trouble",
- "norg"
+ "norg",
+ "alpha"
},
command = 'set colorcolumn=0'
})
@@ -59,21 +60,24 @@ a.nvim_create_autocmd('FileType', {
"packer",
"vim",
"Trouble",
- "norg"
+ "norg",
+ "alpha"
},
command = 'IndentBlanklineDisable'
})
+-- disable extra tildas in certain files
+a.nvim_create_autocmd('FileType', {
+ pattern = {
+ 'alpha'
+ },
+ command = 'hi NonText guifg=bg'
+})
+
-- source and compile lua conf when written
local packer_group = a.nvim_create_augroup('Packer', { clear = true })
vim.api.nvim_create_autocmd('BufWritePost', {
- command = 'source <afile> | PackerCompile',
+ command = 'source <afile>',
group = packer_group,
pattern = vim.fn.expand '$MYVIMRC',
})
-
--- telescope preview opts
-a.nvim_create_autocmd('User', {
- pattern = 'TelescopePreviewerLoaded',
- command = 'setlocal number',
-})
diff --git a/lua/core/init.lua b/lua/core/init.lua
index 1f484d2..cfd4ed6 100644
--- a/lua/core/init.lua
+++ b/lua/core/init.lua
@@ -2,4 +2,5 @@ require('core.plugins')
require('core.opts')
require('core.maps')
require('core.auto')
+require("core.snippets.init")
require('core.overrides.init')
diff --git a/lua/core/maps.lua b/lua/core/maps.lua
index 457ed98..bd4367e 100644
--- a/lua/core/maps.lua
+++ b/lua/core/maps.lua
@@ -10,7 +10,12 @@ a.nvim_set_keymap("n", "<leader>to", "<C-w>v<C-w>w:term<CR>", opts)
a.nvim_set_keymap("t", "<ESC>", "<C-\\><C-n>", opts)
-- open Trouble buffer
-a.nvim_set_keymap("n", "<leader>tt", "<cmd>:TroubleToggle<CR>", opts)
+a.nvim_set_keymap("n", "<leader>tt",
+ "<cmd>TroubleToggle document_diagnostics<CR>", opts)
+a.nvim_set_keymap("n", "<leader>td", "<cmd>TodoTrouble<CR>", opts)
+
+-- dismiss notifications
+a.nvim_set_keymap("n", "<leader>nd", "", { callback = require('notify').dismiss })
-- open file viewer
a.nvim_set_keymap("n", "<leader>fo", ":Ex<CR>", opts)
@@ -40,7 +45,7 @@ a.nvim_set_keymap("n", '<C-k>', "<cmd>SmartResizeUp<CR>", opts)
a.nvim_set_keymap("n", '<C-l>', "<cmd>SmartResizeRight<CR>", opts)
-- don't blame me pls
-a.nvim_set_keymap("n", "<C-g>", ":Gitsigns toggle_current_line_blame<CR>", opts)
+a.nvim_set_keymap("n", "<C-g>", [[<cmd>Gitsigns toggle_current_line_blame<CR>]], opts)
-- telescope
a.nvim_set_keymap('n', '<leader>sf', '<cmd>Telescope find_files<CR>', opts)
@@ -51,6 +56,10 @@ a.nvim_set_keymap('n', '<leader>so', '<cmd>Telescope oldfiles<CR>', opts)
a.nvim_set_keymap('n', '<leader>sc', '<cmd>Telescope neoclip unnamed<CR>', opts)
a.nvim_set_keymap('n', '<leader>su', '<cmd>Telescope undo<CR>', opts)
a.nvim_set_keymap('n', '<leader>sd', '<cmd>Telescope diagnostics<CR>', opts)
+a.nvim_set_keymap('n', '<leader>sn', '<cmd>Telescope notify<CR>', opts)
+
+-- resource snippets
+a.nvim_set_keymap('n', '<leader><leader>s', '<cmd>source ~/.config/nvim/lua/core/snippets/init.lua<CR>', opts)
-- auto comand keybinds
-- add some keybinds to the file view
@@ -71,6 +80,7 @@ a.nvim_create_autocmd('FileType', {
-- vbox note taking
function _G.Toggle_venn()
local venn_enabled = vim.inspect(vim.b.venn_enabled)
+ vim.notify = require('notify')
if venn_enabled == "nil" then
vim.b.venn_enabled = true
cmd[[setlocal ve=all]]
@@ -86,12 +96,16 @@ function _G.Toggle_venn()
-- make easier to navigate
o.cursorcolumn = true
o.colorcolumn = { 0 }
+ -- notify
+ vim.notify("venn toggled on", "info", { title = "Neovim config" })
else
cmd[[setlocal ve=]]
cmd[[mapclear <buffer>]]
vim.b.venn_enabled = nil
o.cursorcolumn = false
o.colorcolumn = { 80 }
+ -- notify
+ vim.notify("venn toggled off", "info", { title = "Neovim config" })
end
end
-- toggle keymappings for venn using <leader>v
diff --git a/lua/core/opts.lua b/lua/core/opts.lua
index 5f491e1..d08bc0c 100644
--- a/lua/core/opts.lua
+++ b/lua/core/opts.lua
@@ -17,6 +17,7 @@ o.scrolloff = 5 -- # lines below/above cursor
o.showmode = false -- stop vim from showing mode
o.cmdheight = 2 -- vim command height
o.mouse = "" -- no mouse
+o.laststatus = 3 -- global statusline
o.wrap = true -- wrap lines
o.linebreak = true -- fix where line is wraped
@@ -37,10 +38,13 @@ o.termguicolors = true
cmd('colorscheme jellybeans-nvim')
-- diagnostics
-vim.diagnostic.config({
- underline = true,
- virtual_text = { prefix = '*', },
-})
+vim.lsp.handlers["textDocument/publishDiagnostics"] =
+ vim.lsp.with(
+ vim.lsp.diagnostic.on_publish_diagnostics,
+ {
+ virtual_text = { prefix = '*' },
+ }
+)
colors = {
black = '#000000',
@@ -126,6 +130,13 @@ a.nvim_set_hl(0, "DiagnosticVirtualTextWarn", { fg = "#E9AD5A", bg = "#533221" }
a.nvim_set_hl(0, "DiagnosticVirtualTextError",
{ fg = "#ED3B44", bg = "#4b1313" })
+-- alpha start page 4chan edition
+a.nvim_set_hl(0, "AlphaHeader", {fg = "#789922" })
+a.nvim_set_hl(0, "AlphaEmphasis", {fg = "#DD0000" })
+
+-- murmur (word highlights)
+a.nvim_set_hl(0, "murmur_cursor_rgb", { bg = colors.grey2 })
+
-- cmp/treesitter stuff
a.nvim_set_hl(0, "CmpItemMenu", { fg = colors.purple, italic = true })
@@ -139,6 +150,7 @@ a.nvim_set_hl(0, "CmpItemKindKeyword", { bg = "#FF339C", bold = true })
a.nvim_set_hl(0, "CmpItemKindProperty", { bg = "#4FBF63", bold = true })
a.nvim_set_hl(0, "CmpItemKindInterface", { bg = "#1e90ff", bold = true })
a.nvim_set_hl(0, "CmpItemKindClass", { bg = "#4D4C5C", bold = true })
+a.nvim_set_hl(0, "CmpItemKindFile", { bg = "#E8D01C", bold = true })
a.nvim_set_hl(0, "TreesitterContext", { bg = colors.grey })
diff --git a/lua/core/overrides/cmp.lua b/lua/core/overrides/cmp.lua
index 2b6a9cd..c904d1e 100644
--- a/lua/core/overrides/cmp.lua
+++ b/lua/core/overrides/cmp.lua
@@ -22,6 +22,7 @@ cmp.setup {
{ name = 'path' },
{ name = 'buffer', keyword_length = 3, max_item_count = 7 },
{ name = 'calc' },
+ { name = 'neorg' },
}),
window = {
completion = {
@@ -50,7 +51,7 @@ cmp.setup {
Enum = 'E#',
Keyword = '$1',
Color = ' ',
- File = ' ',
+ File = '#`',
Reference = ' ',
Folder = ' ',
EnumMember = ' ',
diff --git a/lua/core/overrides/codewindow.lua b/lua/core/overrides/codewindow.lua
index cfc4dad..c5f7195 100644
--- a/lua/core/overrides/codewindow.lua
+++ b/lua/core/overrides/codewindow.lua
@@ -11,6 +11,7 @@ codewindow.setup({
"packer",
"vim",
"Trouble",
+ "alpha",
},
})
codewindow.apply_default_keybinds()
diff --git a/lua/core/overrides/init.lua b/lua/core/overrides/init.lua
index a8d5d89..4492f93 100644
--- a/lua/core/overrides/init.lua
+++ b/lua/core/overrides/init.lua
@@ -13,5 +13,10 @@ require('core.overrides.colorizer')
require('core.overrides.trouble')
require('core.overrides.lspzero')
require('core.overrides.cmp')
+require('core.overrides.luasnip')
require('core.overrides.lspkind')
require('core.overrides.cmpluasnipchoice')
+require('core.overrides.noneckpain')
+require('core.overrides.alpha')
+require('core.overrides.notify')
+require('core.overrides.nvim-lsp-notify')
diff --git a/lua/core/overrides/lualine.lua b/lua/core/overrides/lualine.lua
index 21473f9..597c3fe 100644
--- a/lua/core/overrides/lualine.lua
+++ b/lua/core/overrides/lualine.lua
@@ -73,9 +73,17 @@ require('lualine').setup {
icons_enabled = false,
component_separators = { left = '', right = '' },
section_separators = { left = '', right = '' },
+ disabled_filetypes = {
+ statusline = {
+ 'no-neck-pain',
+ 'alpha',
+ 'TelescopePrompt',
+ },
+ winbar = {},
+ },
theme = custom,
always_divide_middle = false,
- globalstatus = false,
+ globalstatus = true,
refresh = {
statusline = 100,
tabline = 1000,
diff --git a/lua/core/overrides/neorg.lua b/lua/core/overrides/neorg.lua
index 8412901..dc6df57 100644
--- a/lua/core/overrides/neorg.lua
+++ b/lua/core/overrides/neorg.lua
@@ -13,5 +13,6 @@ require('neorg').setup {
['core.norg.completion'] = {
config = { engine = 'nvim-cmp', }
},
+ ['core.integrations.nvim-cmp'] = {},
}
}
diff --git a/lua/core/overrides/telescope.lua b/lua/core/overrides/telescope.lua
index 546a33c..f1745f6 100644
--- a/lua/core/overrides/telescope.lua
+++ b/lua/core/overrides/telescope.lua
@@ -2,6 +2,7 @@ local telescope = require('telescope')
local actions = require('telescope.actions')
telescope.load_extension('undo')
+telescope.load_extension('file_browser')
telescope.setup {
defaults = {
borderchars = { " ", " ", " ", " ", " ", " ", " ", " " },
diff --git a/lua/core/plugins.lua b/lua/core/plugins.lua
index 306d106..bcdab7d 100644
--- a/lua/core/plugins.lua
+++ b/lua/core/plugins.lua
@@ -10,23 +10,54 @@ end
vim.opt.rtp:prepend(lazypath)
require('lazy').setup({
+ { 'rcarriga/nvim-notify' },
+
+ -- only the most useless plugins (some of these are also ui related)
+ { 'goolord/alpha-nvim' },
+ { 'gorbit99/codewindow.nvim' },
+ { 'alec-gibson/nvim-tetris' },
+ { 'kwakzalver/duckytype.nvim', config = true }, -- like monkey type
+ { 'melkster/modicator.nvim' },
+ { 'nyngwang/murmur.lua', config = true },
+ --
+
+ -- colorscheme / ui
{ 'metalelf0/jellybeans-nvim',
dependencies = 'rktjmp/lush.nvim',
lazy = false,
priority = 1000,
},
- { 'lukas-reineke/indent-blankline.nvim' },
{ 'nvim-lualine/lualine.nvim' },
+ { 'lukas-reineke/indent-blankline.nvim' },
+ { 'lewis6991/gitsigns.nvim', config = true, },
+ { 'chentoast/marks.nvim', config = true, },
+ { 'folke/which-key.nvim' },
+ { 'mrjones2014/smart-splits.nvim',
+ dependencies = { 'kwkarlwang/bufresize.nvim', config = true, },
+ },
+ --
+
+ -- careful the following plugins might be considered useful procede with caution
+ -- muh fzf
{ 'nvim-telescope/telescope.nvim',
version = '0.1.*',
dependencies = {
+ 'nvim-telescope/telescope-file-browser.nvim',
'nvim-lua/plenary.nvim',
'debugloop/telescope-undo.nvim',
+ 'AckslD/nvim-neoclip.lua'
}
},
- { 'gorbit99/codewindow.nvim' },
- { 'melkster/modicator.nvim' },
+ --
+
+ -- debugging
{ 'numToStr/Comment.nvim', config = true, },
+ { 'folke/trouble.nvim' },
+ { 'folke/todo-comments.nvim', config = true, },
+ { 'andrewferrier/debugprint.nvim', config = true },
+ --
+
+ -- notes
{ 'jbyuki/venn.nvim' },
{ 'nvim-neorg/neorg',
version = '*',
@@ -34,18 +65,16 @@ require('lazy').setup({
build = ':Neorg sync-parsers',
dependencies = 'nvim-lua/plenary.nvim',
},
- { 'folke/which-key.nvim' },
- { 'AckslD/nvim-neoclip.lua' },
- { 'mrjones2014/smart-splits.nvim',
- dependencies = { 'kwkarlwang/bufresize.nvim', config = true, },
+ { 'shortcuts/no-neck-pain.nvim',
+ version = '*',
},
- { 'lewis6991/gitsigns.nvim', config = true, },
- { 'chentoast/marks.nvim', config = true, },
+ --
+
+ -- cmp, lsp and syntax
{ 'nvim-treesitter/nvim-treesitter',
dependencies = 'nvim-treesitter/nvim-treesitter-context'
},
{ 'nvchad/nvim-colorizer.lua' },
- { 'folke/trouble.nvim' },
{ 'VonHeikemen/lsp-zero.nvim' },
{ 'hrsh7th/nvim-cmp',
dependencies = {
@@ -57,6 +86,7 @@ require('lazy').setup({
'hrsh7th/cmp-nvim-lsp',
'lukas-reineke/cmp-under-comparator',
'onsails/lspkind.nvim',
+ 'mrded/nvim-lsp-notify',
},
},
{ 'L3MON4D3/LuaSnip',
@@ -68,4 +98,5 @@ require('lazy').setup({
{ 'williamboman/mason.nvim' },
{ 'williamboman/mason-lspconfig.nvim' },
{ 'windwp/nvim-autopairs', config = true, },
+ --
})
generated by cgit v1.2.1 (git 2.18.0) at 2025-04-20 12:00:24 +0000