genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 09:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

rearrange some stuff, switch themes

Browse source
This commit is contained in:
Gene Liverman 2024-01-02 23:23:23 -05:00
parent 2af59c0072
commit 0f11ababe4
23 changed files with 183 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/home-manager/common/all-cli.nix
View file

@ -119,7 +119,7 @@ in {
end
-- load additional settings
require("config.keymaps")
require("config.vim-options")
require("lazy").setup("plugins")
-- tell sqlite.lua where to find the bits it needs

3
modules/home-manager/files/nvim/lua/config/keymaps.lua → modules/home-manager/files/nvim/lua/config/vim-options.lua
View file

@ -12,3 +12,6 @@ vim.opt.shiftwidth = 2
vim.opt.shiftround = true
vim.keymap.set("n", "<leader>h", ":nohlsearch<CR>")
vim.wo.relativenumber = true

2
modules/home-manager/files/nvim/lua/plugins/dracula.lua → modules/home-manager/files/nvim/lua/disabled/themes/dracula.lua
View file

@ -3,6 +3,6 @@ return {
lazy = false,
priority = 1000,
config = function()
vim.cmd.colorscheme "dracula"
vim.cmd.colorscheme("dracula")
end,
}

1
modules/home-manager/files/nvim/lua/plugins/alpha.lua
View file

@ -29,4 +29,3 @@ return {
alpha.setup(dashboard.opts)
end,
}

2
modules/home-manager/files/nvim/lua/disabled/themes/catppuccin.lua → modules/home-manager/files/nvim/lua/plugins/catppuccin.lua
View file

@ -5,6 +5,6 @@ return {
lazy = false,
priority = 1000,
config = function()
vim.cmd.colorscheme "catppuccin"
vim.cmd.colorscheme("catppuccin")
end,
}

58
modules/home-manager/files/nvim/lua/plugins/lsp-config.lua Normal file
View file

@ -0,0 +1,58 @@
return {
{
"williamboman/mason.nvim",
config = true,
},
{
"williamboman/mason-lspconfig.nvim",
config = function()
require("mason-lspconfig").setup({
ensure_installed = {
"lua_ls", -- lua
"nil_ls", -- nix
"puppet", -- puppet
"ruff_lsp", -- python
},
})
end,
},
{
"neovim/nvim-lspconfig",
config = function()
local on_attach = function(_, _)
vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, {})
vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, {})
vim.keymap.set("n", "gd", vim.lsp.buf.definition, {})
vim.keymap.set("n", "gi", vim.lsp.buf.implementation, {})
vim.keymap.set("n", "gr", require("telescope.builtin").lsp_references, {})
vim.keymap.set("n", "K", vim.lsp.buf.hover, {})
end
local lspconfig = require("lspconfig")
local capabilities = require("cmp_nvim_lsp").default_capabilities()
lspconfig.lua_ls.setup({
capabilities = capabilities,
on_attach = on_attach,
settings = { Lua = { diagnostics = { globals = { "vim" } } } },
})
lspconfig.nil_ls.setup({
capabilities = capabilities,
on_attach = on_attach,
})
local puppet_languageserver = vim.fn.expand(
"$HOME/.local/share/nvim/mason/packages/puppet-editor-services/libexec/puppet-languageserver"
)
lspconfig.puppet.setup({
capabilities = capabilities,
on_attach = on_attach,
cmd = { puppet_languageserver },
})
lspconfig.ruff_lsp.setup({ on_attach = on_attach })
end,
},
}

18
modules/home-manager/files/nvim/lua/plugins/lualine.lua
View file

@ -1,19 +1,19 @@
return {
"nvim-lualine/lualine.nvim",
config = function ()
require('lualine').setup {
config = function()
require("lualine").setup({
options = {
icons_enabled = true,
theme = 'dracula-nvim',
-- theme = "dracula-nvim",
},
sections = {
lualine_a = {
{
'filename',
"filename",
path = 1,
}
}
}
}
end
},
},
},
})
end,
}

14
modules/home-manager/files/nvim/lua/plugins/mason-lspconfig.lua
View file

@ -1,14 +0,0 @@
return {
"williamboman/mason-lspconfig.nvim",
config = function()
require("mason-lspconfig").setup({
ensure_installed = {
"lua_ls", -- lua
"nil_ls", -- nix
"puppet", -- puppet
"ruff_lsp", -- python
}
})
end
}

17
modules/home-manager/files/nvim/lua/plugins/mason-null-ls.lua
View file

