From c8a7ff724fb0f635c3a821c755e030490a4ab8ad Mon Sep 17 00:00:00 2001 From: Lucas-Haux Date: Mon, 24 Feb 2025 14:05:19 -0800 Subject: [PATCH] Remove Package: Remove Neovim config --- homeManager/modules/nvim/default.nix | 8 ---- homeManager/modules/nvim/lua/init.lua | 44 ----------------- homeManager/modules/nvim/lua/lua/chadrc.lua | 16 ------- .../modules/nvim/lua/lua/configs/conform.lua | 15 ------ .../modules/nvim/lua/lua/configs/lazy.lua | 47 ------------------- .../nvim/lua/lua/configs/lspconfig.lua | 23 --------- homeManager/modules/nvim/lua/lua/mappings.lua | 10 ---- homeManager/modules/nvim/lua/lua/options.lua | 6 --- .../modules/nvim/lua/lua/plugins/init.lua | 38 --------------- homeManager/server/default.nix | 1 - 10 files changed, 208 deletions(-) delete mode 100644 homeManager/modules/nvim/default.nix delete mode 100644 homeManager/modules/nvim/lua/init.lua delete mode 100644 homeManager/modules/nvim/lua/lua/chadrc.lua delete mode 100644 homeManager/modules/nvim/lua/lua/configs/conform.lua delete mode 100644 homeManager/modules/nvim/lua/lua/configs/lazy.lua delete mode 100644 homeManager/modules/nvim/lua/lua/configs/lspconfig.lua delete mode 100644 homeManager/modules/nvim/lua/lua/mappings.lua delete mode 100644 homeManager/modules/nvim/lua/lua/options.lua delete mode 100644 homeManager/modules/nvim/lua/lua/plugins/init.lua diff --git a/homeManager/modules/nvim/default.nix b/homeManager/modules/nvim/default.nix deleted file mode 100644 index 12bf1dc..0000000 --- a/homeManager/modules/nvim/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, config, ... }: -{ - home.file.".config/nvim" = { - source = ./lua; - recursive = true; - force = true; - }; -} diff --git a/homeManager/modules/nvim/lua/init.lua b/homeManager/modules/nvim/lua/init.lua deleted file mode 100644 index 9e9aef2..0000000 --- a/homeManager/modules/nvim/lua/init.lua +++ /dev/null @@ -1,44 +0,0 @@ -vim.g.base46_cache = vim.fn.stdpath "data" .. "/nvchad/base46/" --- what the -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) - -vim.api.nvim_exec([[ - autocmd VimEnter * hi Normal ctermbg=none guibg=none -]], false) diff --git a/homeManager/modules/nvim/lua/lua/chadrc.lua b/homeManager/modules/nvim/lua/lua/chadrc.lua deleted file mode 100644 index 7dc3d7e..0000000 --- a/homeManager/modules/nvim/lua/lua/chadrc.lua +++ /dev/null @@ -1,16 +0,0 @@ --- This file needs to have same structure as nvconfig.lua --- https://github.com/NvChad/NvChad/blob/v2.5/lua/nvconfig.lua - ----@type ChadrcConfig -local M = {} - -M.ui = { - theme = "blossom_light", - - -- hl_override = { - -- Comment = { italic = true }, - -- ["@comment"] = { italic = true }, - -- }, -} - -return M diff --git a/homeManager/modules/nvim/lua/lua/configs/conform.lua b/homeManager/modules/nvim/lua/lua/configs/conform.lua deleted file mode 100644 index a000447..0000000 --- a/homeManager/modules/nvim/lua/lua/configs/conform.lua +++ /dev/null @@ -1,15 +0,0 @@ -local options = { - formatters_by_ft = { - lua = { "stylua" }, - -- css = { "prettier" }, - -- html = { "prettier" }, - }, - - -- format_on_save = { - -- -- These options will be passed to conform.format() - -- timeout_ms = 500, - -- lsp_fallback = true, - -- }, -} - -require("conform").setup(options) diff --git a/homeManager/modules/nvim/lua/lua/configs/lazy.lua b/homeManager/modules/nvim/lua/lua/configs/lazy.lua deleted file mode 100644 index cd170bd..0000000 --- a/homeManager/modules/nvim/lua/lua/configs/lazy.lua +++ /dev/null @@ -1,47 +0,0 @@ -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/homeManager/modules/nvim/lua/lua/configs/lspconfig.lua b/homeManager/modules/nvim/lua/lua/configs/lspconfig.lua deleted file mode 100644 index a73657a..0000000 --- a/homeManager/modules/nvim/lua/lua/configs/lspconfig.lua +++ /dev/null @@ -1,23 +0,0 @@ --- EXAMPLE -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 = { "html", "cssls" } - --- lsps with default config -for _, lsp in ipairs(servers) do - lspconfig[lsp].setup { - on_attach = on_attach, - on_init = on_init, - capabilities = capabilities, - } -end - --- typescript -lspconfig.tsserver.setup { - on_attach = on_attach, - on_init = on_init, - capabilities = capabilities, -} diff --git a/homeManager/modules/nvim/lua/lua/mappings.lua b/homeManager/modules/nvim/lua/lua/mappings.lua deleted file mode 100644 index 783b78f..0000000 --- a/homeManager/modules/nvim/lua/lua/mappings.lua +++ /dev/null @@ -1,10 +0,0 @@ -require "nvchad.mappings" - --- add yours here - -local map = vim.keymap.set - -map("n", ";", ":", { desc = "CMD enter command mode" }) -map("i", "jk", "") - --- map({ "n", "i", "v" }, "", " w ") diff --git a/homeManager/modules/nvim/lua/lua/options.lua b/homeManager/modules/nvim/lua/lua/options.lua deleted file mode 100644 index 738f20b..0000000 --- a/homeManager/modules/nvim/lua/lua/options.lua +++ /dev/null @@ -1,6 +0,0 @@ -require "nvchad.options" - --- add yours here! - --- local o = vim.o --- o.cursorlineopt ='both' -- to enable cursorline! diff --git a/homeManager/modules/nvim/lua/lua/plugins/init.lua b/homeManager/modules/nvim/lua/lua/plugins/init.lua deleted file mode 100644 index e62d896..0000000 --- a/homeManager/modules/nvim/lua/lua/plugins/init.lua +++ /dev/null @@ -1,38 +0,0 @@ -return { - { - "stevearc/conform.nvim", - -- event = 'BufWritePre', -- uncomment for format on save - config = function() - require "configs.conform" - end, - }, - - -- These are some examples, uncomment them if you want to see them work! - -- { - -- "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" - -- }, - -- }, - -- }, - -- - -- { - -- "nvim-treesitter/nvim-treesitter", - -- opts = { - -- ensure_installed = { - -- "vim", "lua", "vimdoc", - -- "html", "css" - -- }, - -- }, - -- }, -} diff --git a/homeManager/server/default.nix b/homeManager/server/default.nix index ebab64a..094a64a 100644 --- a/homeManager/server/default.nix +++ b/homeManager/server/default.nix @@ -10,7 +10,6 @@ imports = [ ./../modules/starship ./../modules/zsh - ./../modules/nvim ./../modules/yazi ./../modules/git inputs.nix-colors.homeManagerModules.default