From 02a6f0b4f8da63fc86591f784a6a071f078d30ea Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Sat, 24 Aug 2024 23:58:52 -0700
Subject: [PATCH] feat: switch to new package-based neovim flake

---
 hosts/adrastea/configuration.nix |  1 -
 hosts/adrastea/default.nix       |  1 -
 hosts/callisto/configuration.nix |  1 -
 hosts/callisto/default.nix       |  1 -
 hosts/demeter/configuration.nix  | 14 --------------
 hosts/demeter/default.nix        |  1 -
 modules/linux/core/default.nix   |  8 ++++++++
 7 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/hosts/adrastea/configuration.nix b/hosts/adrastea/configuration.nix
index 3c49658..4743f82 100755
--- a/hosts/adrastea/configuration.nix
+++ b/hosts/adrastea/configuration.nix
@@ -152,7 +152,6 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    neovim
     wget
     git
     curl
diff --git a/hosts/adrastea/default.nix b/hosts/adrastea/default.nix
index 73d8d16..3a50d07 100644
--- a/hosts/adrastea/default.nix
+++ b/hosts/adrastea/default.nix
@@ -33,7 +33,6 @@
           ../../users/youwen/common
           ../../users/youwen/common/neofetch
           catppuccin.homeManagerModules.catppuccin
-          neovim-config.homeManagerModules.default
         ];
       };
     }
diff --git a/hosts/callisto/configuration.nix b/hosts/callisto/configuration.nix
index bf1b379..643332f 100755
--- a/hosts/callisto/configuration.nix
+++ b/hosts/callisto/configuration.nix
@@ -122,7 +122,6 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    neovim
     wget
     git
     curl
diff --git a/hosts/callisto/default.nix b/hosts/callisto/default.nix
index 7a4a1c6..1e5dd1a 100644
--- a/hosts/callisto/default.nix
+++ b/hosts/callisto/default.nix
@@ -30,7 +30,6 @@
           ../../users/youwen/linux/laptop
           ../../users/youwen/linux/packages/aarch-64
           ./home-manager-extras
-          neovim-config.homeManagerModules.default
           catppuccin.homeManagerModules.catppuccin
         ];
       };
diff --git a/hosts/demeter/configuration.nix b/hosts/demeter/configuration.nix
index 0947df6..e768af7 100755
--- a/hosts/demeter/configuration.nix
+++ b/hosts/demeter/configuration.nix
@@ -135,23 +135,9 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    neovim
     wget
     git
     curl
-    librewolf
-    gnumake
-    gcc
-    cachix
-    gnupg
-    openssh
-    python3
-    steam-run
-
-    # deps for neovim compilation
-    lua51Packages.lua
-    lua51Packages.luarocks
-    tree-sitter
   ];
 
   environment.variables = {
diff --git a/hosts/demeter/default.nix b/hosts/demeter/default.nix
index 9d17948..63229d3 100644
--- a/hosts/demeter/default.nix
+++ b/hosts/demeter/default.nix
@@ -36,7 +36,6 @@
           ../../users/youwen/linux/spicetify
           ./home-manager-extras
           catppuccin.homeManagerModules.catppuccin
-          neovim-config.homeManagerModules.default
         ];
       };
     }
diff --git a/modules/linux/core/default.nix b/modules/linux/core/default.nix
index 63c26fe..829c178 100644
--- a/modules/linux/core/default.nix
+++ b/modules/linux/core/default.nix
@@ -1,4 +1,12 @@
 {
+  inputs,
+  system,
+  ...
+}: {
+  environment.systemPackages = [
+    inputs.personal-neovim.packages.${system}.default
+  ];
+
   security.sudo.enable = false;
 
   security.doas = {