refactor

flake.nix

@@ -44,30 +44,19 @@
     };
     ksoloti-pr.url = "github:repomaa/nixpkgs/pkg/ksoloti";
   };
-  outputs = { nixpkgs, nixpkgs-unstable, gtrackmap, ksoloti-pr, lanzaboote, nixos-hardware, auto-cpufreq, home-manager, ... }@inputs: {
+  outputs = { nixpkgs, ... }@inputs: {
-    nixosConfigurations.freun-dev = nixpkgs.lib.nixosSystem {
+    nixosConfigurations = {
+      freun-dev = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-      specialArgs = inputs;
+        specialArgs = { inherit inputs; };
-      modules = [
+        modules = [ ./freun.dev ];
-        ./freun.dev
-        gtrackmap.nixosModules.x86_64-linux.default
-      ];
       };
 
-    nixosConfigurations.radish = nixpkgs.lib.nixosSystem rec {
+      radish = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-      specialArgs = {
+        specialArgs = { inherit inputs; };
-        pkgs-unstable = import nixpkgs-unstable { inherit system; };
+        modules = [ ./radish ];
-        ksoloti-pr = import ksoloti-pr { inherit system; };
-        inherit inputs system;
       };
-      modules = [
-        ./radish
-        lanzaboote.nixosModules.lanzaboote
-        nixos-hardware.nixosModules.framework-13-7040-amd
-        auto-cpufreq.nixosModules.default
-        home-manager.nixosModules.home-manager
-      ];
     };
   };
 }

freun.dev/default.nix

@@ -1,7 +1,12 @@
-{ ... }: {
+{ inputs, ... }:
+let
+  inherit (inputs) gtrackmap;
+in
+{
   imports = [
     ./hardware-configuration.nix
     ./configuration.nix
     ./services.nix
+    gtrackmap.nixosModules.x86_64-linux.default
   ];
 }

home/default.nix

@@ -1,11 +1,11 @@
-{ ksoloti-pr, inputs, ... }:
+{ inputs, ... }:
 {
   home-manager = {
     users = {
       jokke = import ./jokke;
       moco = import ./moco;
     };
-    extraSpecialArgs = { inherit ksoloti-pr inputs; };
+    extraSpecialArgs = { inherit inputs; };
     sharedModules = [ (import ./common) ];
     useUserPackages = true;
     useGlobalPkgs = true;

home/jokke/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ksoloti-pr, ... }:
+{ pkgs, inputs, ... }:
 {
   config = {
     # Home Manager needs a bit of information about you and the paths it should
@@ -18,7 +18,7 @@
       inkscape
       wineWowPackages.waylandFull
       reaper
-      ksoloti-pr.ksoloti
+      inputs.ksoloti-pr.legacyPackages.${pkgs.system}.ksoloti
       calibre
       jellyfin-media-player
       darktable

radish/default.nix

@@ -1,4 +1,8 @@
-{ ... }: {
+{ inputs, ... }:
+let
+  inherit (inputs) lanzaboote nixos-hardware auto-cpufreq home-manager;
+in
+{
   imports = [
     ./hardware-configuration.nix
     ./configuration.nix
@@ -9,6 +13,10 @@
     ./containers.nix
     ./desktop.nix
     ./users.nix
+    lanzaboote.nixosModules.lanzaboote
+    nixos-hardware.nixosModules.framework-13-7040-amd
+    auto-cpufreq.nixosModules.default
+    home-manager.nixosModules.home-manager
     ../home
   ];
 }

radish/hardware.nix

@@ -1,4 +1,4 @@
-{ pkgs, ksoloti-pr, lib, config, ... }:
+{ pkgs, inputs, lib, config, ... }:
 {
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
@@ -12,7 +12,7 @@
   services.udev.packages = [
     pkgs.zsa-udev-rules
     pkgs.yubikey-personalization
-    ksoloti-pr.ksoloti
+    inputs.ksoloti-pr.legacyPackages.${pkgs.system}.ksoloti
   ];
   services.usbmuxd = {
     enable = true;