@ -1,17 +0,0 @@
return {
"jay-babu/mason-null-ls.nvim",
event = { "BufReadPre", "BufNewFile" },
dependencies = {
"williamboman/mason.nvim",
"nvimtools/none-ls.nvim",
},
config = function()
require("mason-null-ls").setup({
ensure_installed = {
"prettier", -- HTML, JS, JSON, etc.
"ruff", -- Pyhton
"stylua", -- LUA
},
})
end,
}

1
modules/home-manager/files/nvim/lua/plugins/mason.lua
View file

@ -1 +0,0 @@
return { "williamboman/mason.nvim", config = true }

17
modules/home-manager/files/nvim/lua/plugins/neo-tree.lua
View file

@ -7,19 +7,22 @@ return {
"nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim",
},
config = function ()
config = function()
vim.g.loaded_netrw = 1
vim.g.loaded_netrwPlugin = 1
vim.keymap.set('n', '<C-n>', ':Neotree toggle<CR>', {})
vim.keymap.set("n", "<C-n>", ":Neotree toggle<CR>", {})
require("neo-tree").setup({
filesystem = {
hijack_netrw_behavior = "open_default"
follow_current_file = {
enabled = true,
},
hijack_netrw_behavior = "open_default",
},
follow_current_file = { enabled = true },
follow_current_file = { enabled = true },
source_selector = {
winbar = true,
statusline = false
}
statusline = false,
},
})
end
end,
}

58
modules/home-manager/files/nvim/lua/plugins/none-ls.lua
View file

@ -1,23 +1,43 @@
return {
"nvimtools/none-ls.nvim",
dependencies = { "nvim-lua/plenary.nvim" },
config = function()
local null_ls = require("null-ls")
{
"jay-babu/mason-null-ls.nvim",
event = { "BufReadPre", "BufNewFile" },
dependencies = {
"williamboman/mason.nvim",
"nvimtools/none-ls.nvim",
},
config = function()
require("mason-null-ls").setup({
ensure_installed = {
"prettier", -- HTML, JS, JSON, etc.
"ruff", -- Pyhton
"stylua", -- LUA
},
})
end,
},
{
-- none-ls replaces null_ls... it's weird
"nvimtools/none-ls.nvim",
dependencies = { "nvim-lua/plenary.nvim" },
config = function()
local null_ls = require("null-ls")
null_ls.setup({
sources = {
null_ls.builtins.completion.spell,
null_ls.builtins.diagnostics.puppet_lint,
null_ls.builtins.diagnostics.rubocop,
null_ls.builtins.diagnostics.ruff,
null_ls.builtins.formatting.prettier,
null_ls.builtins.formatting.puppet_lint,
null_ls.builtins.formatting.rubocop,
null_ls.builtins.formatting.ruff_format,
null_ls.builtins.formatting.stylua,
},
})
null_ls.setup({
sources = {
null_ls.builtins.completion.spell,
null_ls.builtins.diagnostics.puppet_lint,
null_ls.builtins.diagnostics.rubocop,
null_ls.builtins.diagnostics.ruff,
null_ls.builtins.formatting.prettier,
null_ls.builtins.formatting.puppet_lint,
null_ls.builtins.formatting.rubocop,
null_ls.builtins.formatting.ruff_format,
null_ls.builtins.formatting.stylua,
},
})
vim.keymap.set("n", "<leader>gf", vim.lsp.buf.format, {})
end,
vim.keymap.set("n", "<leader>gf", vim.lsp.buf.format, {})
end,
},
}

38
modules/home-manager/files/nvim/lua/plugins/nvim-lspconfig.lua
View file

@ -1,38 +0,0 @@
return {
"neovim/nvim-lspconfig",
config = function()
local on_attach = function(_, _)
vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, {})
vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, {})
vim.keymap.set("n", "gd", vim.lsp.buf.definition, {})
vim.keymap.set("n", "gi", vim.lsp.buf.implementation, {})
vim.keymap.set("n", "gr", require("telescope.builtin").lsp_references, {})
vim.keymap.set("n", "K", vim.lsp.buf.hover, {})
end
local lspconfig = require("lspconfig")
local capabilities = require("cmp_nvim_lsp").default_capabilities()
lspconfig.lua_ls.setup({
capabilities = capabilities,
on_attach = on_attach,
settings = { Lua = { diagnostics = { globals = { "vim" } } } },
})
lspconfig.nil_ls.setup({
capabilities = capabilities,
on_attach = on_attach,
})
local puppet_languageserver =
vim.fn.expand("$HOME/.local/share/nvim/mason/packages/puppet-editor-services/libexec/puppet-languageserver")
lspconfig.puppet.setup({
capabilities = capabilities,
on_attach = on_attach,
cmd = { puppet_languageserver },
})
lspconfig.ruff_lsp.setup({ on_attach = on_attach })
end,
}

