From c95e4a14887e871f0cb0ec2a5251d7d20a4bd304 Mon Sep 17 00:00:00 2001 From: mikl Date: Fri, 26 Jun 2026 23:39:58 +0300 Subject: [PATCH] inline common-darwin into poppy (only one darwin host for now) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - merged common-darwin/default.nix content into hosts/poppy/default.nix - removed hosts/common-darwin/ - removed ./hosts/common-darwin import from mkDarwin in flake.nix linux hosts/common/ stays — already 2 linux hosts (muscari + rosemary) --- flake.nix | 1 - hosts/common-darwin/default.nix | 20 -------------------- hosts/poppy/default.nix | 20 +++++++++++++++++++- 3 files changed, 19 insertions(+), 22 deletions(-) delete mode 100644 hosts/common-darwin/default.nix diff --git a/flake.nix b/flake.nix index 76ca943..8289a3c 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,6 @@ nix-darwin.lib.darwinSystem { system = "aarch64-darwin"; modules = [ - ./hosts/common-darwin ./hosts/${hostname} home-manager.darwinModules.home-manager { diff --git a/hosts/common-darwin/default.nix b/hosts/common-darwin/default.nix deleted file mode 100644 index 95fdeca..0000000 --- a/hosts/common-darwin/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, ... }: -{ - # flake + nix-command - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; - - # nix daemon (multi-user install) - services.nix-daemon.enable = true; - - users.users.mikl = { - home = "/Users/mikl"; - shell = pkgs.zsh; - }; - - environment.systemPackages = [ - pkgs.vim - ]; -} \ No newline at end of file diff --git a/hosts/poppy/default.nix b/hosts/poppy/default.nix index 7e0008b..0bc6467 100644 --- a/hosts/poppy/default.nix +++ b/hosts/poppy/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: { networking.hostName = "poppy"; @@ -6,4 +6,22 @@ nixpkgs.config.allowUnfree = true; system.primaryUser = "mikl"; + + # nix settings + nix.settings.experimental-features = [ + "nix-command" + "flakes" + ]; + + # nix daemon (multi-user install) + services.nix-daemon.enable = true; + + users.users.mikl = { + home = "/Users/mikl"; + shell = pkgs.zsh; + }; + + environment.systemPackages = [ + pkgs.vim + ]; } \ No newline at end of file