From aed11b7e2ecaf46e41c9100d139949dbf46a4f5c Mon Sep 17 00:00:00 2001
From: Adrien Faure <adrien.faure@protonmail.com>
Date: Mon, 15 Jul 2024 23:41:44 +0200
Subject: [PATCH] home: replace vim with nixvim config

---
 flake.nix                     |  4 +++-
 homes/base.nix                |  2 +-
 homes/modules/vim/default.nix | 32 +++++---------------------------
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8b8d481..6b8c89f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,6 +15,7 @@
       url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nixvim-config.url = "github:adfaure/nixvim-config";
     emacs-overlay.url = "github:nix-community/emacs-overlay";
     catppuccin.url = "github:catppuccin/nix/a48e70a31616cb63e4794fd3465bff1835cc4246";
   };
@@ -27,6 +28,7 @@
     home-manager,
     emacs-overlay,
     catppuccin,
+    nixvim-config,
   }: let
     system = "x86_64-linux";
     pkgs = import nixpkgs {
@@ -67,7 +69,7 @@
         };
       };
       extraSpecialArgs = {
-        inherit my-dotfiles home-module unstable;
+        inherit my-dotfiles home-module unstable nixvim-config system;
       };
     in {
       # Include programs that need X or wayland
diff --git a/homes/base.nix b/homes/base.nix
index 77ca084..f49a770 100644
--- a/homes/base.nix
+++ b/homes/base.nix
@@ -27,7 +27,7 @@
     programs.home-manager.enable = true;
     adfaure.home-modules.vim-tmux-nav-conf.enable = true;
     adfaure.home-modules.eza-alias.enable = true;
-    my-programs.emacs.enable = true;
+    my-programs.emacs.enable = false;
 
     # Small git config (should I make a dedicated module?)
     programs.git = {
diff --git a/homes/modules/vim/default.nix b/homes/modules/vim/default.nix
index 7524c20..683ea3c 100644
--- a/homes/modules/vim/default.nix
+++ b/homes/modules/vim/default.nix
@@ -1,37 +1,15 @@
 {
   config,
+  system,
   lib,
   pkgs,
   my-dotfiles,
+  nixvim-config,
   unstable,
   ...
-}: let
-  my_vim_plugins = pkgs.callPackage ./my_vim_plugins.nix {inherit unstable;};
-in {
+}: {
   home.packages =
     [
-      # (pkgs.callPackage ./my_vim.nix { inherit my-dotfiles; })
-      pkgs.ctags
-      pkgs.ack
-    ]
-    ++ my_vim_plugins.dependencies;
-
-  programs.neovim = {
-    enable = true;
-    catppuccin.enable = true;
-    catppuccin.flavour = "latte";
-    # viAlias = true;
-    # vimAlias = true;
-    # withPython3 = true;
-    # https://github.com/nix-community/home-manager/issues/1712
-
-    extraConfig = builtins.readFile ./vimrc;
-
-    extraLuaConfig = builtins.readFile ./init.lua;
-    plugins = my_vim_plugins.plugins;
-    # extraPackages = with pkgs;
-    #   [ (python3.withPackages (ps: with ps; [ black flake8 jedi ])) rnix-lsp ]
-    #   ++ my_vim_plugins.dependencies;
-    # extraPython3Packages = (ps: with ps; [ jedi ]);
-  };
+      nixvim-config.packages.${system}.default
+    ];
 }