no more lib :(

home/modules/default.nix

@@ -15,8 +15,8 @@ in
 {
   imports = getModules ./.;
 
-  nixpkgs.config.allowUnfree = true;
+  # nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [ self.overlays.default ];
+  # 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" ];
     };
 }

lib/builders.nix

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

lib/default.nix

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

lib/overlay.nix

@@ -0,0 +1,2 @@
+final: prev:
+(import ./. 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 true;
+  snowhawk.nixpkgs.enable = lib.mkDefault false;
 }

pkgs/default.nix

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