Merge remote-tracking branch 'origin/wsl' into develop

modules/home-manager/binary-cache/default.nix

@@ -3,7 +3,7 @@ _: {
     # package = pkgs.nix;
     settings = {
       substituters = [
-        "http://nixcache.odie.intranet"
+        "http://nixcache.odie.home.arpa"
         "https://nix-community.cachix.org"
         "https://cache.nixos.org/"
       ];

modules/nixos/base/binary-cache/default.nix

@@ -3,11 +3,11 @@
   nix = {
     settings = {
       substituters = [
-        "http://nixcache.odie.intranet"
+        "http://nixcache.odie.home.arpa"
         "https://nix-community.cachix.org"
       ];
       trusted-public-keys = [
-        "nixcache.odie.intranet:2j5qAVmtBUSZMPWlIRS8Gn0Il9tbotJ9c2y43N0RLKU="
+        "nixcache.odie.home.arpa:2j5qAVmtBUSZMPWlIRS8Gn0Il9tbotJ9c2y43N0RLKU="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
     };

modules/nixos/base/default.nix

@@ -8,7 +8,7 @@
     ./programs
     ./ssh
     ./power-management
-    ./binary-cache
+    #./binary-cache
   ];
 
   config = {

modules/nixos/home-manager/default.nix

@@ -1,6 +1,9 @@
-moduleInputs @ {flakeLib, ...}: let
+moduleInputs @ {flakeLib, inputs, ...}: let
   config = flakeLib.mkHomeManagerDefaults moduleInputs;
 in {
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+  ];
   home-manager = {
     inherit (config) extraSpecialArgs useGlobalPkgs useUserPackages;
   };

modules/nixos/server/default.nix

@@ -1,6 +1,6 @@
 {
   imports = [
     ./nginx
-    ./binary-cache
+    #./binary-cache
   ];
 }

modules/nixos/wsl/default.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, vars, inputs, ... }:
+{ config, lib, vars, inputs, ... }:
 let
   inherit (vars) username hostName;
 in

profiles/home-manager/odie@wsl-dev/home.nix

@@ -0,0 +1,11 @@
+{
+  outputs,
+  ...
+}: {
+  imports = [
+    outputs.homeManagerModules.base
+    outputs.homeManagerModules.user
+    outputs.homeManagerModules.shell
+    outputs.homeManagerModules.development
+  ];
+}

profiles/nixos/wsl-dev/configuration.nix

@@ -6,9 +6,10 @@
   ...
 }: {
   imports = [
-    inputs.home-manager.nixosModules.home-manager
-    ../../../modules/nixos/base
-    ../../../modules/nixos/wsl
+    #inputs.home-manager.nixosModules.home-manager
+    outputs.nixosModules.home-manager
+    outputs.nixosModules.base
+    outputs.nixosModules.wsl
   ];
 
   wsl.enable = true;
@@ -18,16 +19,11 @@
     inherit (vars) hostName domain;
   };
 
-  home-manager = flakeLib.mkHomeNixosModule {
-    inherit inputs outputs vars flakeLib;
-    users.${vars.username} = {
-      imports = [
-        ../../../modules/home-manager/base
-        ../../../modules/home-manager/development
-        ../../../modules/home-manager/shell
-      ];
-    };
+  home-manager.extraSpecialArgs = {
+    inherit inputs outputs vars;
   };
+  home-manager.users = flakeLib.mkNixosHomeConfiguration {inherit vars;};
+
 
   system.stateVersion = "23.11";
 }