From 3e58dc70e4a8d5f498a864258e26517cef866f3d Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Sat, 24 May 2025 18:33:23 -0700
Subject: [PATCH] feat: all overlays except firefox addons migrated

---
 flake.nix                                                 | 8 +++++++-
 .../ddclient/default.nix => overlays/ddclient.nix         | 2 +-
 overlays/jetbrains.nix                                    | 3 +++
 .../default.nix => overlays/maple-mono-NF.nix             | 4 ++--
 .../marleyvim/default.nix => overlays/marleyvim.nix       | 2 +-
 .../overlays/wezterm/default.nix => overlays/wezterm.nix  | 2 +-
 snowflake/overlays/firefox-addons/default.nix             | 2 +-
 snowflake/overlays/jetbrains/default.nix                  | 3 ---
 8 files changed, 16 insertions(+), 10 deletions(-)
 rename snowflake/overlays/ddclient/default.nix => overlays/ddclient.nix (93%)
 create mode 100644 overlays/jetbrains.nix
 rename snowflake/overlays/maple-mono-NF/default.nix => overlays/maple-mono-NF.nix (71%)
 rename snowflake/overlays/marleyvim/default.nix => overlays/marleyvim.nix (67%)
 rename snowflake/overlays/wezterm/default.nix => overlays/wezterm.nix (68%)
 delete mode 100644 snowflake/overlays/jetbrains/default.nix

diff --git a/flake.nix b/flake.nix
index 605d111..5de846e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,6 +24,12 @@
             nur.overlays.default
             agenix.overlays.default
             niri-flake.overlays.niri
+
+            (import ./overlays/ddclient.nix)
+            (import ./overlays/jetbrains.nix {inherit inputs;})
+            (import ./overlays/maple-mono-NF.nix)
+            (import ./overlays/marleyvim.nix {inherit inputs;})
+            (import ./overlays/wezterm.nix {inherit inputs;})
           ];
         };
       };
@@ -87,7 +93,7 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.11-darwin";
-    unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
 
     nur = {
       url = "github:nix-community/NUR";
diff --git a/snowflake/overlays/ddclient/default.nix b/overlays/ddclient.nix
similarity index 93%
rename from snowflake/overlays/ddclient/default.nix
rename to overlays/ddclient.nix
index 511f975..f36854c 100644
--- a/snowflake/overlays/ddclient/default.nix
+++ b/overlays/ddclient.nix
@@ -1,4 +1,4 @@
-_: final: prev: {
+final: prev: {
   ddclient = prev.ddclient.overrideAttrs {
     src = final.fetchFromGitHub {
       owner = "ddclient";
diff --git a/overlays/jetbrains.nix b/overlays/jetbrains.nix
new file mode 100644
index 0000000..7572db3
--- /dev/null
+++ b/overlays/jetbrains.nix
@@ -0,0 +1,3 @@
+{inputs}: _: _: {
+  inherit (inputs.nixpkgs-unstable) jetbrains jetbrains-toolbox;
+}
diff --git a/snowflake/overlays/maple-mono-NF/default.nix b/overlays/maple-mono-NF.nix
similarity index 71%
rename from snowflake/overlays/maple-mono-NF/default.nix
rename to overlays/maple-mono-NF.nix
index 898d37e..6a2e353 100644
--- a/snowflake/overlays/maple-mono-NF/default.nix
+++ b/overlays/maple-mono-NF.nix
@@ -1,5 +1,5 @@
-_: final: prev: {
-  maple-mono-NF = prev.maple-mono-NF.overrideAttrs (old: {
+_: prev: {
+  maple-mono-NF = prev.maple-mono-NF.overrideAttrs (_: {
     src = prev.fetchFromGitHub {
       owner = "punkfairie";
       repo = "maple-font";
diff --git a/snowflake/overlays/marleyvim/default.nix b/overlays/marleyvim.nix
similarity index 67%
rename from snowflake/overlays/marleyvim/default.nix
rename to overlays/marleyvim.nix
index ac5f408..e3dfebc 100644
--- a/snowflake/overlays/marleyvim/default.nix
+++ b/overlays/marleyvim.nix
@@ -1,3 +1,3 @@
-{inputs, ...}: final: prev: {
+{inputs}: _: prev: {
   inherit (inputs.marleyvim.packages.${prev.system}) nvim;
 }
diff --git a/snowflake/overlays/wezterm/default.nix b/overlays/wezterm.nix
similarity index 68%
rename from snowflake/overlays/wezterm/default.nix
rename to overlays/wezterm.nix
index ebea314..16fc633 100644
--- a/snowflake/overlays/wezterm/default.nix
+++ b/overlays/wezterm.nix
@@ -1,3 +1,3 @@
-{inputs, ...}: final: prev: {
+{inputs}: prev: {
   wezterm = inputs.wezterm.packages."${prev.system}".default;
 }
diff --git a/snowflake/overlays/firefox-addons/default.nix b/snowflake/overlays/firefox-addons/default.nix
index 710c4b7..0b9b94b 100644
--- a/snowflake/overlays/firefox-addons/default.nix
+++ b/snowflake/overlays/firefox-addons/default.nix
@@ -33,7 +33,7 @@
       '';
     });
 in
-  final: prev: {
+  _: prev: {
     marleyos =
       prev.marleyos
       // {
diff --git a/snowflake/overlays/jetbrains/default.nix b/snowflake/overlays/jetbrains/default.nix
deleted file mode 100644
index 0c37188..0000000
--- a/snowflake/overlays/jetbrains/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{channels, ...}: final: prev: {
-  inherit (channels.unstable) jetbrains jetbrains-toolbox;
-}