From 4d2d8ab8529a4141e506220d90c00b325b634085 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Sun, 11 Aug 2024 10:47:43 +0200
Subject: [PATCH] chore: refactor stuff in exprs

---
 configs/common.nix                           |  6 +++---
 exprs/default.nix                            |  3 +++
 exprs/overlay.nix                            | 13 +------------
 exprs/{ => pkgs}/wine-discord-ipc-bridge.nix |  0
 4 files changed, 7 insertions(+), 15 deletions(-)
 rename exprs/{ => pkgs}/wine-discord-ipc-bridge.nix (100%)

diff --git a/configs/common.nix b/configs/common.nix
index 84d95f5..a5c67e6 100644
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -90,10 +90,10 @@ in {
     };
 
     registry = let
-      nixpkgsRegistry.flake = nixpkgs;
+      n.flake = nixpkgs;
     in {
-      nixpkgs = nixpkgsRegistry;
-      n = nixpkgsRegistry;
+      inherit n;
+      nixpkgs = n;
     };
 
     settings = {
diff --git a/exprs/default.nix b/exprs/default.nix
index fc57ca0..b16bc45 100644
--- a/exprs/default.nix
+++ b/exprs/default.nix
@@ -6,6 +6,9 @@
   perSystem = {pkgs, ...}: {
     packages = {
       reposilite = pkgs.callPackage ./reposilite/derivation.nix {};
+      wine-discord-ipc-bridge = pkgs.callPackage ./pkgs/wine-discord-ipc-bridge.nix {
+        inherit (pkgs.pkgsCross.mingw32) stdenv;
+      };
     };
   };
 }
diff --git a/exprs/overlay.nix b/exprs/overlay.nix
index a8835d0..582530c 100644
--- a/exprs/overlay.nix
+++ b/exprs/overlay.nix
@@ -1,14 +1,3 @@
 final: prev: {
-  wine-discord-ipc-bridge = prev.callPackage ./wine-discord-ipc-bridge.nix {
-    inherit (prev.pkgsCross.mingw32) stdenv;
-  };
-
-  jmusicbot = prev.jmusicbot.overrideAttrs (_: rec {
-    version = "0.4.3";
-
-    src = prev.fetchurl {
-      url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar";
-      hash = "sha256-7CHFc94Fe6ip7RY+XJR9gWpZPKM5JY7utHp8C3paU9s=";
-    };
-  });
+  # nothing right meow ! :3
 }
diff --git a/exprs/wine-discord-ipc-bridge.nix b/exprs/pkgs/wine-discord-ipc-bridge.nix
similarity index 100%
rename from exprs/wine-discord-ipc-bridge.nix
rename to exprs/pkgs/wine-discord-ipc-bridge.nix