diff --git a/flake.nix b/flake.nix index 54258de..b82150b 100644 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,8 @@ inputs = { nixpkgs.url = "github:arachnist/nixpkgs/ar-patchset-unstable"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - nix-colors.url = "github:misterio77/nix-colors"; nix-formatter-pack.url = "github:Gerschtli/nix-formatter-pack"; - nix-index-database.url = "github:Mic92/nix-index-database"; - nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; deploy-rs.url = "github:serokell/deploy-rs"; - microvm.url = "github:astro/microvm.nix"; - microvm.inputs.nixpkgs.follows = "nixpkgs"; impermanence.url = "github:nix-community/impermanence"; colmena = { url = "github:zhaofengli/colmena/main"; @@ -33,7 +26,6 @@ url = "github:Jovian-Experiments/Jovian-NixOS"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; lix = { url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90.0-rc1"; diff --git a/modules/common.nix b/modules/common.nix index d3fe6a6..c31a55f 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -3,11 +3,8 @@ let meta = import ../meta.nix; in { imports = with inputs; [ - nix-index-database.nixosModules.nix-index agenix.nixosModules.default - microvm.nixosModules.host - self.nixosModules.boot ]; @@ -188,10 +185,6 @@ in { [ { Address = "10.0.0.1/24"; } { Address = "fd12:3456:789a::1/64"; } ]; ipv6Prefixes = [{ Prefix = "fd12:3456:789a::/64"; }]; }; - networks.microvm-eth0 = { - matchConfig.Name = "vm-*"; - networkConfig.Bridge = "virbr0"; - }; }; services.chrony.enable = true; diff --git a/modules/graphical.nix b/modules/graphical.nix index e53f2e6..8b3411f 100644 --- a/modules/graphical.nix +++ b/modules/graphical.nix @@ -17,18 +17,10 @@ let ${util-linux}/bin/rfkill unblock 0 ''; in { - imports = [ inputs.self.nixosModules.common inputs.home-manager.nixosModule ]; + imports = [ inputs.self.nixosModules.common ]; nix.registry = nixRegistry; - home-manager.users.ar = { - home.username = "ar"; - home.homeDirectory = "/home/ar"; - home.stateVersion = config.system.stateVersion; - }; - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - boot = { extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; extraModprobeConfig = '' @@ -51,8 +43,6 @@ in { pulse.enable = true; }; - home-manager.users.ar.services.easyeffects.enable = true; - networking.networkmanager.enable = true; networking.networkmanager.wifi.backend = "wpa_supplicant"; systemd.network.wait-online.enable = false; diff --git a/nixos/akamanto/default.nix b/nixos/akamanto/default.nix index 5ab0f5d..dc02b61 100644 --- a/nixos/akamanto/default.nix +++ b/nixos/akamanto/default.nix @@ -144,8 +144,6 @@ in { environment.etc."wifi-secrets".text = ci-secrets.wifi; - microvm.host.enable = false; - systemd.network.enable = lib.mkForce false; networking = { useDHCP = true; diff --git a/nixos/kamaitachi/default.nix b/nixos/kamaitachi/default.nix index ce3f9cb..7254eef 100644 --- a/nixos/kamaitachi/default.nix +++ b/nixos/kamaitachi/default.nix @@ -112,8 +112,6 @@ in { environment.etc."wifi-secrets".text = ci-secrets.wifi; - microvm.host.enable = false; - systemd.network.enable = lib.mkForce false; networking = { useDHCP = true; diff --git a/nixos/tsukumogami/default.nix b/nixos/tsukumogami/default.nix index 9f5b287..3d5fd74 100644 --- a/nixos/tsukumogami/default.nix +++ b/nixos/tsukumogami/default.nix @@ -111,8 +111,6 @@ in { environment.etc."wifi-secrets".text = ci-secrets.wifi; - microvm.host.enable = false; - systemd.network.enable = lib.mkForce false; networking = { useDHCP = true;