aboutsummaryrefslogtreecommitdiff
path: root/neovim/.config
diff options
context:
space:
mode:
Diffstat (limited to 'neovim/.config')
-rw-r--r--neovim/.config/nvim/lua/keybinds.lua13
-rw-r--r--neovim/.config/nvim/lua/plugins.lua14
-rw-r--r--neovim/.config/nvim/lua/plugins/bufferline.lua44
-rw-r--r--neovim/.config/nvim/lua/plugins/colorizer.lua4
-rw-r--r--neovim/.config/nvim/lua/plugins/lualine.lua2
-rw-r--r--neovim/.config/nvim/lua/plugins/telescope.lua5
-rw-r--r--neovim/.config/nvim/lua/settings.lua2
-rw-r--r--neovim/.config/nvim/plugin/packer_compiled.lua70
8 files changed, 126 insertions, 28 deletions
diff --git a/neovim/.config/nvim/lua/keybinds.lua b/neovim/.config/nvim/lua/keybinds.lua
index d84e5e4..8eb7ead 100644
--- a/neovim/.config/nvim/lua/keybinds.lua
+++ b/neovim/.config/nvim/lua/keybinds.lua
@@ -38,11 +38,10 @@ map("n", "<leader>y", "<cmd>!echo $(pwd)/% | xclip -selection clipboard<CR>")
map("n", "<C-c>", ":!compile %<cr><cr>")
-- Move to the next/previous buffer
--- map("n", "<leader>[", "<CMD>bp<CR>")
--- map("n", "<leader>]", "<CMD>bn<CR>")
-
--- Move to last buffer
--- map("n", """", "<CMD>b#<CR>")
+map("n", "<leader>[", "<CMD>bp<CR>")
+map("n", "<leader>]", "<CMD>bn<CR>")
+-- Close current buffer
+map("n", "<leader>\\", "<CMD>bd<CR>")
-- Telescope binds
local Telescope = setmetatable({}, {
@@ -57,9 +56,9 @@ local Telescope = setmetatable({}, {
-- Help
map("n", "<leader>fh", Telescope.help_tags)
-- Files with match
-map("n", "<leader>ff", Telescope.live_grep)
+map("n", "<leader>fp", Telescope.live_grep)
-- Project files
-map("n", "<leader>fp", Telescope.find_files)
+map("n", "<leader>ff", Telescope.find_files)
-- Changed git files
map("n", "<leader>fc", Telescope.git_status)
-- Git files
diff --git a/neovim/.config/nvim/lua/plugins.lua b/neovim/.config/nvim/lua/plugins.lua
index bcd87cc..4afe83b 100644
--- a/neovim/.config/nvim/lua/plugins.lua
+++ b/neovim/.config/nvim/lua/plugins.lua
@@ -5,6 +5,8 @@ vim.api.nvim_create_autocmd("BufWritePost", {
command = "source <afile> | PackerCompile",
})
+-- TODO: Add: https://github.com/ptzz/lf.vim
+
return require("packer").startup(function(use)
use("wbthomason/packer.nvim")
use("nvim-lua/plenary.nvim")
@@ -19,6 +21,12 @@ return require("packer").startup(function(use)
config = function() require("plugins.catppuccin") end,
})
+ use({
+ "norcalli/nvim-colorizer.lua",
+ run = ":ColorizerAttachToBuffer",
+ config = function() require("plugins.colorizer") end,
+ })
+
--[[ use({
"projekt0n/github-nvim-theme",
config = function() require("plugins.github-theme") end,
@@ -36,6 +44,12 @@ return require("packer").startup(function(use)
after = "lualine.nvim",
config = function() require("plugins.fidget") end,
},
+ {
+ 'akinsho/bufferline.nvim',
+ after = "catppuccin-theme",
+ requires = 'nvim-tree/nvim-web-devicons',
+ config = function() require("plugins.bufferline") end,
+ },
})
-- Better syntax highlighting
diff --git a/neovim/.config/nvim/lua/plugins/bufferline.lua b/neovim/.config/nvim/lua/plugins/bufferline.lua
new file mode 100644
index 0000000..c8df72f
--- /dev/null
+++ b/neovim/.config/nvim/lua/plugins/bufferline.lua
@@ -0,0 +1,44 @@
+local macchiato = require("catppuccin.palettes").get_palette("macchiato")
+local bufferline = require("bufferline")
+bufferline.setup({
+ highlights = require("catppuccin.groups.integrations.bufferline").get({
+ styles = { "bold" },
+ custom = {
+ all = {
+ fill = { bg = macchiato.crust },
+ background = { bg = macchiato.crust },
+ separator = {
+ fg = macchiato.crust,
+ bg = macchiato.crust
+ },
+ separator_selected = {
+ fg = macchiato.crust
+ },
+ }
+ },
+ }),
+ options = {
+ style_preset = bufferline.style_preset.no_italic,
+ close_command = nil,
+ right_mouse_command = nil,
+ left_mouse_command = nil,
+ middle_mouse_command = nil,
+ modified_icon = '●',
+ diagnostics = false,
+ diagnostics_update_in_insert = false,
+ color_icons = false,
+ show_buffer_icons = false,
+ show_buffer_close_icons = false,
+ show_close_icon = false,
+ show_tab_indicators = true,
+ show_duplicate_prefix = true,
+ persist_buffer_sort = true,
+ move_wraps_at_ends = false,
+ separator_style = "thick",
+ -- enforce_regular_tabs = false | true,
+ -- always_show_bufferline = true | false,
+ hover = {
+ enabled = false,
+ },
+ }
+})
diff --git a/neovim/.config/nvim/lua/plugins/colorizer.lua b/neovim/.config/nvim/lua/plugins/colorizer.lua
new file mode 100644
index 0000000..6f9379a
--- /dev/null
+++ b/neovim/.config/nvim/lua/plugins/colorizer.lua
@@ -0,0 +1,4 @@
+require('colorizer').setup({
+ '*';
+ css = { rgb_fn = true; hsl_fn = true; };
+}, { names = false })
diff --git a/neovim/.config/nvim/lua/plugins/lualine.lua b/neovim/.config/nvim/lua/plugins/lualine.lua
index 46ad4f0..1a82da6 100644
--- a/neovim/.config/nvim/lua/plugins/lualine.lua
+++ b/neovim/.config/nvim/lua/plugins/lualine.lua
@@ -15,7 +15,7 @@ require("lualine").setup({
{ "diff", colored = false },
},
lualine_c = {
- { "filename", file_status = true },
+ -- { "filename", file_status = true },
{ "diagnostics" },
},
lualine_x = {
diff --git a/neovim/.config/nvim/lua/plugins/telescope.lua b/neovim/.config/nvim/lua/plugins/telescope.lua
index 2b34bb2..8b8bc72 100644
--- a/neovim/.config/nvim/lua/plugins/telescope.lua
+++ b/neovim/.config/nvim/lua/plugins/telescope.lua
@@ -28,4 +28,9 @@ require("telescope").setup({
case_mode = "smart_case",
},
},
+ pickers = {
+ find_files = {
+ disable_devicons = true
+ },
+ },
})
diff --git a/neovim/.config/nvim/lua/settings.lua b/neovim/.config/nvim/lua/settings.lua
index eca7088..ac9ccc9 100644
--- a/neovim/.config/nvim/lua/settings.lua
+++ b/neovim/.config/nvim/lua/settings.lua
@@ -11,6 +11,8 @@ o.cursorline = true
o.relativenumber = true
o.numberwidth = 4
+o.termguicolors = true
+
o.signcolumn = "yes:1"
-- o.colorcolumn = "80"
o.shortmess = o.shortmess .. "c"
diff --git a/neovim/.config/nvim/plugin/packer_compiled.lua b/neovim/.config/nvim/plugin/packer_compiled.lua
index 64b453f..ffda93a 100644
--- a/neovim/.config/nvim/plugin/packer_compiled.lua
+++ b/neovim/.config/nvim/plugin/packer_compiled.lua
@@ -49,8 +49,8 @@ local function save_profiles(threshold)
end
time([[Luarocks path setup]], true)
-local package_path_str = "/home/me/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/me/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/me/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/me/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/home/me/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
+local package_path_str = "/home/me/.cache/nvim/packer_hererocks/2.1.1702233742/share/lua/5.1/?.lua;/home/me/.cache/nvim/packer_hererocks/2.1.1702233742/share/lua/5.1/?/init.lua;/home/me/.cache/nvim/packer_hererocks/2.1.1702233742/lib/luarocks/rocks-5.1/?.lua;/home/me/.cache/nvim/packer_hererocks/2.1.1702233742/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/home/me/.cache/nvim/packer_hererocks/2.1.1702233742/lib/lua/5.1/?.so"
if not string.find(package.path, package_path_str, 1, true) then
package.path = package.path .. ';' .. package_path_str
end
@@ -82,9 +82,19 @@ _G.packer_plugins = {
path = "/home/me/.local/share/nvim/site/pack/packer/opt/Comment.nvim",
url = "https://github.com/numToStr/Comment.nvim"
},
+ ["bufferline.nvim"] = {
+ config = { "\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.bufferline\frequire\0" },
+ load_after = {},
+ loaded = true,
+ needs_bufread = false,
+ path = "/home/me/.local/share/nvim/site/pack/packer/opt/bufferline.nvim",
+ url = "https://github.com/akinsho/bufferline.nvim"
+ },
["catppuccin-theme"] = {
+ after = { "bufferline.nvim" },
config = { "\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.catppuccin\frequire\0" },
loaded = true,
+ only_config = true,
path = "/home/me/.local/share/nvim/site/pack/packer/start/catppuccin-theme",
url = "https://github.com/catppuccin/nvim"
},
@@ -184,13 +194,19 @@ _G.packer_plugins = {
url = "https://github.com/windwp/nvim-autopairs"
},
["nvim-cmp"] = {
- after = { "cmp-nvim-lsp", "nvim-autopairs", "cmp-vsnip", "vim-vsnip", "rust-tools.nvim", "cmp-buffer", "cmp-path" },
+ after = { "cmp-vsnip", "cmp-nvim-lsp", "cmp-path", "nvim-autopairs", "rust-tools.nvim", "cmp-buffer", "vim-vsnip" },
config = { "\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.cmp\frequire\0" },
loaded = true,
only_config = true,
path = "/home/me/.local/share/nvim/site/pack/packer/start/nvim-cmp",
url = "https://github.com/hrsh7th/nvim-cmp"
},
+ ["nvim-colorizer.lua"] = {
+ config = { "\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins.colorizer\frequire\0" },
+ loaded = true,
+ path = "/home/me/.local/share/nvim/site/pack/packer/start/nvim-colorizer.lua",
+ url = "https://github.com/norcalli/nvim-colorizer.lua"
+ },
["nvim-lspconfig"] = {
after = { "mason-lspconfig.nvim" },
config = { "\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.lsp\frequire\0" },
@@ -200,7 +216,7 @@ _G.packer_plugins = {
url = "https://github.com/neovim/nvim-lspconfig"
},
["nvim-treesitter"] = {
- after = { "nvim-treesitter-textobjects", "playground", "nvim-treesitter-refactor" },
+ after = { "nvim-treesitter-textobjects", "nvim-treesitter-refactor", "playground" },
config = { "\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.treesitter\frequire\0" },
loaded = false,
needs_bufread = false,
@@ -226,6 +242,11 @@ _G.packer_plugins = {
path = "/home/me/.local/share/nvim/site/pack/packer/opt/nvim-treesitter-textobjects",
url = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects"
},
+ ["nvim-web-devicons"] = {
+ loaded = true,
+ path = "/home/me/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
+ url = "https://github.com/nvim-tree/nvim-web-devicons"
+ },
["packer.nvim"] = {
loaded = true,
path = "/home/me/.local/share/nvim/site/pack/packer/start/packer.nvim",
@@ -285,14 +306,10 @@ _G.packer_plugins = {
}
time([[Defining packer_plugins]], false)
--- Config for: todo-comments.nvim
-time([[Config for todo-comments.nvim]], true)
-try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25plugins.todocomments\frequire\0", "config", "todo-comments.nvim")
-time([[Config for todo-comments.nvim]], false)
--- Config for: nvim-lspconfig
-time([[Config for nvim-lspconfig]], true)
-try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.lsp\frequire\0", "config", "nvim-lspconfig")
-time([[Config for nvim-lspconfig]], false)
+-- Config for: nvim-cmp
+time([[Config for nvim-cmp]], true)
+try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.cmp\frequire\0", "config", "nvim-cmp")
+time([[Config for nvim-cmp]], false)
-- Config for: catppuccin-theme
time([[Config for catppuccin-theme]], true)
try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.catppuccin\frequire\0", "config", "catppuccin-theme")
@@ -301,14 +318,22 @@ time([[Config for catppuccin-theme]], false)
time([[Config for telescope.nvim]], true)
try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins.telescope\frequire\0", "config", "telescope.nvim")
time([[Config for telescope.nvim]], false)
--- Config for: nvim-cmp
-time([[Config for nvim-cmp]], true)
-try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.cmp\frequire\0", "config", "nvim-cmp")
-time([[Config for nvim-cmp]], false)
-- Config for: flutter-tools.nvim
time([[Config for flutter-tools.nvim]], true)
try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18flutter-tools\frequire\0", "config", "flutter-tools.nvim")
time([[Config for flutter-tools.nvim]], false)
+-- Config for: nvim-lspconfig
+time([[Config for nvim-lspconfig]], true)
+try_loadstring("\27LJ\2\n+\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\16plugins.lsp\frequire\0", "config", "nvim-lspconfig")
+time([[Config for nvim-lspconfig]], false)
+-- Config for: todo-comments.nvim
+time([[Config for todo-comments.nvim]], true)
+try_loadstring("\27LJ\2\n4\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\25plugins.todocomments\frequire\0", "config", "todo-comments.nvim")
+time([[Config for todo-comments.nvim]], false)
+-- Config for: nvim-colorizer.lua
+time([[Config for nvim-colorizer.lua]], true)
+try_loadstring("\27LJ\2\n1\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\22plugins.colorizer\frequire\0", "config", "nvim-colorizer.lua")
+time([[Config for nvim-colorizer.lua]], false)
-- Load plugins in order defined by `after`
time([[Sequenced loading]], true)
vim.cmd [[ packadd telescope-fzf-native.nvim ]]
@@ -316,28 +341,33 @@ vim.cmd [[ packadd telescope-fzf-native.nvim ]]
-- Config for: telescope-fzf-native.nvim
try_loadstring("\27LJ\2\nH\0\0\3\0\4\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0'\2\3\0B\0\2\1K\0\1\0\bfzf\19load_extension\14telescope\frequire\0", "config", "telescope-fzf-native.nvim")
+vim.cmd [[ packadd bufferline.nvim ]]
+
+-- Config for: bufferline.nvim
+try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.bufferline\frequire\0", "config", "bufferline.nvim")
+
vim.cmd [[ packadd mason-lspconfig.nvim ]]
vim.cmd [[ packadd mason.nvim ]]
-- Config for: mason.nvim
try_loadstring("\27LJ\2\n-\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\18plugins.mason\frequire\0", "config", "mason.nvim")
+vim.cmd [[ packadd cmp-path ]]
+vim.cmd [[ packadd cmp-vsnip ]]
vim.cmd [[ packadd rust-tools.nvim ]]
-- Config for: rust-tools.nvim
try_loadstring("\27LJ\2\n2\0\0\3\0\2\0\0046\0\0\0'\2\1\0B\0\2\1K\0\1\0\23plugins.rust-tools\frequire\0", "config", "rust-tools.nvim")
vim.cmd [[ packadd vim-vsnip ]]
-vim.cmd [[ packadd cmp-vsnip ]]
-vim.cmd [[ packadd cmp-buffer ]]
-vim.cmd [[ packadd cmp-path ]]
vim.cmd [[ packadd cmp-nvim-lsp ]]
+vim.cmd [[ packadd cmp-buffer ]]
time([[Sequenced loading]], false)
vim.cmd [[augroup packer_load_aucmds]]
vim.cmd [[au!]]
-- Event lazy-loads
time([[Defining lazy-load event autocommands]], true)
-vim.cmd [[au BufEnter * ++once lua require("packer.load")({'Comment.nvim', 'nvim-treesitter', 'lualine.nvim', 'gitsigns.nvim'}, { event = "BufEnter *" }, _G.packer_plugins)]]
+vim.cmd [[au BufEnter * ++once lua require("packer.load")({'gitsigns.nvim', 'nvim-treesitter', 'lualine.nvim', 'Comment.nvim'}, { event = "BufEnter *" }, _G.packer_plugins)]]
vim.cmd [[au InsertCharPre * ++once lua require("packer.load")({'nvim-autopairs'}, { event = "InsertCharPre *" }, _G.packer_plugins)]]
time([[Defining lazy-load event autocommands]], false)
vim.cmd("augroup END")
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 08:30:13 +0000