From ad68c47d847bb45d6689de4f129456aa3782507d Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Tue, 10 Aug 2021 13:19:36 +0100
Subject: [PATCH] Remove rnix-lsp from packages

---
 flake.lock           | 96 ++++----------------------------------------
 flake.nix            | 16 ++++----
 modules/software.nix | 10 +++--
 3 files changed, 21 insertions(+), 101 deletions(-)

diff --git a/flake.lock b/flake.lock
index d2703b7..81f85c2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
     },
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1628443422,
-        "narHash": "sha256-Sq+eaw+UCYr4C5jzbjMk1bzrmLFxA5rN1pgYAGvT/AM=",
+        "lastModified": 1628588092,
+        "narHash": "sha256-Dz/T8zE7dOo70W2d5LdodWkqqeUosEgI5uMIZiepstU=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "d962fd773274e8303bc96ca64fb3569aec5ac764",
+        "rev": "46190b74dad8cd3c35cf8ae9334597392937882f",
         "type": "github"
       },
       "original": {
@@ -35,31 +35,13 @@
         "type": "github"
       }
     },
-    "naersk": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1605267184,
-        "narHash": "sha256-0FSNlq6nN0/W88fg5kTkgRhAOQ8pI+uSZqBG9w49pMM=",
-        "owner": "nmattia",
-        "repo": "naersk",
-        "rev": "ce273fa593dcc94a629d0d869f07d96d2b337e37",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nmattia",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1628287055,
-        "narHash": "sha256-YwxtAt25pZofJT/e4sxw9cFBaFok+zgIy04HFV0rDd0=",
+        "lastModified": 1628465643,
+        "narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0dde103318090f77ac95ef7fc26fe0cdd00fa0b3",
+        "rev": "6ef4f522d63f22b40004319778761040d3197390",
         "type": "github"
       },
       "original": {
@@ -68,75 +50,11 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1605988311,
-        "narHash": "sha256-PA+kgq46NApOAJlmBNJHs5DwsIrY+jodM0e4g7VtXyY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2247d824fe07f16325596acc7faa286502faffd1",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1605988311,
-        "narHash": "sha256-PA+kgq46NApOAJlmBNJHs5DwsIrY+jodM0e4g7VtXyY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2247d824fe07f16325596acc7faa286502faffd1",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "rnix-lsp": {
-      "inputs": {
-        "naersk": "naersk",
-        "nixpkgs": "nixpkgs_3",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1626644818,
-        "narHash": "sha256-w0hpyFXxltmOpbBKNQ2tfKRWELQzStc/ho1EcNyYaWc=",
-        "owner": "nix-community",
-        "repo": "rnix-lsp",
-        "rev": "1fdd7cf9bf56b8ad2dddcfd27354dae8aef2b453",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "rnix-lsp",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
         "emacs-overlay": "emacs-overlay",
-        "nixpkgs": "nixpkgs",
-        "rnix-lsp": "rnix-lsp"
-      }
-    },
-    "utils": {
-      "locked": {
-        "lastModified": 1605370193,
-        "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5021eac20303a61fafe17224c087f5519baed54d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index ba83dc1..40aa367 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,6 @@
     agenix.url = "github:ryantm/agenix";
     agenix.inputs.nixpkgs.follows = "nixpkgs";
     emacs-overlay.url = "github:nix-community/emacs-overlay";
-    rnix-lsp.url = "github:nix-community/rnix-lsp";
   };
 
   outputs = { self, nixpkgs, agenix, ... }@inputs:
@@ -20,12 +19,13 @@
 
       lib = nixpkgs.lib;
 
-    in {
-      nixosConfigurations.panacea = lib.nixosSystem {
-        inherit system;
-        modules = [ (import ./configuration.nix) agenix.nixosModules.age ];
-        specialArgs = { inherit inputs; };
-      };
+    in
+      {
+        nixosConfigurations.panacea = lib.nixosSystem {
+          inherit system;
+          modules = [ (import ./configuration.nix) agenix.nixosModules.age ];
+          specialArgs = { inherit inputs; };
+        };
 
-    };
+      };
 }
diff --git a/modules/software.nix b/modules/software.nix
index 97fcd38..94e7410 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -3,10 +3,13 @@
 with pkgs;
 
 let
-  emacs-vterm = ((emacsPackagesNgGen emacsPgtkGcc).emacsWithPackages
-    (epkgs: [ epkgs.vterm ]));
+  emacs-vterm = (
+    (emacsPackagesNgGen emacsPgtkGcc).emacsWithPackages
+      (epkgs: [ epkgs.vterm ])
+  );
 
-in {
+in
+{
   environment.systemPackages = [
     # Monitoring
     htop
@@ -85,7 +88,6 @@ in {
     shfmt
     ## Nix
     nixfmt
-    rnix-lsp
     ## Python
     nodePackages.pyright
     black