snowhawk: home-manager options formatting

fix lib overlay

home/modules/default.nix

@@ -15,8 +15,8 @@ in
 {
   imports = getModules ./.;
 
-  nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [ self.overlays.default ];
+  # nixpkgs.config.allowUnfree = true;
+  # nixpkgs.overlays = [ self.overlays.default ];
 
   snowhawk.user.enable = lib.mkDefault true;
   snowhawk.tmux.enable = lib.mkDefault true;

home/modules/xivlauncher.nix

@@ -19,6 +19,12 @@ in
         (writeShellScriptBin "iinact" ''
           ${pkgs.brave}/bin/brave --new-window "http://proxy.iinact.com/overlay/skyline/?OVERLAY_WS=ws://127.0.0.1:10501/ws"
         '')
+
+        # (lib.mkIf cfg.textools.enable pkgs.wrapWine {
+        #   # https://gist.github.com/helpful-fox-senko-san/6238143f5c7352ab44e62c5a0f7f7642
+        #   name = "textools";
+        #   tricks = [ "dotnet48" "dxvk" ];
+        # })
       ] ++ map (name: (writeShellScriptBin name launchffxiv)) [ "ff14" "xivlauncher" ];
     };
 }

hosts/snowhawk/configuration.nix

@@ -97,11 +97,8 @@
 
   security.polkit.enable = true;
 
-  home-manager = {
-    extraSpecialArgs = { inherit inputs self; };
-    users = { "ravenshade" = import ./home.nix; };
-    # backupFileExtension = "backup";
-  };
+  home-manager.users = { "ravenshade" = import ./home.nix; };
+  # home-manager.backupFileExtension = "backup";
 
   # programs.hyprland.enable = true;
   # environment.sessionVariables.NIXOS_OZONE_WL = "1";

lib/builders.nix

@@ -1,10 +1,17 @@
 { nixpkgs, self, ... }@inputs:
 
 let
+  makePkgs = system: (import nixpkgs {
+    inherit system;
+
+    config.allowUnfree = true;
+    overlays = [ self.overlays.default ];
+  });
+
   lib = nixpkgs.lib.extend (import ../lib);
 
   inherit (inputs.home-manager.lib) homeManagerConfiguration;
-  inherit (nixpkgs.lib) nixosSystem;
+  inherit (lib) nixosSystem right;
   inherit (lib.strings) optionalString;
   inherit (lib.attrsets) nameValuePair;
 in
@@ -13,13 +20,20 @@ rec {
     { hostname, system }:
     nameValuePair
       hostname
-      (nixosSystem {
-        inherit system;
-        specialArgs = { inherit inputs lib self; };
+      (nixosSystem rec {
+        pkgs = makePkgs system;
+        specialArgs = { inherit inputs self; };
+
         modules = [
           ../hosts/${hostname}/hardware-configuration.nix
           ../hosts/${hostname}/configuration.nix
           inputs.home-manager.nixosModules.default
+          {
+            home-manager.extraSpecialArgs = {
+              inherit inputs self pkgs;
+              lib = pkgs.lib.extend (_: _: inputs.home-manager.lib);
+            };
+          }
         ];
       });
   compileSystems =
@@ -39,11 +53,8 @@ rec {
     nameValuePair
       "${user}${hostStr}"
       (homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.${system};
-        extraSpecialArgs = {
-          inherit inputs self;
-          lib = lib.extend (_: _: inputs.home-manager.lib);
-        };
+        pkgs = makePkgs system;
+        extraSpecialArgs = { inherit inputs self; };
 
         modules = [
           ../hosts/${configHost}/home.nix

lib/default.nix

@@ -1,5 +1,7 @@
 final: prev:
-with prev;
+let
+  inherit (prev) isFunction;
+in
 rec {
   # Ternary operator
   # Exaample:

modules/default.nix

@@ -14,5 +14,5 @@ in
   snowhawk.audio.enable = lib.mkDefault true;
   snowhawk.env.enable = lib.mkDefault true;
   snowhawk.sops.enable = lib.mkDefault true;
-  snowhawk.nixpkgs.enable = lib.mkDefault true;
+  snowhawk.nixpkgs.enable = lib.mkDefault false;
 }

pkgs/default.nix

@@ -3,6 +3,8 @@ let
   callDefaultPackage = path: prev.callPackage path { };
 in
 {
+  lib = prev.lib.extend (import ../lib);
+
   wrapWine = callDefaultPackage ./wrapWine;
   writeXrandrScriptBin = callDefaultPackage ./writeXrandrScriptBin;
   borderlessBrowser = callDefaultPackage ./borderlessBrowser;