From e80dac88552b8a5a530ec800e95af8a1dc326d7e Mon Sep 17 00:00:00 2001
From: Dave Gallant <davegallant@gmail.com>
Date: Mon, 18 Jul 2022 01:06:28 +0000
Subject: [PATCH] Cleanup

---
 flake.lock          | 96 ++++++++++++++++++++++++++++++++++++++++++++-
 flake.nix           | 12 ++----
 packages/common.nix |  8 ----
 3 files changed, 97 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index 48b21a5..a8d594a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,6 +20,37 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1650374568,
+        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -41,6 +72,50 @@
         "type": "github"
       }
     },
+    "neovim-flake": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "neovim-nightly-overlay",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "dir": "contrib",
+        "lastModified": 1658038532,
+        "narHash": "sha256-Gs03735lsKJ99fP1I0/i2ZwjhjRGq9HUIqXZDBhoev4=",
+        "owner": "neovim",
+        "repo": "neovim",
+        "rev": "9e7f92e59a7fbbc0e266700db1f25278eb30cb2a",
+        "type": "github"
+      },
+      "original": {
+        "dir": "contrib",
+        "owner": "neovim",
+        "repo": "neovim",
+        "type": "github"
+      }
+    },
+    "neovim-nightly-overlay": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "neovim-flake": "neovim-flake",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1658045699,
+        "narHash": "sha256-l3r7jn/Kzkf5f/TrH1xBvuAR6ks9lbcQwd6EVjwuvGs=",
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "rev": "4fac8dafdb5c83202900f876864eefe0f3186ad9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "neovim-nightly-overlay",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1657781616,
@@ -61,11 +136,27 @@
       "locked": {
         "lastModified": 1657802959,
         "narHash": "sha256-9+JWARSdlL8KiH3ymnKDXltE1vM+/WEJ78F5B1kjXys=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "4a01ca36d6bfc133bc617e661916a81327c9bbc8",
         "type": "github"
       },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1658015103,
+        "narHash": "sha256-mO+23f3SO+fBzEvbxRe6GkSB5Xp43CT2sV8Rs8MYdz8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8f485713f5e6b6883a9b6959afa98688360a3ecb",
+        "type": "github"
+      },
       "original": {
         "owner": "NixOS",
         "ref": "nixos-unstable",
@@ -77,8 +168,9 @@
       "inputs": {
         "darwin": "darwin",
         "home-manager": "home-manager",
+        "neovim-nightly-overlay": "neovim-nightly-overlay",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_2"
       }
     },
     "utils": {
diff --git a/flake.nix b/flake.nix
index d194546..c2a5c23 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,9 +11,7 @@
 
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
-    /*
-     neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
-     */
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
 
     darwin = {
       url = "github:lnl7/nix-darwin";
@@ -61,9 +59,7 @@
 
             nixpkgs.overlays = [
               (import ./modules/overlays)
-              /*
-               inputs.neovim-nightly-overlay.overlay
-               */
+              inputs.neovim-nightly-overlay.overlay
             ];
 
             home-manager = {
@@ -120,9 +116,7 @@
           ({config, ...}: {
             config = {
               nixpkgs.overlays = [
-                /*
-                 inputs.neovim-nightly-overlay.overlay
-                 */
+                inputs.neovim-nightly-overlay.overlay
                 (import ./modules/overlays)
               ];
               home-manager = {
diff --git a/packages/common.nix b/packages/common.nix
index 2842270..1aafbe2 100644
--- a/packages/common.nix
+++ b/packages/common.nix
@@ -25,14 +25,6 @@ in {
       yq-go
       zip
 
-      # ansible
-      /*
-       ansible
-       */
-      /*
-       ansible-lint
-       */
-
       # productivity
       bat
       /*