aboutsummaryrefslogtreecommitdiff
path: root/.config
diff options
context:
space:
mode:
Diffstat (limited to '.config')
-rw-r--r--.config/.gitignore1
-rw-r--r--.config/kernel.config13
-rw-r--r--.config/nvchad/chadrc.lua18
-rw-r--r--.config/nvchad/configs/lspconfig.lua13
-rw-r--r--.config/nvchad/configs/luasnip.lua54
-rw-r--r--.config/nvchad/configs/markdown-preview.lua2
-rw-r--r--.config/nvchad/configs/null-ls.lua40
-rw-r--r--.config/nvchad/configs/overrides.lua44
-rw-r--r--.config/nvchad/mappings.lua9
-rw-r--r--.config/nvchad/plugins.lua73
-rw-r--r--.config/nvim/init.lua39
-rw-r--r--.config/nvim/lazy-lock.json29
-rw-r--r--.config/nvim/lua/chadrc.lua12
-rw-r--r--.config/nvim/lua/configs/conform.lua17
-rw-r--r--.config/nvim/lua/configs/lazy.lua47
-rw-r--r--.config/nvim/lua/configs/lspconfig.lua14
-rw-r--r--.config/nvim/lua/configs/vimtex.lua (renamed from .config/nvchad/configs/vimtex.lua)0
-rw-r--r--.config/nvim/lua/mappings.lua1
-rw-r--r--.config/nvim/lua/options.lua1
-rw-r--r--.config/nvim/lua/plugins/init.lua55
20 files changed, 222 insertions, 260 deletions
diff --git a/.config/.gitignore b/.config/.gitignore
index 205458ab..91e6d8ca 100644
--- a/.config/.gitignore
+++ b/.config/.gitignore
@@ -2,7 +2,6 @@ BetterDiscord*
dconf
discord
mimeapps.list
-nvim
pulse
qmk
rclone
diff --git a/.config/kernel.config b/.config/kernel.config
index ee0d85a7..ecbc897c 100644
--- a/.config/kernel.config
+++ b/.config/kernel.config
@@ -1,13 +1,13 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.8.1-gentoo Kernel Configuration
+# Linux/x86 6.8.9-gentoo Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="clang version 18.1.2"
+CONFIG_CC_VERSION_TEXT="clang version 18.1.4"
CONFIG_GCC_VERSION=0
CONFIG_CC_IS_CLANG=y
-CONFIG_CLANG_VERSION=180102
+CONFIG_CLANG_VERSION=180104
CONFIG_AS_IS_LLVM=y
-CONFIG_AS_VERSION=180102
+CONFIG_AS_VERSION=180104
CONFIG_LD_VERSION=0
CONFIG_LD_IS_LLD=y
CONFIG_LLD_VERSION=170006
@@ -436,7 +436,7 @@ CONFIG_CALL_PADDING=y
CONFIG_HAVE_CALL_THUNKS=y
CONFIG_CALL_THUNKS=y
CONFIG_PREFIX_SYMBOLS=y
-CONFIG_SPECULATION_MITIGATIONS=y
+CONFIG_CPU_MITIGATIONS=y
CONFIG_PAGE_TABLE_ISOLATION=y
CONFIG_RETPOLINE=y
CONFIG_RETHUNK=y
@@ -449,6 +449,7 @@ CONFIG_CPU_IBRS_ENTRY=y
# CONFIG_SLS is not set
# CONFIG_GDS_FORCE_MITIGATION is not set
CONFIG_MITIGATION_RFDS=y
+CONFIG_MITIGATION_SPECTRE_BHI=y
CONFIG_ARCH_HAS_ADD_PAGES=y
#
@@ -593,6 +594,7 @@ CONFIG_AS_SHA256_NI=y
CONFIG_AS_TPAUSE=y
CONFIG_AS_GFNI=y
CONFIG_AS_WRUSS=y
+CONFIG_ARCH_CONFIGURES_CPU_MITIGATIONS=y
#
# General architecture-dependent options
@@ -1191,7 +1193,6 @@ CONFIG_BT_RFCOMM=y
# CONFIG_BT_RFCOMM_TTY is not set
# CONFIG_BT_BNEP is not set
CONFIG_BT_HIDP=y
-CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_LE_L2CAP_ECRED=y
# CONFIG_BT_LEDS is not set
diff --git a/.config/nvchad/chadrc.lua b/.config/nvchad/chadrc.lua
deleted file mode 100644
index 62c4cb5d..00000000
--- a/.config/nvchad/chadrc.lua
+++ /dev/null
@@ -1,18 +0,0 @@
----@type ChadrcConfig
-local M = {}
-
-M.ui = {
- statusline = {
- theme = "vscode_colored",
- },
- tabufline = {
- lazyload = true,
- },
- theme = "onenord",
- theme_toggle = "onenord_light",
-}
-
-M.plugins = "custom.plugins"
--- M.mappings = require "custom.mappings"
-
-return M
diff --git a/.config/nvchad/configs/lspconfig.lua b/.config/nvchad/configs/lspconfig.lua
deleted file mode 100644
index 1f56f71f..00000000
--- a/.config/nvchad/configs/lspconfig.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-local on_attach = require("plugins.configs.lspconfig").on_attach
-local capabilities = require("plugins.configs.lspconfig").capabilities
-
-local lspconfig = require "lspconfig"
-
-local servers = { "pylsp", "clangd", "cssls" }
-
-for _, lsp in ipairs(servers) do
- lspconfig[lsp].setup {
- on_attach = on_attach,
- capabilities = capabilities,
- }
-end
diff --git a/.config/nvchad/configs/luasnip.lua b/.config/nvchad/configs/luasnip.lua
deleted file mode 100644
index c8642e64..00000000
--- a/.config/nvchad/configs/luasnip.lua
+++ /dev/null
@@ -1,54 +0,0 @@
-require("luasnip.loaders.from_vscode").load {
- exclude = {
- "cobol",
- "csharp",
- "css",
- "docker",
- "frameworks",
- "java",
- "javascript",
- "lua",
- "php",
- "PowerShell",
- "dart",
- "eelixir",
- "elixir",
- "erb",
- "erlang",
- "fennel",
- "fortran",
- "fsh",
- "gdscript",
- "gitcommit",
- "global",
- "glsl",
- "go",
- "haskell",
- "html",
- "julia",
- "kotlin",
- "kubernetes",
- "license",
- "liquid",
- "make",
- "mint",
- "norg",
- "nushell",
- "objc",
- "org",
- "plantuml",
- "quarto",
- "r",
- "rescript",
- "rmarkdown",
- "ruby",
- "scala",
- "solidity",
- "sql",
- "svelte",
- "swift",
- "systemverilog",
- "verilog",
- "vhdl",
- },
-}
diff --git a/.config/nvchad/configs/markdown-preview.lua b/.config/nvchad/configs/markdown-preview.lua
deleted file mode 100644
index a2338ae4..00000000
--- a/.config/nvchad/configs/markdown-preview.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-vim.g.mkdp_filetypes = { "markdown" }
-vim.g.mkdp_theme = 'light'
diff --git a/.config/nvchad/configs/null-ls.lua b/.config/nvchad/configs/null-ls.lua
deleted file mode 100644
index 250fc613..00000000
--- a/.config/nvchad/configs/null-ls.lua
+++ /dev/null
@@ -1,40 +0,0 @@
-local present, null_ls = pcall(require, "null-ls")
-
-if not present then
- return
-end
-
-local b = null_ls.builtins
-
-local sources = {
- -- lua
- b.formatting.stylua,
-
- -- cpp
- b.formatting.clang_format,
-
- -- rust
- b.formatting.rustfmt,
-
- -- python
- b.formatting.black,
-
- -- latex
- b.formatting.latexindent,
-
- -- bash
- b.formatting.beautysh,
-}
-
-null_ls.setup({
- debug = false,
- sources = sources,
-})
-
-local notify = vim.notify
-vim.notify = function(msg, ...)
- if msg:match("warning: multiple different client offset_encodings") then
- return
- end
- notify(msg, ...)
-end
diff --git a/.config/nvchad/configs/overrides.lua b/.config/nvchad/configs/overrides.lua
deleted file mode 100644
index b525c733..00000000
--- a/.config/nvchad/configs/overrides.lua
+++ /dev/null
@@ -1,44 +0,0 @@
-local M = {}
-
-M.treesitter = {
- ensure_installed = {
- "vim",
- "lua",
- "html",
- "css",
- "cpp",
- "c",
- "markdown",
- "markdown_inline",
- },
- indent = {
- enable = true,
- },
-}
-
-M.mason = {
- ensure_installed = {
- "lua-language-server",
- "stylua",
-
- "clangd",
- "clang-format",
- },
-}
-
-M.nvimtree = {
- git = {
- enable = true,
- },
-
- renderer = {
- highlight_git = true,
- icons = {
- show = {
- git = true,
- },
- },
- },
-}
-
-return M
diff --git a/.config/nvchad/mappings.lua b/.config/nvchad/mappings.lua
deleted file mode 100644
index 64dcf59c..00000000
--- a/.config/nvchad/mappings.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-local M = {}
-
-M.general = {
- i = {
- ["<C-l>"] = { "<C-g>u<Esc>[s1z=`]a<C-g>u", "spell check and fix", opts = { noremap = true } },
- },
-}
-
-return M
diff --git a/.config/nvchad/plugins.lua b/.config/nvchad/plugins.lua
deleted file mode 100644
index 00691aa9..00000000
--- a/.config/nvchad/plugins.lua
+++ /dev/null
@@ -1,73 +0,0 @@
-local overrides = require("custom.configs.overrides")
-
----@type NvPluginSpec[]
-local plugins = {
-
- {
- "neovim/nvim-lspconfig",
- dependencies = {
- {
- "jose-elias-alvarez/null-ls.nvim",
- config = function()
- require("custom.configs.null-ls")
- end,
- },
- },
- config = function()
- require("plugins.configs.lspconfig")
- require("custom.configs.lspconfig")
- end,
- },
-
- {
- "williamboman/mason.nvim",
- opts = overrides.mason,
- },
-
- {
- "nvim-treesitter/nvim-treesitter",
- opts = overrides.treesitter,
- },
-
- {
- "nvim-tree/nvim-tree.lua",
- opts = overrides.nvimtree,
- },
-
- {
- "max397574/better-escape.nvim",
- event = "InsertEnter",
- config = function()
- require("better_escape").setup()
- end,
- },
-
- {
- "lervag/vimtex",
- lazy = false,
- config = function()
- require("custom.configs.vimtex")
- end,
- },
-
- {
- "L3MON4D3/LuaSnip",
- dependencies = { "rafamadriz/friendly-snippets" },
- config = function()
- require("custom.configs.luasnip")
- end,
- lazy = false,
- },
-
- {
- "iamcco/markdown-preview.nvim",
- cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
- build = "cd app && npm install",
- config = function()
- require("custom.configs.markdown-preview")
- end,
- ft = { "markdown" },
- },
-}
-
-return plugins
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
new file mode 100644
index 00000000..1152335b
--- /dev/null
+++ b/.config/nvim/init.lua
@@ -0,0 +1,39 @@
+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"
+
+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 }
+end
+
+vim.opt.rtp:prepend(lazypath)
+
+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" },
+}, lazy_config)
+
+-- load theme
+dofile(vim.g.base46_cache .. "defaults")
+dofile(vim.g.base46_cache .. "statusline")
+
+require "nvchad.autocmds"
+
+vim.schedule(function()
+ require "mappings"
+end)
diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
new file mode 100644
index 00000000..3d52bc08
--- /dev/null
+++ b/.config/nvim/lazy-lock.json
@@ -0,0 +1,29 @@
+{
+ "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
+ "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" },
+ "NvChad": { "branch": "v2.5", "commit": "156eeef8ecae812acd79d5eb58070d734a6202c6" },
+ "base46": { "branch": "v2.5", "commit": "bcc9ed2e88ef55b7e9d50b2f80f6a2d4b8080b1d" },
+ "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
+ "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
+ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
+ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
+ "conform.nvim": { "branch": "master", "commit": "12b3995537f52ba2810a9857e8ca256881febbda" },
+ "friendly-snippets": { "branch": "main", "commit": "fa36367422da5a38560892e3db6d090a635d9d41" },
+ "gitsigns.nvim": { "branch": "main", "commit": "bc933d24a669608968ff4791b14d2d9554813a65" },
+ "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
+ "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" },
+ "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
+ "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" },
+ "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
+ "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" },
+ "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" },
+ "nvim-tree.lua": { "branch": "master", "commit": "64f61e4c913047a045ff90bd188dd3b54ee443cf" },
+ "nvim-treesitter": { "branch": "master", "commit": "4e21361e15b1d4147830c5fe571556eb1b14e6f9" },
+ "nvim-web-devicons": { "branch": "master", "commit": "475fbcfcb6ee7c35aa33a6b6207ebd4032791d87" },
+ "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
+ "telescope.nvim": { "branch": "master", "commit": "fac83a556e7b710dc31433dec727361ca062dbe9" },
+ "ui": { "branch": "v2.5", "commit": "9c16efc915346c7bde5288ad94f0ea40a7267d31" },
+ "vimtex": { "branch": "master", "commit": "137f5bded9ce554018c47f4c9c59cddb8ac9a455" },
+ "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
+} \ No newline at end of file
diff --git a/.config/nvim/lua/chadrc.lua b/.config/nvim/lua/chadrc.lua
new file mode 100644
index 00000000..d4551929
--- /dev/null
+++ b/.config/nvim/lua/chadrc.lua
@@ -0,0 +1,12 @@
+---@type ChadrcConfig
+local M = {}
+
+M.ui = {
+ theme = "onenord",
+ theme_toggle = { "onenord", "onenord_light" },
+ statusline = { theme = "vscode_colored" },
+ tabufline = { lazyload = true },
+ nvdash = { load_on_startup = true },
+}
+
+return M
diff --git a/.config/nvim/lua/configs/conform.lua b/.config/nvim/lua/configs/conform.lua
new file mode 100644
index 00000000..838a8dad
--- /dev/null
+++ b/.config/nvim/lua/configs/conform.lua
@@ -0,0 +1,17 @@
+local options = {
+ formatters_by_ft = {
+ python = { "black" },
+ rust = { "rustfmt" },
+ lua = { "stylua" },
+ cpp = { "clang-format" },
+ c = { "clang-format" },
+ css = { "prettier" },
+ html = { "prettier" },
+ },
+ format_on_save = {
+ timeout_ms = 500,
+ lsp_fallback = true,
+ },
+}
+
+require("conform").setup(options)
diff --git a/.config/nvim/lua/configs/lazy.lua b/.config/nvim/lua/configs/lazy.lua
new file mode 100644
index 00000000..cd170bd3
--- /dev/null
+++ b/.config/nvim/lua/configs/lazy.lua
@@ -0,0 +1,47 @@
+return {
+ defaults = { lazy = true },
+ install = { colorscheme = { "nvchad" } },
+
+ ui = {
+ icons = {
+ ft = "",
+ lazy = "󰂠 ",
+ loaded = "",
+ not_loaded = "",
+ },
+ },
+
+ performance = {
+ rtp = {
+ disabled_plugins = {
+ "2html_plugin",
+ "tohtml",
+ "getscript",
+ "getscriptPlugin",
+ "gzip",
+ "logipat",
+ "netrw",
+ "netrwPlugin",
+ "netrwSettings",
+ "netrwFileHandlers",
+ "matchit",
+ "tar",
+ "tarPlugin",
+ "rrhelper",
+ "spellfile_plugin",
+ "vimball",
+ "vimballPlugin",
+ "zip",
+ "zipPlugin",
+ "tutor",
+ "rplugin",
+ "syntax",
+ "synmenu",
+ "optwin",
+ "compiler",
+ "bugreport",
+ "ftplugin",
+ },
+ },
+ },
+}
diff --git a/.config/nvim/lua/configs/lspconfig.lua b/.config/nvim/lua/configs/lspconfig.lua
new file mode 100644
index 00000000..eaf7856f
--- /dev/null
+++ b/.config/nvim/lua/configs/lspconfig.lua
@@ -0,0 +1,14 @@
+local on_attach = require("nvchad.configs.lspconfig").on_attach
+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" }
+
+for _, lsp in ipairs(servers) do
+ lspconfig[lsp].setup({
+ on_attach = on_attach,
+ on_init = on_init,
+ capabilities = capabilities,
+ })
+end
diff --git a/.config/nvchad/configs/vimtex.lua b/.config/nvim/lua/configs/vimtex.lua
index c25558d5..c25558d5 100644
--- a/.config/nvchad/configs/vimtex.lua
+++ b/.config/nvim/lua/configs/vimtex.lua
diff --git a/.config/nvim/lua/mappings.lua b/.config/nvim/lua/mappings.lua
new file mode 100644
index 00000000..043f8043
--- /dev/null
+++ b/.config/nvim/lua/mappings.lua
@@ -0,0 +1 @@
+require("nvchad.mappings")
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
new file mode 100644
index 00000000..292dee1a
--- /dev/null
+++ b/.config/nvim/lua/options.lua
@@ -0,0 +1 @@
+require "nvchad.options"
diff --git a/.config/nvim/lua/plugins/init.lua b/.config/nvim/lua/plugins/init.lua
new file mode 100644
index 00000000..babc8ae8
--- /dev/null
+++ b/.config/nvim/lua/plugins/init.lua
@@ -0,0 +1,55 @@
+return {
+ {
+ "stevearc/conform.nvim",
+ event = "BufWritePre",
+ config = function()
+ require("configs.conform")
+ end,
+ },
+ {
+ "neovim/nvim-lspconfig",
+ config = function()
+ require("nvchad.configs.lspconfig").defaults()
+ require("configs.lspconfig")
+ end,
+ },
+ {
+ "williamboman/mason.nvim",
+ opts = {
+ ensure_installed = {
+ "lua-language-server",
+ "stylua",
+ "html-lsp",
+ "css-lsp",
+ "prettier",
+ "bash-language-server",
+ "marksman",
+ },
+ },
+ },
+ {
+ "nvim-treesitter/nvim-treesitter",
+ opts = {
+ ensure_installed = {
+ "vim",
+ "lua",
+ "vimdoc",
+ "html",
+ "css",
+ "python",
+ "rust",
+ "cpp",
+ "c",
+ "bash",
+ "html",
+ "markdown",
+ },
+ },
+ },
+ {
+ "lervag/vimtex",
+ config = function()
+ require("configs.vimtex")
+ end,
+ },
+}