Flatten lua config

Sigmanificient · Dec 21, 2023 · 6e546f8 · 6e546f8
1 parent 1688e97
commit 6e546f8
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 29 deletions.
diff --git a/home/nvim/lua/sigma/.editorconfig → home/nvim/.editorconfig b/home/nvim/lua/sigma/.editorconfig → home/nvim/.editorconfig
diff --git a/home/nvim/.vimrc b/home/nvim/.vimrc
@@ -0,0 +1,20 @@
+let mapleader = "\<Space>"
+nnoremap <leader>pv :Ex<CR>
+
+set smartindent
+set tabstop=4
+set softtabstop=4
+set shiftwidth=4
+
+set expandtab
+set number
+set relativenumber
+
+set noswapfile
+set undodir=$HOME/.vim/undodir
+set undofile
+
+set colorcolumn=80
+set cursorline
+
+lua require("init")
diff --git a/home/nvim/default.nix b/home/nvim/default.nix
@@ -9,9 +9,7 @@
   programs.neovim = {
     enable = true;
 
-    extraConfig = ''
-      lua require('sigma')
-    '';
+    extraConfig = (builtins.readFile ./.vimrc);
 
     plugins = with pkgs.vimPlugins; [
       lazy-nvim

diff --git a/home/nvim/lua/init.lua b/home/nvim/lua/init.lua
@@ -0,0 +1 @@
+require("lazy").setup("lazy_plugins")
diff --git a/home/nvim/lua/sigma/lazy.lua → home/nvim/lua/lazy_plugins.lua b/home/nvim/lua/sigma/lazy.lua → home/nvim/lua/lazy_plugins.lua
@@ -1,6 +1,6 @@
 local attach_user_config = function(settings)
   settings["config"] = function()
-    require("sigma.plugins." .. settings["_user_conf"])
+    require("plugins." .. settings["_user_conf"])
   end
 
   return settings

diff --git a/home/nvim/lua/sigma/plugins/colorscheme.lua → home/nvim/lua/plugins/colorscheme.lua b/home/nvim/lua/sigma/plugins/colorscheme.lua → home/nvim/lua/plugins/colorscheme.lua
diff --git a/home/nvim/lua/sigma/plugins/lsp.lua → home/nvim/lua/plugins/lsp.lua b/home/nvim/lua/sigma/plugins/lsp.lua → home/nvim/lua/plugins/lsp.lua
diff --git a/home/nvim/lua/sigma/plugins/lualine.lua → home/nvim/lua/plugins/lualine.lua b/home/nvim/lua/sigma/plugins/lualine.lua → home/nvim/lua/plugins/lualine.lua
diff --git a/home/nvim/lua/sigma/plugins/nvimtree.lua → home/nvim/lua/plugins/nvimtree.lua b/home/nvim/lua/sigma/plugins/nvimtree.lua → home/nvim/lua/plugins/nvimtree.lua
diff --git a/home/nvim/lua/sigma/plugins/telescope.lua → home/nvim/lua/plugins/telescope.lua b/home/nvim/lua/sigma/plugins/telescope.lua → home/nvim/lua/plugins/telescope.lua
diff --git a/home/nvim/lua/sigma/plugins/toggleterm.lua → home/nvim/lua/plugins/toggleterm.lua b/home/nvim/lua/sigma/plugins/toggleterm.lua → home/nvim/lua/plugins/toggleterm.lua
diff --git a/home/nvim/lua/sigma/plugins/treesitter.lua → home/nvim/lua/plugins/treesitter.lua b/home/nvim/lua/sigma/plugins/treesitter.lua → home/nvim/lua/plugins/treesitter.lua
diff --git a/home/nvim/lua/sigma/init.lua b/home/nvim/lua/sigma/init.lua
diff --git a/home/nvim/lua/sigma/remap.lua b/home/nvim/lua/sigma/remap.lua
diff --git a/home/nvim/lua/sigma/settings.lua b/home/nvim/lua/sigma/settings.lua