From 4e9ac313d8470f0d12d919c54c013994b790235a Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 25 Apr 2026 21:53:00 -0500 Subject: [PATCH] test z2w --- modules/hosts/z2w/core.nix | 11 ++++++----- modules/hosts/z2w/default.nix | 15 ++------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/modules/hosts/z2w/core.nix b/modules/hosts/z2w/core.nix index f96691a..60a3230 100644 --- a/modules/hosts/z2w/core.nix +++ b/modules/hosts/z2w/core.nix @@ -1,6 +1,6 @@ { self, inputs, ... }: { - flake.nixosModules.z2w-core = { config, pkgs, ... }: { + flake.nixosModules.z2w-core = { config, lib, pkgs, ... }: { imports = with self.nixosModules; [ @@ -14,22 +14,23 @@ config = { - boot = { + /*boot = { loader = { grub.enable = false; generic-extlinux-compatible.enable = true; }; - }; + };*/ networking = { + hostName = lib.mkDefault "z2w"; nameservers = [ "1.1.1.1" "1.0.0.1" ]; networkmanager.enable = true; }; - hardware = { + /*hardware = { bluetooth.enable = true; - }; + };*/ programs.zsh.enable = true; diff --git a/modules/hosts/z2w/default.nix b/modules/hosts/z2w/default.nix index e37ed05..6cd4315 100644 --- a/modules/hosts/z2w/default.nix +++ b/modules/hosts/z2w/default.nix @@ -8,20 +8,9 @@ system = "aarch64-linux"; - modules = [ + modules = inputs.opi-zero2w.lib.withOpiZero2wEssentials [ self.nixosModules.z2w #self.nixosModules.z2w-hardware - self.diskoConfigurations.z2w - ]; - }; - - flake.nixosConfigurations.z2w-install = inputs.nixpkgs.lib.nixosSystem { - - system = "aarch64-linux"; - - modules = [ - self.nixosModules.z2w-core - #self.nixosModules.z2w-hardware ]; }; @@ -29,7 +18,7 @@ system = "aarch64-linux"; - modules = [ + modules = inputs.opi-zero2w.lib.withOpiZero2wEssentials [ self.nixosModules.z2w-install-sd #self.nixosModules.z2w-hardware ];