Skip to content

Commit 5a021dd

Browse files
committed
🧹 chore: remove unused microvm input and update gitignore
- Remove microvm.nix flake input that was never used - None of the packages used anything from microvm.overlay - Update .gitignore for project tooling directories
1 parent c1a0dd1 commit 5a021dd

3 files changed

Lines changed: 10 additions & 94 deletions

File tree

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ result-*
66
.direnv/
77

88
# project
9-
docs/
9+
.claude/
10+
.serena/
1011

1112
# Editor files
1213
*.swp

flake.lock

Lines changed: 0 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@
1111
inputs.nixpkgs.follows = "nixpkgs";
1212
};
1313

14-
# microvm.nix for Firecracker packages and networking patterns
15-
microvm = {
16-
url = "github:astro/microvm.nix";
17-
inputs.nixpkgs.follows = "nixpkgs";
18-
};
19-
2014
# disko for declarative disk partitioning
2115
disko = {
2216
url = "github:nix-community/disko";
@@ -42,7 +36,6 @@
4236
nixpkgs,
4337
flake-utils,
4438
nixos-generators,
45-
microvm,
4639
disko,
4740
colmena,
4841
sops-nix,
@@ -73,12 +66,6 @@
7366
targetSystem = "${hostArch}-linux";
7467
crossTargetSystem = "${crossArch}-linux";
7568

76-
# Native pkgs with overlays (for local testing of packages)
77-
pkgsWithOverlays = import nixpkgs {
78-
inherit system;
79-
overlays = [ microvm.overlay ];
80-
};
81-
8269
# Helper to build NixOS images using nixos-generators
8370
# Uses system argument to let nixos-generators handle pkgs correctly
8471
mkImages = targetSys: {
@@ -103,14 +90,14 @@
10390
# Packages: All Linux-only (fireactions/fireteact depend on Linux networking primitives)
10491
packages =
10592
lib.optionalAttrs isLinux {
106-
fireactions = pkgsWithOverlays.callPackage ./pkgs/fireactions.nix { };
107-
fireteact = pkgsWithOverlays.callPackage ./pkgs/fireteact.nix { };
108-
fireglab = pkgsWithOverlays.callPackage ./pkgs/fireglab.nix { };
109-
firecracker-kernel = pkgsWithOverlays.callPackage ./pkgs/firecracker-kernel.nix { };
110-
firecracker-kernel-custom = pkgsWithOverlays.callPackage ./pkgs/firecracker-kernel-custom.nix { };
111-
tc-redirect-tap = pkgsWithOverlays.callPackage ./pkgs/tc-redirect-tap.nix { };
112-
zot = pkgsWithOverlays.callPackage ./pkgs/zot.nix { };
113-
default = pkgsWithOverlays.callPackage ./pkgs/fireactions.nix { };
93+
fireactions = pkgsNative.callPackage ./pkgs/fireactions.nix { };
94+
fireteact = pkgsNative.callPackage ./pkgs/fireteact.nix { };
95+
fireglab = pkgsNative.callPackage ./pkgs/fireglab.nix { };
96+
firecracker-kernel = pkgsNative.callPackage ./pkgs/firecracker-kernel.nix { };
97+
firecracker-kernel-custom = pkgsNative.callPackage ./pkgs/firecracker-kernel-custom.nix { };
98+
tc-redirect-tap = pkgsNative.callPackage ./pkgs/tc-redirect-tap.nix { };
99+
zot = pkgsNative.callPackage ./pkgs/zot.nix { };
100+
default = pkgsNative.callPackage ./pkgs/fireactions.nix { };
114101
}
115102
// {
116103
# Images - available on all platforms, always target Linux

0 commit comments

Comments
 (0)