about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--flake.nix17
-rw-r--r--flake/default.nix7
-rw-r--r--sys/svcs/xdg/default.nix4
3 files changed, 17 insertions, 11 deletions
diff --git a/flake.nix b/flake.nix
index 648b164a..f56b5e21 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,9 +3,10 @@
 
   inputs = {
     # base
+    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05";
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    # open nixpkgs prs
     nixpkgs-tfc.url = "github:soispha/nixpkgs/add-termfilechooser";
-    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05";
 
     # inputs for following
     systems = {
@@ -272,7 +273,11 @@
 
     # FIXME: this `nixpkgs` misses the configs applied to the other one
     nixpkgs_as_input = nixpkgs;
-    nixpkgs_tfc = nixpkgs-tfc;
+    nixpkgs_open_prs = {
+      inherit
+        nixpkgs-tfc
+        ;
+    };
     outputs = import ./flake {
       inherit
         # core
@@ -281,9 +286,9 @@
         system
         sysLib
         nixpkgs_as_input
-        nixpkgs_tfc
+        nixpkgs_open_prs
         # modules
-        
+
         home-manager
         nixVim
         nixos-generators
@@ -295,12 +300,12 @@
         lanzaboote
         nix-index-database
         # external dependencies
-        
+
         treefmt-nix
         user_js
         templates
         # my binaries
-        
+
         shell_library
         river_init_lesser
         yambar_memory
diff --git a/flake/default.nix b/flake/default.nix
index daa22734..c9d64740 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -5,7 +5,7 @@
   system,
   sysLib,
   nixpkgs_as_input,
-  nixpkgs_tfc,
+  nixpkgs_open_prs,
   # modules
   home-manager,
   nixVim,
@@ -31,6 +31,7 @@
     inherit
       pkgs
       sysLib
+      nixpkgs_open_prs
       # extra information
       
       system
@@ -51,7 +52,7 @@
       ;
   };
   defaultModules = [
-    "${nixpkgs_tfc}/nixos/modules/config/xdg/portals/termfilechooser.nix"
+    "${nixpkgs_open_prs.nixpkgs-tfc}/nixos/modules/config/xdg/portals/termfilechooser.nix"
 
     agenix.nixosModules.default
 
@@ -78,7 +79,7 @@
       self
       # extra package sources
       
-      nixpkgs_tfc
+      nixpkgs_open_prs
       ;
   };
   treefmtEval = treefmt-nix.lib.evalModule pkgs (
diff --git a/sys/svcs/xdg/default.nix b/sys/svcs/xdg/default.nix
index c3df9f60..5140a832 100644
--- a/sys/svcs/xdg/default.nix
+++ b/sys/svcs/xdg/default.nix
@@ -1,11 +1,11 @@
 {
   pkgs,
-  nixpkgs_tfc,
+  nixpkgs_open_prs,
   sysLib,
   system,
   ...
 }: let
-  pkgs_tfc = nixpkgs_tfc.legacyPackages."${system}";
+  pkgs_tfc = nixpkgs_open_prs.nixpkgs-tfc.legacyPackages."${system}";
 in {
   services.dbus.enable = true;
   xdg = {