From 3a658ac3fd7079966d7bc9b74552fd6f80a3c2c0 Mon Sep 17 00:00:00 2001
From: Manuel Palenzuela <manuelpalenzuelamerino@gmail.com>
Date: Mon, 20 Jun 2022 17:38:39 +0200
Subject: Move overlays under folders

---
 overlays/base.nix         | 81 -----------------------------------------------
 overlays/base/default.nix | 81 +++++++++++++++++++++++++++++++++++++++++++++++
 overlays/default.nix      |  2 +-
 3 files changed, 82 insertions(+), 82 deletions(-)
 delete mode 100644 overlays/base.nix
 create mode 100644 overlays/base/default.nix

diff --git a/overlays/base.nix b/overlays/base.nix
deleted file mode 100644
index 46eb48c..0000000
--- a/overlays/base.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-final: prev:
-{
-  dwm = prev.dwm.overrideAttrs (old: {
-    src = prev.fetchFromGitHub {
-      owner = "Baitinq";
-      repo = "dwm";
-      rev = "79e2e3b31c3dc0e410394006196201d5ec9ae7c5";
-      sha256 = "sha256-jcfcOEQTdAw/4yFmHO3MtXjhcxNnNpqJgjuxy0T8zIs=";
-    };
-  });
-
-  dmenu = prev.dmenu.overrideAttrs (old: {
-    src = prev.fetchFromGitHub {
-      owner = "Baitinq";
-      repo = "dmenu";
-      rev = "4935902378d321c465f5f8ec18619b22da75527b";
-      sha256 = "sha256-MyNMxdaWtgjClZGIHUtYwwx51u5NII5Ce4BnOnUojo8=";
-    };
-  });
-
-  st = prev.st.overrideAttrs (old: {
-    buildInputs = old.buildInputs ++ [ prev.harfbuzz ];
-    src = prev.fetchFromGitHub {
-      owner = "LukeSmithxyz";
-      repo = "st";
-      rev = "3144a61c180b678f6b1c23f06e4b434090199fcb";
-      sha256 = "sha256-J5JwuQMdDU4Oy7let0IYA2rwOZD057LEE+sOmmGCkqc=";
-    };
-  });
-
-  neovim = prev.neovim.override {
-    vimAlias = true;
-    viAlias = true;
-    configure = {
-      packages.myPlugins = with prev.vimPlugins; {
-        start = [
-          vim-addon-nix
-          YouCompleteMe
-          nerdtree
-          rainbow_parentheses
-          base16-vim
-          vim-orgmode
-        ];
-        opt = [ ];
-      };
-    };
-  };
-
-  xwinwrap = prev.xwinwrap.overrideAttrs (old: {
-    src = prev.fetchFromGitHub {
-      owner = "Baitinq";
-      repo = "xwinwrap";
-      rev = "401b5a5eb092173443253cdd57736cd6bf401e40";
-      sha256 = "sha256-8+asreFjzD49O3sZlAXBsWD3PU0rqkbs/J3Dq9VeiYA=";
-    };
-    buildPhase = "make all";
-    installPhase = ''
-      mkdir -p $out/bin
-      mv xwinwrap $out/bin/xwinwrap
-    '';
-  });
-
-  kcc = prev.kcc.overrideAttrs (oldAttrs: {
-    version = "5.5.2";
-    src = prev.fetchFromGitHub {
-      owner = "ciromattia";
-      repo = "kcc";
-      rev = "4ec4c9966c727d6dac44507d34607bd7d2c5ed5c";
-      sha256 = "sha256-vH3Cz7nL+sStogcCRLcN30Iap25f5hylXHECX52G4f0=";
-    };
-    patches = [
-      ../patches/kcc.patch
-      (prev.fetchpatch
-        {
-          url = "https://github.com/Baitinq/kcc/commit/73cd0dd107901bebe7d72e2b86ecf8b830a19758.diff";
-          sha256 = "sha256-UsWTwujCmKsFrPUHIx8O8ELHpXFQdEbBRZh5SbPPWBM=";
-        })
-    ];
-  });
-
-}
diff --git a/overlays/base/default.nix b/overlays/base/default.nix
new file mode 100644
index 0000000..46eb48c
--- /dev/null
+++ b/overlays/base/default.nix
@@ -0,0 +1,81 @@
+final: prev:
+{
+  dwm = prev.dwm.overrideAttrs (old: {
+    src = prev.fetchFromGitHub {
+      owner = "Baitinq";
+      repo = "dwm";
+      rev = "79e2e3b31c3dc0e410394006196201d5ec9ae7c5";
+      sha256 = "sha256-jcfcOEQTdAw/4yFmHO3MtXjhcxNnNpqJgjuxy0T8zIs=";
+    };
+  });
+
+  dmenu = prev.dmenu.overrideAttrs (old: {
+    src = prev.fetchFromGitHub {
+      owner = "Baitinq";
+      repo = "dmenu";
+      rev = "4935902378d321c465f5f8ec18619b22da75527b";
+      sha256 = "sha256-MyNMxdaWtgjClZGIHUtYwwx51u5NII5Ce4BnOnUojo8=";
+    };
+  });
+
+  st = prev.st.overrideAttrs (old: {
+    buildInputs = old.buildInputs ++ [ prev.harfbuzz ];
+    src = prev.fetchFromGitHub {
+      owner = "LukeSmithxyz";
+      repo = "st";
+      rev = "3144a61c180b678f6b1c23f06e4b434090199fcb";
+      sha256 = "sha256-J5JwuQMdDU4Oy7let0IYA2rwOZD057LEE+sOmmGCkqc=";
+    };
+  });
+
+  neovim = prev.neovim.override {
+    vimAlias = true;
+    viAlias = true;
+    configure = {
+      packages.myPlugins = with prev.vimPlugins; {
+        start = [
+          vim-addon-nix
+          YouCompleteMe
+          nerdtree
+          rainbow_parentheses
+          base16-vim
+          vim-orgmode
+        ];
+        opt = [ ];
+      };
+    };
+  };
+
+  xwinwrap = prev.xwinwrap.overrideAttrs (old: {
+    src = prev.fetchFromGitHub {
+      owner = "Baitinq";
+      repo = "xwinwrap";
+      rev = "401b5a5eb092173443253cdd57736cd6bf401e40";
+      sha256 = "sha256-8+asreFjzD49O3sZlAXBsWD3PU0rqkbs/J3Dq9VeiYA=";
+    };
+    buildPhase = "make all";
+    installPhase = ''
+      mkdir -p $out/bin
+      mv xwinwrap $out/bin/xwinwrap
+    '';
+  });
+
+  kcc = prev.kcc.overrideAttrs (oldAttrs: {
+    version = "5.5.2";
+    src = prev.fetchFromGitHub {
+      owner = "ciromattia";
+      repo = "kcc";
+      rev = "4ec4c9966c727d6dac44507d34607bd7d2c5ed5c";
+      sha256 = "sha256-vH3Cz7nL+sStogcCRLcN30Iap25f5hylXHECX52G4f0=";
+    };
+    patches = [
+      ../patches/kcc.patch
+      (prev.fetchpatch
+        {
+          url = "https://github.com/Baitinq/kcc/commit/73cd0dd107901bebe7d72e2b86ecf8b830a19758.diff";
+          sha256 = "sha256-UsWTwujCmKsFrPUHIx8O8ELHpXFQdEbBRZh5SbPPWBM=";
+        })
+    ];
+  });
+
+}
diff --git a/overlays/default.nix b/overlays/default.nix
index bb4f07a..ef828bf 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,7 +1,7 @@
 final: prev:
 let
   overlays = [
-    (import ./base.nix)
+    (import ./base)
   ];
 in
 prev.lib.composeManyExtensions overlays final prev
-- 
cgit 1.4.1