flake.nix

@@ -60,12 +60,6 @@
         inherit (inputs.pkg-android-tools.legacyPackages.${final.system})
           android-tools android-udev-rules;
       })
-      (final: prev: let
-        packages = import ./pkgs { inherit (prev) pkgs; };
-      in {
-        inherit (packages) mopidy-autoplay google-fonts;
-        atool-wrapped = packages.atool;
-      })
       inputs.hyprwm-contrib.overlays.default
       inputs.rust-overlay.overlays.default
     ];
@@ -200,8 +194,7 @@
     # (extraS|s)pecialArgs to pass variables
     nixosModules = (import ./modules/nixos) moduleInputs;
     homeManagerModules = (import ./modules/home-manager) moduleInputs;
-    packages = eachSystem (system: let pkgs = import nixpkgs { inherit system; };
+    packages = eachSystem (system: import ./pkgs { inherit nixpkgs system; });
-      in import ./pkgs { inherit pkgs; });
     apps = eachSystem (system: import ./pkgs/apps.nix
       { inherit (self.outputs) packages; inherit system; });
 

home/programs/mopidy.nix

@@ -21,7 +21,6 @@ in
         mopidy-soundcloud
         mopidy-scrobbler
         # outputs.packages.${pkgs.system}.mopidy-autoplay
-        mopidy-autoplay
       ];
     };
     home.packages = with pkgs; [

hosts/nixos-wsl/configuration.nix

@@ -3,10 +3,9 @@
   config = {
     networking.hostName = "nixos-wsl";
     nixfiles.profile.base.enable = true;
-    networking.networkmanager.enable = false;
     programs.gnupg.agent = {
       enable = true;
-      pinentryFlavor = "qt";
+      pinentryFlavor = "gnome3";
     };
 
     fonts.packages = with pkgs; [

hosts/nixos-wsl/home.nix

@@ -4,10 +4,6 @@
     nixfiles = { 
       profile.base.enable = true;
       packageSets.dev.enable = true;
-      programs.mopidy.enable = true;
-    };
-    home.file.windows-home = {
-      source = config.lib.file.mkOutOfStoreSymlink "/mnt/c/Users/nullbite";
     };
   };
 }

pkgs/default.nix

@@ -1,14 +1,11 @@
-{ pkgs, ... }:
+{ nixpkgs, system, ... }:
 let
-  inherit (pkgs) callPackage callPackages;
+  pkgs = import nixpkgs { inherit system; };
-
+  inherit (pkgs) callPackage;
-  mopidyPackages = callPackages ./mopidy {
-    python = pkgs.python3;
-  };
 in
 {
-  inherit (mopidyPackages) mopidy-autoplay ;
   google-fonts = callPackage ./google-fonts { };
   wm-helpers = callPackage ./wm-helpers { };
   atool = callPackage ./atool-wrapped { };
+  mopidy-autoplay = callPackage ./mopidy-autoplay { };
 }

pkgs/mopidy/default.nix

@@ -1,10 +0,0 @@
-{ lib, newScope, python }:
-
-# i have no idea what this is but there's some conflict if i don't do this
-# based on https://github.com/NixOS/nixpkgs/blob/77f0d2095a8271fdb6e0d08c90a7d93631fd2748/pkgs/applications/audio/mopidy/default.nix
-lib.makeScope newScope (self: with self; {
-  inherit python;
-  pythonPackages = python.pkgs;
-
-  mopidy-autoplay = callPackage ./autoplay.nix { };
-})

system/common/desktop.nix

@@ -48,7 +48,7 @@ in
     fonts.packages = with pkgs; [
       (nerdfonts.override { fonts = [ "FiraCode" ]; })
       noto-fonts-cjk
-      google-fonts.override { fonts = [ "NovaSquare" ];}
+      (outputs.packages.${pkgs.system}.google-fonts.override { fonts = [ "NovaSquare" ];})
     ];
 
     # TODO this should be defined in home-manager or not at all probably

system/profile/base.nix

@@ -39,7 +39,6 @@ in
       # networking.hostName = "nixos"; # Define your hostname.
       # Pick only one of the below networking options.
       # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-      # FIXME find somewhere else to put this
       networking.networkmanager.enable = lib.mkDefault true;  # Easiest to use and most distros use this by default.
 
       # List packages installed in system profile. To search, run:
@@ -59,7 +58,7 @@ in
         file
         tree
         moreutils
-        libarchive
+        bsdtar
 
         fd
         ripgrep
@@ -94,7 +93,7 @@ in
 
         # etc
         neofetch
-        atool-wrapped
+        outputs.packages."${pkgs.system}".atool
       ];
 
       # Needed for Kvantum themes to be detected