Compare commits

..

6 commits

20 changed files with 189 additions and 65 deletions

3
.gitignore vendored Normal file
View file

@ -0,0 +1,3 @@
nvim/lazy-lock.json
.luarc.json
.tmux/plugins/*

@ -1 +0,0 @@
Subproject commit 0698e8f4b17d6454c71bf5212895ec055c578da0

@ -1 +0,0 @@
Subproject commit 763d0a852e6703ce0f5090a508330012a7e6788e

@ -1 +0,0 @@
Subproject commit cff343cf9e81983d3da0c8562b01616f12e8d548

@ -1 +0,0 @@
Subproject commit acfd36e4fcba99f8310a7dfb432111c242fe7392

@ -1 +0,0 @@
Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946

@ -1 +0,0 @@
Subproject commit 33afa80db65113561dc53fa732b7f5e53d5ecfd0

View file

@ -1,9 +0,0 @@
[colors.primary]
background = "#111111"
[colors.normal]
cyan = '#008b8b'
[font.normal]
family = 'JetBrainsMono Nerd Font Mono'
style = 'Regular'

20
alacritty/alacritty.toml Normal file
View file

@ -0,0 +1,20 @@
[general]
import = ["./github_dark_high_contrast.toml" ]
[colors.primary]
background = "#111111"
[colors.normal]
cyan = '#008b8b'
[font.normal]
family = 'JetBrainsMono Nerd Font Mono'
style = 'Regular'
[cursor]
blink_interval = 500
blink_timeout = 0
[cursor.style]
blinking = "Always"
#shape = "Underline"

View file

@ -0,0 +1,33 @@
# (Github Dark High Contrast) Colors for Alacritty
# Default colors
[colors.primary]
background = '#0a0c10'
foreground = '#f0f3f6'
# Cursor colors
[colors.cursor]
text = '#0a0c10'
cursor = '#f0f3f6'
# Normal colors
[colors.normal]
black = '#7a828e'
red = '#ff9492'
green = '#26cd4d'
yellow = '#f0b72f'
blue = '#71b7ff'
magenta = '#cb9eff'
cyan = '#39c5cf'
white = '#d9dee3'
# Bright colors
[colors.bright]
black = '#9ea7b3'
red = '#ffb1af'
green = '#4ae168'
yellow = '#f7c843'
blue = '#91cbff'
magenta = '#cb9eff'
cyan = '#39c5cf'
white = '#d9dee3'

View file

@ -1,13 +1,18 @@
{ {
"github-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" }, "github-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" },
"gitsigns.nvim": { "branch": "main", "commit": "39e0d1cd44eafed5f30c372e377ab1cb1781ec9f" }, "gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
"neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
"none-ls.nvim": { "branch": "main", "commit": "90e4a27ccaa25979a6b732b9f06dfa43b54957b7" },
"nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" },
"nvim-lspconfig": { "branch": "master", "commit": "cb33dea610b7eff240985be9f6fe219920e630ef" },
"nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" }, "nvim-treesitter": { "branch": "master", "commit": "066fd6505377e3fd4aa219e61ce94c2b8bdb0b79" },
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
"telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
"vim-tmux-navigator": { "branch": "master", "commit": "33afa80db65113561dc53fa732b7f5e53d5ecfd0" } "vim-tmux-navigator": { "branch": "master", "commit": "33afa80db65113561dc53fa732b7f5e53d5ecfd0" }

12
nvim/lua/plugins/git.lua Normal file
View file

@ -0,0 +1,12 @@
return {
{
"tpope/vim-fugitive",
},
{
"lewis6991/gitsigns.nvim",
tag = "v1.0.2",
config = function()
require("gitsigns").setup({})
end,
},
}

View file

@ -1,7 +0,0 @@
return {
"lewis6991/gitsigns.nvim",
tag="v1.0.2",
config = function()
require("gitsigns").setup({})
end,
}

View file

@ -0,0 +1,28 @@
return {
{
"mason-org/mason.nvim",
tag = "v1.11.0",
config = function()
require("mason").setup({})
end,
},
{
"mason-org/mason-lspconfig.nvim",
tag = "v1.32.0",
config = function()
require("mason-lspconfig").setup({
ensure_installed = {
"lua_ls",
"bashls",
"dockerls",
-- "gh-actions-language-server",
"helm_ls",
"jsonls",
"nginx_language_server",
"ruff",
"yamlls",
},
})
end,
},
}

View file

@ -0,0 +1,12 @@
return {
"nvimtools/none-ls.nvim",
config = function()
local null_ls = require("null-ls")
null_ls.setup({
sources = {
null_ls.builtins.formatting.stylua,
},
})
vim.keymap.set("n", "<leader>af", vim.lsp.buf.format, {})
end,
}

View file

@ -0,0 +1,18 @@
return {
"neovim/nvim-lspconfig",
tag="v1.8.0",
config = function()
local lspconfig = require("lspconfig")
lspconfig.lua_ls.setup({})
lspconfig.bashls.setup({})
lspconfig.dockerls.setup({})
lspconfig.helm_ls.setup({})
lspconfig.jsonls.setup({})
lspconfig.nginx_language_server.setup({})
lspconfig.ruff.setup({})
lspconfig.yamlls.setup({})
vim.keymap.set('n', '<leader>d', vim.lsp.buf.hover, {})
vim.keymap.set('n', '<leader>gt', vim.lsp.buf.definition, {})
vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, {})
end
}

View file

@ -1,5 +1,22 @@
return { return {
'nvim-telescope/telescope.nvim', tag = '0.1.8', {
dependencies = { 'nvim-lua/plenary.nvim' } 'nvim-telescope/telescope.nvim', tag = '0.1.8',
dependencies = { 'nvim-lua/plenary.nvim' }
},
{
'nvim-telescope/telescope-ui-select.nvim',
config = function()
require("telescope").setup ({
extensions = {
["ui-select"] = {
require("telescope.themes").get_dropdown {
-- even more opts
}
}
}
})
require("telescope").load_extension("ui-select")
end
}
} }

View file

@ -1,44 +1,41 @@
return { return {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
config = function() config = function()
local config = require("nvim-treesitter.configs") local config = require("nvim-treesitter.configs")
config.setup({ config.setup({
-- A list of parser names, or "all" (the listed parsers MUST always be installed) -- A list of parser names, or "all" (the listed parsers MUST always be installed)
ensure_installed = { "lua", "vim", "vimdoc", "query", "markdown", "markdown_inline", "json", "jsonc", "python", "yaml" }, ensure_installed = {
"lua",
"vim",
"vimdoc",
"query",
"markdown",
"markdown_inline",
"json",
"jsonc",
"python",
"yaml",
},
-- Install parsers synchronously (only applied to `ensure_installed`) -- Install parsers synchronously (only applied to `ensure_installed`)
sync_install = false, sync_install = false,
-- Automatically install missing parsers when entering buffer -- Automatically install missing parsers when entering buffer
-- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
auto_install = true, auto_install = true,
-- List of parsers to ignore installing (or "all") -- List of parsers to ignore installing (or "all")
ignore_install = { "javascript" }, ignore_install = { "javascript" },
highlight = { highlight = {
enable = true, enable = true,
-- NOTE: these are the names of the parsers and not the filetype. (for example if you want to -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-- disable highlighting for the `tex` filetype, you need to include `latex` in this list as this is -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-- the name of the parser) -- Using this option may slow down your editor, and you may see some duplicate highlights.
-- list of language that will be disabled -- Instead of true it can also be a list of languages
disable = { "c", "rust" }, additional_vim_regex_highlighting = false,
-- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files },
disable = function(lang, buf) })
local max_filesize = 100 * 1024 -- 100 KB end,
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
if ok and stats and stats.size > max_filesize then
return true
end
end,
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-- Using this option may slow down your editor, and you may see some duplicate highlights.
-- Instead of true it can also be a list of languages
additional_vim_regex_highlighting = false,
},
})
end
} }

View file

@ -1,3 +0,0 @@
return {
"tpope/vim-fugitive"
}

4
setup
View file

@ -23,6 +23,10 @@
[ -d ~/.config/nvim ] && [ ! -L ~/.config/nvim ] && mv ~/.config/nvim ~/.config/nvim.old [ -d ~/.config/nvim ] && [ ! -L ~/.config/nvim ] && mv ~/.config/nvim ~/.config/nvim.old
[ -e ~/.config/nvim ] || ln -s ~/.dotfiles/nvim ~/.config/nvim [ -e ~/.config/nvim ] || ln -s ~/.dotfiles/nvim ~/.config/nvim
# Alacritty only if directory exists
[ -d ~/.config/alacritty ] && [ ! -L ~/.config/alacritty ] && mv ~/.config/alacritty ~/.config/alacritty.old
[ -e ~/.config/alacritty ] || ln -s ~/.dotfiles/alacritty ~/.config/alacritty
# k9s only if directory exists # k9s only if directory exists
if [ -d ~/.config/k9s ]; then if [ -d ~/.config/k9s ]; then
[ -e ~/.config/k9s/config.yml ] || ln -s ~/.dotfiles/k9s_config.yml ~/.config/k9s/config.yml [ -e ~/.config/k9s/config.yml ] || ln -s ~/.dotfiles/k9s_config.yml ~/.config/k9s/config.yml