From 98bef4da05c50b9dbf0e0467df54d34947e4b1ae Mon Sep 17 00:00:00 2001
From: Akshay Nair <phenax5@gmail.com>
Date: Wed, 23 Dec 2020 23:35:42 +0530
Subject: removes config from external + adds overlays directory

---
 configuration.nix                |  1 +
 external/nvim/config             |  1 -
 external/nvim/neovim.nix         | 17 -----------------
 external/qutebrowser/overlay.nix | 13 -------------
 overlays/default.nix             |  9 +++++++++
 overlays/neovim.nix              | 17 +++++++++++++++++
 overlays/pass.nix                |  8 ++++++++
 overlays/qutebrowser.nix         | 13 +++++++++++++
 packages.nix                     | 10 ----------
 9 files changed, 48 insertions(+), 41 deletions(-)
 delete mode 160000 external/nvim/config
 delete mode 100644 external/nvim/neovim.nix
 delete mode 100644 external/qutebrowser/overlay.nix
 create mode 100644 overlays/default.nix
 create mode 100644 overlays/neovim.nix
 create mode 100644 overlays/pass.nix
 create mode 100644 overlays/qutebrowser.nix

diff --git a/configuration.nix b/configuration.nix
index 1270a75..27759b2 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -11,6 +11,7 @@ in {
     <home-manager/nixos>
     ./hardware-configuration.nix
     ./packages.nix
+    ./overlays/default.nix
     ./login.nix
   ];
 
diff --git a/external/nvim/config b/external/nvim/config
deleted file mode 160000
index 1e0bc1f..0000000
--- a/external/nvim/config
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1e0bc1f27c4290a873ec930b14cc22525f2e30e1
diff --git a/external/nvim/neovim.nix b/external/nvim/neovim.nix
deleted file mode 100644
index 172ed0c..0000000
--- a/external/nvim/neovim.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-self: super: {
-  tree-sitter-updated = super.tree-sitter.overrideAttrs (oldAttrs: {
-    postInstall = ''PREFIX=$out make install'';
-  });
-  neovim-unwrapped = super.neovim-unwrapped.overrideAttrs (oldAttrs: rec {
-    name = "neovim-nightly";
-    version = "0.5-nightly";
-    src = self.fetchFromGitHub {
-      owner = "neovim";
-      repo = "neovim";
-      rev = "nightly";
-      sha256 = "0vpjdd32lgzyh85gyazqpms8vmaad6px3zx2svdxhvcdxgschqz9";
-    };
-
-    nativeBuildInputs = with self.pkgs; [ unzip cmake pkgconfig gettext tree-sitter-updated ];
-  });
-}
diff --git a/external/qutebrowser/overlay.nix b/external/qutebrowser/overlay.nix
deleted file mode 100644
index 67192f6..0000000
--- a/external/qutebrowser/overlay.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-self: super: {
-  qutebrowser = super.qutebrowser.override {
-    python3 = super.python3.override {
-      packageOverrides = self: super: {
-        tldextract = super.tldextract.overridePythonAttrs(_: {
-          propagatedBuildInputs = with super; [ requests requests-file idna filelock ];
-          doCheck = false;
-          pythonImportsCheck = ["tldextract"];
-        });
-      };
-    };
-  };
-}
diff --git a/overlays/default.nix b/overlays/default.nix
new file mode 100644
index 0000000..b806fa9
--- /dev/null
+++ b/overlays/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+{
+  # Overlays
+  nixpkgs.overlays = [
+    (import ./neovim.nix)
+    (import ./qutebrowser.nix)
+    (import ./pass.nix)
+  ];
+}
diff --git a/overlays/neovim.nix b/overlays/neovim.nix
new file mode 100644
index 0000000..172ed0c
--- /dev/null
+++ b/overlays/neovim.nix
@@ -0,0 +1,17 @@
+self: super: {
+  tree-sitter-updated = super.tree-sitter.overrideAttrs (oldAttrs: {
+    postInstall = ''PREFIX=$out make install'';
+  });
+  neovim-unwrapped = super.neovim-unwrapped.overrideAttrs (oldAttrs: rec {
+    name = "neovim-nightly";
+    version = "0.5-nightly";
+    src = self.fetchFromGitHub {
+      owner = "neovim";
+      repo = "neovim";
+      rev = "nightly";
+      sha256 = "0vpjdd32lgzyh85gyazqpms8vmaad6px3zx2svdxhvcdxgschqz9";
+    };
+
+    nativeBuildInputs = with self.pkgs; [ unzip cmake pkgconfig gettext tree-sitter-updated ];
+  });
+}
diff --git a/overlays/pass.nix b/overlays/pass.nix
new file mode 100644
index 0000000..0d79267
--- /dev/null
+++ b/overlays/pass.nix
@@ -0,0 +1,8 @@
+self: super:
+let
+  localPkgs = import ../packages/default.nix { pkgs = super.pkgs; };
+in {
+  pass = super.pass.override {
+    dmenu = localPkgs.dmenu;
+  };
+}
diff --git a/overlays/qutebrowser.nix b/overlays/qutebrowser.nix
new file mode 100644
index 0000000..67192f6
--- /dev/null
+++ b/overlays/qutebrowser.nix
@@ -0,0 +1,13 @@
+self: super: {
+  qutebrowser = super.qutebrowser.override {
+    python3 = super.python3.override {
+      packageOverrides = self: super: {
+        tldextract = super.tldextract.overridePythonAttrs(_: {
+          propagatedBuildInputs = with super; [ requests requests-file idna filelock ];
+          doCheck = false;
+          pythonImportsCheck = ["tldextract"];
+        });
+      };
+    };
+  };
+}
diff --git a/packages.nix b/packages.nix
index 01da646..bbabcbc 100644
--- a/packages.nix
+++ b/packages.nix
@@ -79,16 +79,6 @@ let
     xclip
   ];
 in {
-
-  # Overlays
-  nixpkgs.overlays = [
-    (import ./external/nvim/neovim.nix)
-    (import ./external/qutebrowser/overlay.nix)
-    (self: super: {
-      pass = super.pass.override { dmenu = localPkgs.dmenu; };
-    })
-  ];
-
   # Packages
   environment.systemPackages = devPackages ++ customPackages ++ apps ++ utils;
 
-- 
cgit v1.3.1