diff options
author | Jack Sangdahl <[email protected]> | 2024-05-05 13:51:46 -0600 |
---|---|---|
committer | Jack Sangdahl <[email protected]> | 2024-05-05 13:51:46 -0600 |
commit | fa406573e26bba248a373c7187fc5244d6603868 (patch) | |
tree | f75e319e021325df35387e7dacd10fbb2fe5f06a | |
parent | 2a1e50a6e4708e46405d67f0bd845cd12d80d888 (diff) | |
download | dots-fa406573e26bba248a373c7187fc5244d6603868.tar.gz dots-fa406573e26bba248a373c7187fc5244d6603868.zip |
tidy nvim config
-rw-r--r-- | .config/nvim/init.lua | 36 | ||||
-rw-r--r-- | .config/nvim/lua/chadrc.lua | 7 | ||||
-rw-r--r-- | .config/nvim/lua/configs/lspconfig.lua | 2 | ||||
-rw-r--r-- | .config/nvim/lua/mappings.lua | 1 | ||||
-rw-r--r-- | .config/nvim/lua/options.lua | 1 | ||||
-rw-r--r-- | .config/nvim/lua/plugins.lua (renamed from .config/nvim/lua/plugins/init.lua) | 1 | ||||
-rw-r--r--[l---------] | .pkglist.txt | 58 |
7 files changed, 84 insertions, 22 deletions
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 1152335b..7b9f5b1c 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -1,39 +1,39 @@ -vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" +vim.g.base46_cache = vim.fn.stdpath("data") .. "/nvchad/base46/" vim.g.mapleader = " " -- bootstrap lazy and all plugins -local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" +local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then - local repo = "https://github.com/folke/lazy.nvim.git" - vim.fn.system { "git", "clone", "--filter=blob:none", repo, "--branch=stable", lazypath } + local repo = "https://github.com/folke/lazy.nvim.git" + vim.fn.system({ "git", "clone", "--filter=blob:none", repo, "--branch=stable", lazypath }) end vim.opt.rtp:prepend(lazypath) -local lazy_config = require "configs.lazy" +local lazy_config = require("configs.lazy") -- load plugins require("lazy").setup({ - { - "NvChad/NvChad", - lazy = false, - branch = "v2.5", - import = "nvchad.plugins", - config = function() - require "options" - end, - }, - - { import = "plugins" }, + { + "NvChad/NvChad", + lazy = false, + branch = "v2.5", + import = "nvchad.plugins", + config = function() + require("nvchad.options") + end, + }, + + { require("plugins") }, }, lazy_config) -- load theme dofile(vim.g.base46_cache .. "defaults") dofile(vim.g.base46_cache .. "statusline") -require "nvchad.autocmds" +require("nvchad.autocmds") vim.schedule(function() - require "mappings" + require("nvchad.mappings") end) diff --git a/.config/nvim/lua/chadrc.lua b/.config/nvim/lua/chadrc.lua index d4551929..afd3a99e 100644 --- a/.config/nvim/lua/chadrc.lua +++ b/.config/nvim/lua/chadrc.lua @@ -4,6 +4,13 @@ local M = {} M.ui = { theme = "onenord", theme_toggle = { "onenord", "onenord_light" }, + changed_themes = { + onenord = { + base_16 = { + base00 = "#2E3440", + }, + }, + }, statusline = { theme = "vscode_colored" }, tabufline = { lazyload = true }, nvdash = { load_on_startup = true }, diff --git a/.config/nvim/lua/configs/lspconfig.lua b/.config/nvim/lua/configs/lspconfig.lua index eaf7856f..0ec3ca99 100644 --- a/.config/nvim/lua/configs/lspconfig.lua +++ b/.config/nvim/lua/configs/lspconfig.lua @@ -3,7 +3,7 @@ local on_init = require("nvchad.configs.lspconfig").on_init local capabilities = require("nvchad.configs.lspconfig").capabilities local lspconfig = require("lspconfig") -local servers = { "pylsp", "clangd", "cssls", "rust_analyzer", "marksman", "bash-language-server" } +local servers = { "pylsp", "clangd", "cssls", "rust_analyzer", "marksman" } for _, lsp in ipairs(servers) do lspconfig[lsp].setup({ diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua deleted file mode 100644 index 043f8043..00000000 --- a/.config/nvim/lua/mappings.lua +++ /dev/null @@ -1 +0,0 @@ -require("nvchad.mappings") diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua deleted file mode 100644 index 292dee1a..00000000 --- a/.config/nvim/lua/options.lua +++ /dev/null @@ -1 +0,0 @@ -require "nvchad.options" diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins.lua index babc8ae8..b473cc2d 100644 --- a/.config/nvim/lua/plugins/init.lua +++ b/.config/nvim/lua/plugins.lua @@ -48,6 +48,7 @@ return { }, { "lervag/vimtex", + lazy = false, config = function() require("configs.vimtex") end, diff --git a/.pkglist.txt b/.pkglist.txt index cdc5fc57..08562983 120000..100644 --- a/.pkglist.txt +++ b/.pkglist.txt @@ -1 +1,57 @@ -/var/lib/portage/world
\ No newline at end of file +app-admin/doas +app-admin/yadm +app-arch/zip +app-editors/neovim +app-eselect/eselect-repository +app-laptop/tlp +app-misc/brightnessctl +app-portage/gentoolkit +app-shells/zoxide +app-shells/zsh +app-shells/zsh-completions +app-text/zathura +app-text/zathura-pdf-mupdf +dev-debug/gdb +dev-lang/rust-bin +dev-python/black +dev-python/python-lsp-server +dev-python/uv +dev-util/tokei +gui-apps/grim +gui-apps/gtklock +gui-apps/mako +gui-apps/slurp +gui-apps/swaybg +gui-apps/waybar +gui-apps/wl-clipboard +gui-apps/wofi +gui-wm/sway +media-fonts/noto +media-fonts/noto-emoji +media-gfx/imv +media-libs/harfbuzz +media-libs/libsdl +media-video/ffmpeg +net-dns/bind-tools +net-im/discord +net-libs/nodejs +net-misc/chrony +net-misc/rclone +net-wireless/wpa_supplicant +sys-apps/bat +sys-apps/lsd +sys-apps/ripgrep +sys-auth/pam_u2f +sys-boot/efibootmgr +sys-devel/clang +sys-firmware/intel-microcode +sys-kernel/gentoo-sources +sys-kernel/linux-firmware +sys-power/acpi +sys-power/thermald +sys-process/gotop +www-client/firefox-bin +x11-base/xwayland +x11-drivers/xf86-video-intel +x11-libs/libnotify +x11-libs/pixman |