about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--flake.nix48
-rw-r--r--flake/default.nix12
-rw-r--r--sys/svcs/nix/default.nix7
3 files changed, 66 insertions, 1 deletions
diff --git a/flake.nix b/flake.nix
index 455b090b..87a23ce9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,51 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-23.05";
 
+    my_flake = {
+      url = "git+https://codeberg.org/soispha/nixos-config.git";
+      inputs = {
+        # My flake inputs {{{
+        agenix.follows = "agenix";
+        beautysh.follows = "beautysh";
+        crane.follows = "crane";
+        disko.follows = "disko";
+        flake-compat.follows = "flake-compat";
+        flake-utils.follows = "flake-utils";
+        flake_update.follows = "flake_update";
+        flake_version_update.follows = "flake_version_update";
+        generate_firefox_extensions.follows = "generate_firefox_extensions";
+        gitignore.follows = "gitignore";
+        grades.follows = "grades";
+        haumea.follows = "haumea";
+        home-manager.follows = "home-manager";
+        impermanence.follows = "impermanence";
+        lanzaboote.follows = "lanzaboote";
+        lf_rename.follows = "lf_rename";
+        neovim_config.follows = "neovim_config";
+        nixNeovim.follows = "nixNeovim";
+        nixNeovimPlugins.follows = "nixNeovimPlugins";
+        nixVim.follows = "nixVim";
+        nixos-generators.follows = "nixos-generators";
+        nixpkgs-stable.follows = "nixpkgs-stable";
+        nixpkgs.follows = "nixpkgs";
+        poetry2nix.follows = "poetry2nix";
+        pre-commit-hooks.follows = "pre-commit-hooks";
+        ragenix.follows = "ragenix";
+        river_init_lesser.follows = "river_init_lesser";
+        rust-overlay.follows = "rust-overlay";
+        serverphone.follows = "serverphone";
+        shell_library.follows = "shell_library";
+        strip_js_comments.follows = "strip_js_comments";
+        systems.follows = "systems";
+        templates.follows = "templates";
+        user_js.follows = "user_js";
+        video_pause.follows = "video_pause";
+        yambar_cpu.follows = "yambar_cpu";
+        yambar_memory.follows = "yambar_memory";
+        # }}}
+      };
+    };
+
     # inputs for following
     systems = {
       url = "github:nix-systems/x86_64-linux"; # only evaluate for this system
@@ -283,6 +328,7 @@
     # core
     self,
     nixpkgs,
+    my_flake,
     # modules
     home-manager,
     nixos-generators,
@@ -320,6 +366,7 @@
     });
     # FIXME: this `nixpkgs` misses the configs applied to the other one
     nixpkgs_as_input = nixpkgs;
+    my_flake_as_input = my_flake;
     outputs = import ./flake {
       inherit
         # core
@@ -328,6 +375,7 @@
         system
         sysLib
         nixpkgs_as_input
+        my_flake_as_input
         # modules
         
         home-manager
diff --git a/flake/default.nix b/flake/default.nix
index c98b8bd3..26944cf8 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -5,6 +5,7 @@
   system,
   sysLib,
   nixpkgs_as_input,
+  my_flake_as_input,
   # modules
   home-manager,
   nixNeovim,
@@ -76,7 +77,16 @@
     serverphone.nixosModules.default
   ];
   defaultSpecialArgs = {
-    inherit templates sysLib serverphone system nixpkgs_as_input;
+    inherit
+      templates
+      sysLib
+      serverphone
+      system
+      # nix registry
+      
+      nixpkgs_as_input
+      my_flake_as_input
+      ;
   };
 in {
   nixosConfigurations = import ./nixosConfigurations {
diff --git a/sys/svcs/nix/default.nix b/sys/svcs/nix/default.nix
index 97b7220d..4faafc92 100644
--- a/sys/svcs/nix/default.nix
+++ b/sys/svcs/nix/default.nix
@@ -1,10 +1,13 @@
 {
   pkgs,
+  # flakes
   nixpkgs_as_input,
   templates,
+  my_flake_as_input,
   ...
 }: let
   nixpkgs = nixpkgs_as_input;
+  my_flake = my_flake_as_input;
 in {
   nix = {
     package = pkgs.nixStable;
@@ -12,7 +15,11 @@ in {
     registry = {
       nixpkgs.flake = nixpkgs;
       n.flake = nixpkgs;
+
       t.flake = templates;
+
+      my_flake.flake = my_flake;
+      m.flake = my_flake;
     };
 
     gc = {