refactor(overlays): change dir structure

common/default.nix

@@ -14,6 +14,7 @@
 
     ./modules
     ./overlays
+    ./pkgs
 
     nur.nixosModules.nur
     nh.nixosModules.default

common/overlays/blueberry/default.nix

@@ -3,7 +3,7 @@ final: prev: {
     patches =
       (o.patches or [])
       ++ [
-        ./patches/wayland.patch
+        ./wayland.patch
       ];
     buildInputs =
       (o.buildInputs or [])

common/overlays/default.nix

@@ -1,30 +1,14 @@
 {neovim-flake, nixpkgs-wayland, ...}: {
   imports = [
-    ./dracula-theme.nix
+    ./dracula-theme
-    ./regreet.nix
+    ./regreet
   ];
 
   nixpkgs.overlays = [
-    (import ./blueberry.nix)
+    (import ./blueberry)
-    (import ./squeekboard.nix)
+    (import ./squeekboard)
 
     neovim-flake.overlay
     nixpkgs-wayland.overlay
-
-    (final: prev: {
-      spotifywm = final.callPackage ./pkgs/spotifywm.nix {};
-    })
-
-    (final: prev: {
-      input-emulator = final.callPackage ./pkgs/input-emulator.nix {};
-    })
-
-    (final: prev: {
-      pam-fprint-grosshack = final.callPackage ./pkgs/pam-fprint-grosshack.nix {};
-    })
-
-    (final: prev: {
-      coloryou = final.callPackage ./pkgs/coloryou/default.nix {};
-    })
   ];
 }

common/overlays/dracula-theme/default.nix

@@ -6,7 +6,7 @@
     hash = "sha256-7YwkBzkAND9lfH2ewuwna1zUkQStBBx4JHGw3/+svhA=";
   };
 
-  dracula-script = ./patches/dracula-plymouth.patch;
+  dracula-script = ./dracula-plymouth.patch;
 
   git-colors = pkgs.fetchFromGitHub {
     owner = "dracula";
@@ -29,7 +29,7 @@
 in {
   nixpkgs.overlays = [
     (final: prev: {
-      dracula-theme = prev.dracula-theme.overrideAttrs (oldAttrs: rec {
+      dracula-theme = prev.dracula-theme.overrideAttrs (oldAttrs: {
         src = prev.fetchFromGitHub {
           owner = "dracula";
           repo = "gtk";

common/overlays/patches/swayosd.patch

@@ -1,21 +0,0 @@
-diff --git a/data/meson.build b/data/meson.build
-index 1ceaa11..68decdf 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -42,11 +42,7 @@
- configure_file(
- 
- # Systemd service unit
- systemd = dependency('systemd', required: false)
--if systemd.found()
--  systemd_service_install_dir = systemd.get_variable(pkgconfig :'systemdsystemunitdir')
--else
--  systemd_service_install_dir = join_paths(libdir, 'systemd', 'system')
--endif
-+systemd_service_install_dir = join_paths(libdir, 'systemd', 'system')
- 
- configure_file(
-   configuration: conf_data,
--- 
-2.41.0
-

common/overlays/regreet/default.nix

@@ -14,7 +14,7 @@
       });
 
       # temp fix until https://github.com/rharish101/ReGreet/issues/32 is solved
-      patches = [./patches/regreet.patch];
+      patches = [./crash-fix.patch];
     });
   };
 }

common/overlays/squeekboard/default.nix

@@ -2,8 +2,6 @@ final: prev: {
   squeekboard = prev.squeekboard.overrideAttrs (o: {
     patches =
       (o.patches or [])
-      ++ [
+      ++ [./remove-panel.patch];
-        ./patches/remove-panel.patch
-      ];
   });
 }

common/pkgs/default.nix

@@ -0,0 +1,12 @@
+{...}: let
+  mkPackage = name: (final: prev: {
+    ${name} = final.callPackage ./${name} {};
+  });
+in {
+  nixpkgs.overlays = [
+    (mkPackage "coloryou")
+    (mkPackage "input-emulator")
+    (mkPackage "pam-fprint-grosshack")
+    (mkPackage "spotifywm")
+  ];
+}