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,12 +19,6 @@ 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" ];
     };
 }

lib/builders.nix

@@ -1,21 +1,12 @@
 { nixpkgs, self, ... }@inputs:
 
 let
-  makePkgs = system: (import nixpkgs {
-    inherit system;
-
-    config.allowUnfree = true;
-    overlays = [ self.overlays.default ];
-  });
-
-  lib = nixpkgs.lib;
-  # libExt = import ./. lib;
+  lib = nixpkgs.lib.extend (import ../lib);
 
   inherit (inputs.home-manager.lib) homeManagerConfiguration;
-  inherit (lib) nixosSystem;
+  inherit (nixpkgs.lib) nixosSystem;
   inherit (lib.strings) optionalString;
   inherit (lib.attrsets) nameValuePair;
-  # inherit (libExt) right;
 in
 rec {
   toPartialNixosConfig =
@@ -23,9 +14,8 @@ rec {
     nameValuePair
       hostname
       (nixosSystem {
-        pkgs = makePkgs system;
-        specialArgs = { inherit inputs self; };
-
+        inherit system;
+        specialArgs = { inherit inputs lib self; };
         modules = [
           ../hosts/${hostname}/hardware-configuration.nix
           ../hosts/${hostname}/configuration.nix
@@ -34,8 +24,10 @@ rec {
       });
   compileSystems =
     systems:
-    (builtins.listToAttrs
-      (map toPartialNixosConfig systems));
+    lib.right
+      builtins.listToAttrs
+      (map toPartialNixosConfig)
+      systems;
 
   toPartialHomeManagerConfig =
     { user, system, hostname ? "", configHostname ? "" }:
@@ -47,8 +39,11 @@ rec {
     nameValuePair
       "${user}${hostStr}"
       (homeManagerConfiguration {
-        pkgs = makePkgs system;
-        extraSpecialArgs = { inherit inputs self; };
+        pkgs = nixpkgs.legacyPackages.${system};
+        extraSpecialArgs = {
+          inherit inputs self;
+          lib = lib.extend (_: _: inputs.home-manager.lib);
+        };
 
         modules = [
           ../hosts/${configHost}/home.nix
@@ -56,6 +51,8 @@ rec {
       });
   compileHomes =
     systems:
-    (builtins.listToAttrs
-      (map toPartialHomeManagerConfig systems));
+    lib.right
+      builtins.listToAttrs
+      (map toPartialHomeManagerConfig)
+      systems;
 }

lib/default.nix

@@ -1,4 +1,5 @@
-lib:
+final: prev:
+with prev;
 rec {
   # Ternary operator
   # Exaample:
@@ -9,7 +10,7 @@ rec {
   # Right-associate and chain following single-operand functions
   # Example:
   # right f g h 1 => f(g(h(1)))
-  right = f: g: tern (lib.isFunction g)
+  right = f: g: tern (isFunction g)
     (right (x: f (g (x))))
     (f (g));
 }

lib/overlay.nix

@@ -1,2 +0,0 @@
-final: prev:
-(import ./. { lib = prev; })

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 false;
+  snowhawk.nixpkgs.enable = lib.mkDefault true;
 }

pkgs/default.nix

@@ -3,9 +3,7 @@ let
   callDefaultPackage = path: prev.callPackage path { };
 in
 {
-  lib = prev.lib.extend import ../lib/overlay.nix;
-
   wrapWine = callDefaultPackage ./wrapWine;
   writeXrandrScriptBin = callDefaultPackage ./writeXrandrScriptBin;
-  borderlessBrowser = callDefaultPackage ./borderlessBrowser;
+  borderlessBrowser = callDefaultPackage ./writeXrandrScriptBin;
 }