From b420e596742233cf9b39edd309b294e413bb153a Mon Sep 17 00:00:00 2001
From: traxys <quentin@familleboyer.net>
Date: Sun, 6 Feb 2022 14:05:32 +0100
Subject: [PATCH] use nvim env flake

---
 flake.nix | 24 ++++--------------------
 home.nix  | 14 --------------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/flake.nix b/flake.nix
index ffffb82..9f90323 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,20 +12,8 @@
         url = "github:mozilla/nixpkgs-mozilla";
         flake = false;
       };
-      rnix-lsp = {
-        url = "github:nix-community/rnix-lsp";
-        inputs.nixpkgs.follows = "nixpkgs";
-      };
-      stylua = {
-        url = "github:johnnymorganz/stylua";
-        flake = false;
-      };
-      naersk = {
-        url = "github:nix-community/naersk";
-        inputs.nixpkgs.follows = "nixpkgs";
-      };
-      nvim-traxys = {
-        url = "github:traxys/nvim-flake";
+      hm-nvim-traxys = {
+        url = "github:traxys/home-manager-nvim-flake";
         inputs.nixpkgs.follows = "nixpkgs";
       };
       zsh-traxys = {
@@ -40,7 +28,7 @@
         modules = [
           ({ pkgs, ... }: {
             nixpkgs.overlays = [
-              inputs.nvim-traxys.overlay."${system}"
+              inputs.hm-nvim-traxys.overlay."${system}"
               (import inputs.nixpkgs-mozilla)
             ];
           })
@@ -53,13 +41,9 @@
               imports = [
                 ./home.nix
                 inputs.zsh-traxys.home-managerModule."${system}"
+				inputs.hm-nvim-traxys.home-managerModule."${system}"
               ];
             };
-            home-manager.extraSpecialArgs = {
-              rnix-lsp = inputs.rnix-lsp;
-              stylua = inputs.stylua;
-              naersk-lib = inputs.naersk.lib."${system}";
-            };
             # Optionally, use home-manager.extraSpecialArgs to pass
             # arguments to home.nix
           }
diff --git a/home.nix b/home.nix
index a82b216..070315b 100644
--- a/home.nix
+++ b/home.nix
@@ -1,8 +1,6 @@
 { config
 , pkgs
 , lib
-, stylua
-, naersk-lib
 , ...
 }:
 
@@ -24,28 +22,17 @@ in
   home.homeDirectory = localinfo.homeDir;
 
   home.sessionVariables = {
-    EDITOR = "nvim";
     RUSTC_WRAPPER = "${pkgs.sccache}/bin/sccache";
   };
 
   home.packages = with pkgs; [
     bitwarden-cli
     rustup
-    neovimTraxys
-    rust-analyzer
-    clang-tools
     nodePackages.vscode-json-languageserver
-    nodePackages.bash-language-server
-    nixpkgs-fmt
-    rnix-lsp
     exa
     python3
     topgrade
     wl-clipboard
-    (naersk-lib.buildPackage {
-      pname = "stylua";
-      root = stylua;
-    })
     cargo-edit
     rsync
     fd
@@ -55,7 +42,6 @@ in
     sqlx-cli
     direnv
     codespell
-    shellcheck
     ripgrep
     file
     jq