Refactored home and hardware files, and added new plugins to neovim.

This commit is contained in:
2025-08-24 11:38:11 -04:00
parent 1564a9f1ec
commit 761525421d
29 changed files with 180 additions and 90 deletions

View File

@@ -1,30 +1,48 @@
local vim = vim
require("options") -- ~/.nixos/home/config/nvim/lua/options.lua
require("plugins") -- ~/.nixos/home/config/nvim/lua/plugins.lua
require("utils.t3_functions") -- ~/.nixos/home/config/nvim/lua/utils/t3_functions.lua
require("utils.t3_overrides") -- ~/.nixos/home/config/nvim/lua/utils/t3_overrides.lua
require("utils.reload") -- ~/.nixos/home/config/nvim/lua/utils/reload.lua
require("vimwiki") -- ~/.nixos/home/config/nvim/lua/vimwiki.lua
require("keymaps") -- ~/.nixos/home/config/nvim/lua/keymaps.lua
require("lsp") -- ~/.nixos/home/config/nvim/lua/lsp.lua
require("completion") -- ~/.nixos/home/config/nvim/lua/completion.lua
require("treesitter") -- ~/.nixos/home/config/nvim/lua/treesitter.lua
require("autocmds") -- ~/.nixos/home/config/nvim/lua/autocmds.lua
require("diagnostics") -- ~/.nixos/home/config/nvim/lua/diagnostics.lua
local host = vim.loop.os_gethostname()
require("options") -- /etc/nixos/home/.config/nvim/lua/options.lua
require("plugins") -- /etc/nixos/home/.config/nvim/lua/plugins.lua
require("utils.t3_functions") -- /etc/nixos/home/.config/nvim/lua/utils/t3_functions.lua
require("utils.t3_overrides") -- /etc/nixos/home/.config/nvim/lua/utils/t3_overrides.lua
require("utils.reload") -- /etc/nixos/home/.config/nvim/lua/utils/reload.lua
require("vimwiki") -- /etc/nixos/home/.config/nvim/lua/vimwiki.lua
require("keymaps") -- /etc/nixos/home/.config/nvim/lua/keymaps.lua
require("lsp") -- /etc/nixos/home/.config/nvim/lua/lsp.lua
require("completion") -- /etc/nixos/home/.config/nvim/lua/completion.lua
require("treesitter") -- /etc/nixos/home/.config/nvim/lua/treesitter.lua
require("autocmds") -- /etc/nixos/home/.config/nvim/lua/autocmds.lua
require("diagnostics") -- /etc/nixos/home/.config/nvim/lua/diagnostics.lua
require('telescope_configuration') -- /etc/nixos/home/.config/nvim/lua/telescope_configuration.lua
require('tokyonight').setup({
style = "moon", -- "storm", "moon", "day", "night"
transparent = true, -- Enable transparent background
terminal_colors = true, -- Enable terminal colors
styles = {
comments = { italic = true }, -- Italic comments
keywords = { italic = true }, -- Italic keywords
functions = { bold = true }, -- Bold functions
variables = {}, -- No special style for variables
sidebars = "dark", -- Dark sidebars
floats = "dark", -- Dark floating windows
},
})
if host == "xps13" then
require('tokyonight').setup({
style = "moon", -- "storm", "moon", "day", "night"
transparent = true, -- Enable transparent background
terminal_colors = true, -- Enable terminal colors
styles = {
comments = { italic = true }, -- Italic comments
keywords = { italic = true }, -- Italic keywords
functions = { bold = true }, -- Bold functions
variables = {}, -- No special style for variables
sidebars = "dark", -- Dark sidebars
floats = "dark", -- Dark floating windows
},
})
elseif host == "Titan" then
require('tokyonight').setup({
style = "storm", -- "storm", "moon", "day", "night"
transparent = false, -- Enable transparent background
terminal_colors = true, -- Enable terminal colors
styles = {
comments = { italic = true }, -- Italic comments
keywords = { italic = true }, -- Italic keywords
functions = { bold = true }, -- Bold functions
variables = {}, -- No special style for variables
sidebars = "dark", -- Dark sidebars
floats = "dark", -- Dark floating windows
},
})
end
local function is_linux_console()
return vim.env.TERM == "linux"

View File

