neovim though home-manager

4 files changed, 63 insertions, 11 deletions

diff --git a/modules/home.nix b/modules/home.nix
index 3134961..a7281bd 100644
--- a/modules/home.nix
+++ b/modules/home.nix
@@ -22,6 +22,7 @@
       cargo
       clippy
       # programs
+      adwaita-icon-theme
       cage
       easyeffects
       discord
@@ -55,16 +56,7 @@
       ".zprofile".source = ../files/config/zsh/zprofile;
     };
 
-    xdg.configFile = {
-      iris = {
-        source = ../files/config/iris;
-        recursive = true;
-      };
-      nvim = {
-        source = ../files/config/nvim;
-        recursive = true;
-      };
-    };
+    xdg.configFile = {};
 
     xdg.dataFile = {
       fonts = {
diff --git a/modules/programs/default.nix b/modules/programs/default.nix
index 20c3610..d526fa2 100644
--- a/modules/programs/default.nix
+++ b/modules/programs/default.nix
@@ -8,6 +8,7 @@
 		./hypr
 		./kitty
 		./mako
+		./neovim
 		./starship
 		./waybar
 		./wofi
diff --git a/modules/programs/neovim/default.nix b/modules/programs/neovim/default.nix
new file mode 100644
index 0000000..823d0e4
--- /dev/null
+++ b/modules/programs/neovim/default.nix
@@ -0,0 +1,60 @@
+{ config, lib, pkgs, ... }:
+
+{
+  config = {
+
+    environment.variables.EDITOR = "nvim";
+
+    home-manager.users.${config.user} = {
+      programs.neovim = {
+
+        enable = true;
+
+        viAlias = true;
+        vimAlias = true;
+
+        extraLuaConfig = lib.fileContents ../../../files/config/nvim/init.lua;
+
+        plugins = with pkgs.vimPlugins; [
+          # Deoendencies
+          vim-devicons
+          nvim-web-devicons
+          # Lua functions
+          plenary-nvim
+          # Lines
+          lualine-nvim # mode line
+          bufferline-nvim # buffer line
+          # Menus
+          nvim-tree-lua # file browser
+          undotree # undo menu
+          trouble-nvim # error menu
+          telescope-nvim # grep/find menus
+          # Integrations
+          vim-fugitive # git
+          # Snippets
+          vim-vsnip
+          vim-vsnip-integ
+          friendly-snippets
+          # Completion
+          nvim-cmp
+          cmp-buffer
+          cmp-nvim-lsp
+          cmp-vsnip
+          nvim-surround # delimiter
+          # Lsp
+          nerdcommenter # comment functions
+          nvim-treesitter.withAllGrammars # hilighting
+          vim-illuminate # hilighting
+          todo-comments-nvim # todo comments
+          catppuccin-nvim # theme
+          nvim-lspconfig # lsp server
+          fidget-nvim # notifications
+          indent-o-matic # auto indentation
+          hologram-nvim # images
+          virt-column-nvim # 80 col line
+        ];
+      };
+    };
+
+  };
+}
diff --git a/modules/system.nix b/modules/system.nix
index 8aa02f3..fc08173 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -5,7 +5,6 @@
   # common system packages
   environment.systemPackages = with pkgs; [
     # editor
-    neovim
     vim
     # lib
     libz