From d03fb5c0749232493b6d47e31d48ec33a71bc7e3 Mon Sep 17 00:00:00 2001
From: Daryl Ronningen <relms@relms.dev>
Date: Thu, 2 Feb 2023 01:37:48 -0800
Subject: [PATCH] split neovim into its own folder and its own packages

---
 flake.nix              |  1 +
 users/relms/dev.nix    | 15 ---------------
 users/relms/gui.nix    |  1 -
 users/relms/neovim.nix | 25 +++++++++++++++++++++++++
 4 files changed, 26 insertions(+), 16 deletions(-)
 create mode 100644 users/relms/neovim.nix

diff --git a/flake.nix b/flake.nix
index 2c9dc0c..850b613 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,6 +51,7 @@
         ];
         dev = [
           ./users/relms/dev.nix
+          ./users/relms/neovim.nix
         ];
         gui = [
           ./users/relms/gui.nix
diff --git a/users/relms/dev.nix b/users/relms/dev.nix
index a1a2db9..397fb5c 100644
--- a/users/relms/dev.nix
+++ b/users/relms/dev.nix
@@ -1,10 +1,6 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    gcc12
-    xsel
-    wget
     rustup
-    tree-sitter
   ];
 
   programs.git = {
@@ -41,17 +37,6 @@
     };
   };
 
-  programs.neovim = {
-    enable = true;
-    package = pkgs.neovim;
-    viAlias = true;
-    vimAlias = true;
-    vimdiffAlias = true;
-    withNodeJs = true;
-    withPython3 = true;
-    withRuby = true;
-  };
-
   programs.direnv.enable = true;
   programs.direnv.nix-direnv.enable = true;
 
diff --git a/users/relms/gui.nix b/users/relms/gui.nix
index 6633b70..ca43c36 100644
--- a/users/relms/gui.nix
+++ b/users/relms/gui.nix
@@ -5,7 +5,6 @@
     gnome.gnome-software
     adw-gtk3
     numix-icon-theme-circle
-    numix-cursor-theme
     (st.overrideAttrs (oldAttrs: {
       src = builtins.fetchTarball {
         url = "https://code.relms.dev/Relms/st/archive/9973cc2bdd0b18f134b8065f8a840a77002cd977.tar.gz";
diff --git a/users/relms/neovim.nix b/users/relms/neovim.nix
new file mode 100644
index 0000000..99dc109
--- /dev/null
+++ b/users/relms/neovim.nix
@@ -0,0 +1,25 @@
+{pkgs, ...}: {
+  programs.neovim = {
+    enable = true;
+    package = pkgs.neovim;
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+    vimdiffAlias = true;
+    withNodeJs = true;
+    withPython3 = true;
+    withRuby = true;
+    extraPackages = with pkgs; [
+      wget
+      gcc12
+      tree-sitter
+      xsel
+      stylua
+      sumneko-lua-language-server
+      actionlint
+    ];
+    extraPython3Packages = pyPkgs: with pyPkgs; [
+		pip
+		];
+  };
+}