@@ -64,6 +64,33 @@ vim.keymap.set("n", "<A-8>", "<Cmd>BufferGoto 8<CR>", { desc = "Go to Buffer 8"
vim.keymap.set("n", "<A-9>", "<Cmd>BufferGoto 9<CR>", { desc = "Go to Buffer 9" })
vim.keymap.set("n", "<A-0>", "<Cmd>BufferLast<CR>", { desc = "Go to Last Buffer" })
-- Meta X Maps
vim.keymap.set("n", "<M-x><M-x>", ":Telescope commands<CR>", { desc = "Commands"})
vim.keymap.set("n", "<M-x>b", ":Telescope buffers<CR>", { desc = "Buffers"})
vim.keymap.set("n", "<M-x>f", ":Telescope find_files<CR>", { desc = "Find Files"})
vim.keymap.set("n", "<M-x>g", ":Telescope live_grep<CR>", { desc = "Live Grep"})
vim.keymap.set("n", "<M-x>h", ":Telescope help_tags<CR>", { desc = "Help Tags"})
vim.keymap.set("n", "<M-x>p", ":Telescope project<CR>", { desc = "Projects"})
vim.keymap.set("n", "<M-x>l", ":Telescope resume<CR>", { desc = "Resume Last Search"})
vim.keymap.set("n", "<M-x>c", ":Telescope colorscheme<CR>", { desc = "Colorschemes"})
vim.keymap.set("n", "<M-x>n", ":enew<CR>", { desc = "New File"})
vim.keymap.set("n", "<M-x>s", ":w<CR>", { desc = "Save File"})
vim.keymap.set("n", "<M-x>q", ":q<CR>", { desc = "Quit"})
vim.keymap.set("n", "<M-x>w", ":bd<CR>", { desc = "Close Buffer"})
vim.keymap.set("n", "<M-x>a", "ggVG", { desc = "Select All"})
vim.keymap.set("n", "<M-x>z", "u", { desc = "Undo"})
vim.keymap.set("n", "<M-x>y", "<C-r>", { desc = "Redo"})
vim.keymap.set("n", "<M-x>/", ":nohlsearch<CR>", { desc = "Clear Search Highlight"})
vim.keymap.set("n", "<M-x>=", ":vertical resize +5<CR>", { desc = "Increase Window Width"})
vim.keymap.set("n", "<M-x>-"," :vertical resize -5<CR>", { desc = "Decrease Window Width"})
vim.keymap.set("n", "<M-x>+", ":resize +5<CR>", { desc = "Increase Window Height"})
vim.keymap.set("n", "<M-x>_", ":resize -5<CR>", { desc = "Decrease Window Height"})
vim.keymap.set("n", "<M-x>Left", ":vertical resize -5<CR>", { desc = "Decrease Window Width"})
vim.keymap.set("n", "<M-x>Right"," :vertical resize +5<CR>", { desc = "Increase Window Width"})
vim.keymap.set("n", "<M-x>Up", ":resize +5<CR>", { desc = "Increase Window Height"})
vim.keymap.set("n", "<M-x>Down", ":resize -5<CR>", { desc = "Decrease Window Height"})
vim.keymap.set("n", "<M-x>Enter", ":ToggleTerm<CR>", { desc = "Toggle Terminal"})
-- CTRL X Maps
vim.keymap.set("n", "<C-x><C-b>", ":Pick buffers<CR>", { desc = "Buffer Picker"})
@@ -72,10 +99,6 @@ vim.keymap.set("n", "<C-x><C-h>", ":Pick help<CR>", { desc = "Help Picker"})
vim.keymap.set("n", "<C-x><C-g>", "", { desc = "Grep"})
vim.keymap.set("n", "<C-x><C-g>g", ":Pick grep<CR>", { desc = "Grep"})
vim.keymap.set("n", "<C-x><C-g>l", ":Pick grep_live<CR>", { desc = "Live Grep"})
vim.keymap.set("v", "<C-x><C-c>", ":'<,'>SnipRun<CR>", { silent = true, desc = "Run Selection" })
vim.keymap.set("n", "<C-x><C-c>", ":<Plug>SnipRun<CR>", { desc = "Run Current Line" })
vim.keymap.set("n", "<C-x><C-b>", ":%SnipRun<CR>", { desc = "Run Buffer" })
vim.keymap.set("n", "<C-x><C-k>", "<Plug>SnipReset<CR>", { desc = "Run Buffer" })
vim.keymap.set("n", "<C-x><C-n>", "", { desc = "Notes"})
vim.keymap.set("n", "<C-x><C-n>e", "<cmd>TWEditTask<cr>", { desc = "TaskWarrior Edit", noremap = true, silent = true })
vim.keymap.set("n", "<C-x><C-n>v", "<cmd>TWView<cr>", { desc = "View Tasks", noremap = true, silent = true })
@@ -83,3 +106,7 @@ vim.keymap.set("n", "<C-x><C-n>u", "<cmd>TWUpdateCurrent<cr>", { desc="Update Ta
vim.keymap.set("n", "<C-x><C-n>s", "<cmd>TWSyncTasks<cr>", { desc = "Sync Tasks", noremap = true, silent = true })
vim.keymap.set("n", "<C-x><C-n><c-space>", "<cmd>TWToggle<cr>", { desc = "Toggle Taskwarrior", silent = true })
vim.keymap.set("v", "<C-;><C-c>", ":'<,'>SnipRun<CR>", { silent = true, desc = "Run Selection" })
vim.keymap.set("n", "<C-;><C-c>", ":<Plug>SnipRun<CR>", { desc = "Run Current Line" })
vim.keymap.set("n", "<C-;><C-b>", ":%SnipRun<CR>", { desc = "Run Buffer" })
vim.keymap.set("n", "<C-;><C-k>", "<Plug>SnipReset<CR>", { desc = "Run Buffer" })

View File

@@ -12,14 +12,14 @@ vim.o.wildmode = "longest:full,full"
vim.o.wildoptions = "pum"
vim.g.mapleader = " "
vim.o.termguicolors = true
vim.o.winborder = "double"
vim.o.winborder = "shadow"
vim.o.clipboard = "unnamedplus"
vim.o.completeopt = "menuone"
-- vim.o.completeopt = "menuone,noinsert,noselect"
vim.o.cursorline = true
vim.o.sessionoptions="blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
vim.g.netrw_keepdir = 1
vim.g.netrw_winsize = 15
vim.g.netrw_winsize = 20
vim.g.netrw_banner = 0
vim.g.netrw_localcopydircmd = 'cp -avr'
vim.g.netrw_liststyle = 3

View File

@@ -1,4 +1,6 @@
local vim = vim
local host = vim.loop.os_gethostname()
vim.pack.add({
{ src = "https://github.com/folke/tokyonight.nvim" },
{ src = "https://github.com/nvim-tree/nvim-web-devicons" },
@@ -25,9 +27,6 @@ vim.pack.add({
{ src = "https://github.com/saadparwaiz1/cmp_luasnip" },
{ src = "https://github.com/github/copilot.vim" },
{ src = "https://github.com/pysan3/pathlib.nvim" },
-- { src = "https://github.com/nvim-orgmode/orgmode" },
-- { src = "https://github.com/chipsenkbeil/org-roam.nvim" },
-- { src = "https://github.com/danilshvalov/org-modern.nvim" },
{ src = "https://github.com/nvim-orgmode/org-bullets.nvim" },
{ src = "https://github.com/lukas-reineke/headlines.nvim" },
{ src = "https://github.com/michaelb/sniprun", run = "bash install.sh 1" },
@@ -49,8 +48,18 @@ vim.pack.add({
{ src = "https://github.com/rmagatti/logger.nvim" },
{ src = "https://github.com/rmagatti/goto-preview" },
{ src = "https://github.com/norcalli/nvim-colorizer.lua" },
{ src = "https://github.com/nvim-lua/plenary.nvim" },
{ src = "https://github.com/nvim-telescope/telescope.nvim" },
{ src = "https://github.com/nvim-telescope/telescope-project.nvim"},
{ src = "https://github.com/nvim-telescope/telescope-ui-select.nvim" },
{ src = "https://github.com/luckasRanarison/nvim-devdocs" },
{ src = "https://github.com/folke/noice.nvim" },
{ src = "https://github.com/mbbill/undotree.git" },
})
if host == "xps13" then
end
require('mini.icons').setup({})
require('mini.pick').setup({})
require('mini.pairs').setup({})
@@ -82,12 +91,6 @@ require('todo-comments').setup({
}
})
require('trouble').setup({})
-- require('orgmode').setup({
-- org_agenda_files = { '~/org/*' },
-- org_default_notes_file = '~/org/notes.org',
-- })
-- require('org-roam').setup({ directory = '~/org/roam' })
-- require("orgmode").setup({})
require('org-bullets').setup({})
require('headlines').setup({})
require('sniprun').setup({
@@ -114,3 +117,22 @@ require("auto-session").setup({
require('barbar').setup({})
require('goto-preview').setup({ default_mappings = true })
require('colorizer').setup({})
require('telescope').setup({})
require('nvim-devdocs').setup({})
require('noice').setup({
lsp = {
override = {
["vim.lsp.util.convert_input_to_markdown_lines"] = true,
["vim.lsp.util.stylize_markdown"] = true,
["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp
},
},
presets = {
bottom_search = true, -- use a classic bottom cmdline for search
command_palette = true, -- position the cmdline and popupmenu together
long_message_to_split = true, -- long messages will be sent to a split
inc_rename = false, -- enables an input dialog for inc-rename.nvim
lsp_doc_border = false, -- add a border to hover docs and signature help
},
})

View File

@@ -0,0 +1,32 @@
local vim = vim
local host = vim.loop.os_gethostname()
require('telescope').load_extension('project')
require('telescope').load_extension('ui-select')
require('telescope').setup{
defaults = {
mappings = {
i = {
["<C-u>"] = false,
["<C-d>"] = false,
},
},
},
pickers = {
-- Default configuration for builtin pickers goes here:
-- picker_name = {
-- picker_config_key = value,
-- ...
-- }
-- Now the picker_config_key will be applied every time you call this
-- builtin picker
},
extensions = {
["ui-select"] = {
require("telescope.themes").get_dropdown {
-- even more opts
}
},
}
}