about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEmile <git@emile.space>2024-12-03 21:51:22 +0100
committerEmile <git@emile.space>2024-12-03 21:51:22 +0100
commite754de32526e1e048f6d706c797c3f94a899517b (patch)
tree88bb38b55a03ef8a862f489cb652579d50790492
parent30b941cbf0cbf34f6379e7d7330b08ee4ad78597 (diff)
(flake) remove the tmp master and microvm inputs
-rw-r--r--flake.nix9
-rw-r--r--nix/lib/flake-helper.nix5
2 files changed, 2 insertions, 12 deletions
diff --git a/flake.nix b/flake.nix
index fe4c024..e252cda 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,9 +19,6 @@
     naersk.url = "git+https://github.com/nix-community/naersk";
     naersk.inputs.nixpkgs.follows = "nixpkgs";
 
-    microvm.url = "git+https://github.com/astro/microvm.nix";
-    microvm.inputs.nixpkgs.follows = "nixpkgs";
-
     # hefe-internal.url = "git+ssh://gitea@git.emile.space/hanemile/hefe-internal.git?ref=main";
 
     # nix registry add flake:mylocalrepo git+file:///path/to/local/repo
@@ -42,8 +39,7 @@
       agenix, # store secrets crypted using age
       home-manager, # manage my home envs
       naersk, # build rust stuff
-      hefe-internal, # internal tooling
-      microvm, # microvms
+      # hefe-internal, # internal tooling
       ...
     }@inputs:
     let
@@ -65,8 +61,7 @@
           system = "x86_64-linux";
           ip = "corrino";
           description = "Hetzner AX41 dual 512GB NVME";
-          modules = [ hefe-internal.nixosModules.corrino ];
-          microvms = true;
+          # modules = [ hefe-internal.nixosModules.corrino ];
           # unstable = true;
         };
         chusuk = {
diff --git a/nix/lib/flake-helper.nix b/nix/lib/flake-helper.nix
index 5ba8d77..cac3a71 100644
--- a/nix/lib/flake-helper.nix
+++ b/nix/lib/flake-helper.nix
@@ -3,7 +3,6 @@
   agenix,
   nixpkgs,
   nixpkgs-unstable,
-  nixpkgs-master,
   deploy-rs,
   home-manager,
   darwin,
@@ -22,8 +21,6 @@ rec {
       group ? null,
       modules ? [ ],
       unstable ? false,
-      master ? false,
-      microvms ? false,
       ...
     }:
     let
@@ -31,8 +28,6 @@ rec {
       localNixpkgs =
         if unstable == true then
           nixpkgs-unstable
-        else if master == true then
-          nixpkgs-master
         else
           # inputs.nixpkgs-${name}, if that doesn't exist, just use nixpkgs
           nixpkgs.lib.attrByPath [ "nixpkgs-${name}" ] # path