5
modules/home-manager/files/nvim/lua/plugins/nvim-web-devicons.lua
View file

@ -1 +1,4 @@
return { "nvim-tree/nvim-web-devicons", config = true }
return {
"nvim-tree/nvim-web-devicons",
config = true,
}

7
modules/home-manager/files/nvim/lua/plugins/telescope-cheat.lua
View file

@ -1,7 +0,0 @@
return {
"nvim-telescope/telescope-cheat.nvim",
dependencies = {
"kkharji/sqlite.lua",
"nvim-telescope/telescope.nvim",
},
}

1
modules/home-manager/files/nvim/lua/plugins/telescope-symbols.lua
View file

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

3
modules/home-manager/files/nvim/lua/plugins/telescope-ui-select.lua
View file

@ -1,3 +0,0 @@
return {
"nvim-telescope/telescope-ui-select.nvim",
}

57
modules/home-manager/files/nvim/lua/plugins/telescope.lua
View file

@ -1,29 +1,40 @@
return {
"nvim-telescope/telescope.nvim",
tag = "0.1.5",
dependencies = { "nvim-lua/plenary.nvim" },
config = function()
-- This is your opts table
require("telescope").setup({
extensions = {
["ui-select"] = {
require("telescope.themes").get_dropdown({
-- even more opts
}),
{
"nvim-telescope/telescope.nvim",
tag = "0.1.5",
dependencies = { "nvim-lua/plenary.nvim" },
config = function()
-- This is your opts table
require("telescope").setup({
extensions = {
["ui-select"] = {
require("telescope.themes").get_dropdown({
-- even more opts
}),
},
},
},
})
})
-- load_extension, somewhere after setup function:
require("telescope").load_extension("cheat")
require("telescope").load_extension("ui-select")
-- load_extension, somewhere after setup function:
require("telescope").load_extension("cheat")
require("telescope").load_extension("ui-select")
local builtin = require("telescope.builtin")
local builtin = require("telescope.builtin")
vim.keymap.set("n", "<leader>ts", ":Telescope<CR>")
vim.keymap.set("n", "<C-p>", builtin.find_files, {})
vim.keymap.set("n", "<leader><leader>", builtin.oldfiles, {})
vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
vim.keymap.set("n", "<leader>fh", builtin.help_tags, {})
end,
vim.keymap.set("n", "<leader>ts", ":Telescope<CR>")
vim.keymap.set("n", "<C-p>", builtin.find_files, {})
vim.keymap.set("n", "<leader><leader>", builtin.oldfiles, {})
vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
vim.keymap.set("n", "<leader>fh", builtin.help_tags, {})
end,
},
{
"nvim-telescope/telescope-cheat.nvim",
dependencies = {
"kkharji/sqlite.lua",
"nvim-telescope/telescope.nvim",
},
},
{ "nvim-telescope/telescope-symbols.nvim" },
{ "nvim-telescope/telescope-ui-select.nvim" },
}

9
modules/home-manager/files/nvim/lua/plugins/todo-comments.lua Normal file
View file

@ -0,0 +1,9 @@
return {
"folke/todo-comments.nvim",
dependencies = { "nvim-lua/plenary.nvim" },
opts = {
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
},
}

12
modules/home-manager/files/nvim/lua/plugins/treesitter.lua
View file

@ -1,9 +1,9 @@
return {
return {
"nvim-treesitter/nvim-treesitter",
build = ":TSUpdate",
config = function ()
local config = require('nvim-treesitter.configs')
config.setup {
config = function()
local config = require("nvim-treesitter.configs")
config.setup({
auto_install = true,
highlight = { enable = true },
indent = { enable = true },
@ -48,6 +48,6 @@ return {
"xml",
"yaml",
},
}
end
})
end,
}

6
modules/home-manager/files/nvim/lua/plugins/trouble.lua
View file

@ -1,5 +1,5 @@
return {
"folke/trouble.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" },
config = true,
"folke/trouble.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" },
config = true,
}

2
modules/home-manager/files/nvim/lua/plugins/vim-tmux-navigator.lua
View file

@ -1,3 +1,3 @@
return {
"christoomey/vim-tmux-navigator"
"christoomey/vim-tmux-navigator",
}

5
modules/home-manager/files/nvim/lua/plugins/which-key.lua
View file

@ -1 +1,4 @@
return { "folke/which-key.nvim", config = true }
return {
"folke/which-key.nvim",
config = true,
}