diff --git a/README.md b/README.md index 6003a0c..8582b86 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,6 @@ Currently, our three main machines and all virtual machines run NixOS! ## Acknowledgements - [deploy-rs](https://github.com/serokell/deploy-rs): NixOS deploy tool with rollback functionality -- [kubenix](https://kubenix.org/): Kubernetes management in Nix (usage planned for the future) - [disko](https://github.com/nix-community/disko): declarative disk partitioning - [agenix](https://github.com/ryantm/agenix): deployment of encrypted secrets to NixOS machines - [dns.nix](https://github.com/kirelagin/dns.nix): A Nix DSL for defining DNS zones diff --git a/flake.lock b/flake.lock index c98670d..caeac56 100644 --- a/flake.lock +++ b/flake.lock @@ -121,22 +121,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1614513358, @@ -154,7 +138,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, @@ -191,29 +175,6 @@ "type": "github" } }, - "kubenix": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2", - "treefmt": "treefmt" - }, - "locked": { - "lastModified": 1700116223, - "narHash": "sha256-Pld/UXlBcIDnQMY0JkDzChJkbof/zEcRkaiXtzvArEE=", - "owner": "hall", - "repo": "kubenix", - "rev": "e4d036576436b9983216584a89388af3da995043", - "type": "github" - }, - "original": { - "owner": "hall", - "repo": "kubenix", - "type": "github" - } - }, "microvm": { "inputs": { "flake-utils": "flake-utils_2", @@ -290,7 +251,6 @@ "deploy-rs": "deploy-rs", "disko": "disko", "dns": "dns", - "kubenix": "kubenix", "microvm": "microvm", "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" @@ -337,43 +297,8 @@ "type": "github" }, "original": { - "id": "systems", - "type": "indirect" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "treefmt": { - "inputs": { - "nixpkgs": [ - "kubenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688026376, - "narHash": "sha256-qJmkr9BWDpqblk4E9/rCsAEl39y2n4Ycw6KRopvpUcY=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "df3f32b0cc253dfc7009b7317e8f0e7ccd70b1cf", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", "type": "github" } }, diff --git a/flake.nix b/flake.nix index b5f9187..635a074 100644 --- a/flake.nix +++ b/flake.nix @@ -5,10 +5,6 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; deploy-rs.url = "github:serokell/deploy-rs"; - kubenix = { - url = "github:hall/kubenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; disko = { url = "github:nix-community/disko"; @@ -32,7 +28,7 @@ }; outputs = - { self, nixpkgs, deploy-rs, disko, agenix, kubenix, nixpkgs-unstable, dns, microvm, ... }: + { self, nixpkgs, deploy-rs, disko, agenix, nixpkgs-unstable, dns, microvm, ... }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; @@ -73,7 +69,7 @@ nixosConfigurations = mkNixosSystems (name: machine: { inherit system; - specialArgs = { inherit machines machine kubenix dns microvm disko agenix; }; + specialArgs = { inherit machines machine dns microvm disko agenix; }; modules = [ ./nixos { networking.hostName = name; } diff --git a/nixos/physical.nix b/nixos/physical.nix index ba5641b..72bdd94 100644 --- a/nixos/physical.nix +++ b/nixos/physical.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, modulesPath, microvm, disko, agenix, machines, dns, kubenix, ... }: { +{ pkgs, config, lib, modulesPath, microvm, disko, agenix, machines, dns, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") microvm.nixosModules.host @@ -62,7 +62,7 @@ (name: vm: { # TODO Simplify? - specialArgs = { inherit agenix disko pkgs lib microvm dns kubenix; machine = vm; hypervisorConfig = config; }; + specialArgs = { inherit agenix disko pkgs lib microvm dns; machine = vm; hypervisorConfig = config; }; config.imports = [ ./. { networking.hostName = name; }