From 02e040d294fb9f42a9f239e7128fdb7b09a54a88 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 21 Jan 2024 17:17:48 +0800 Subject: [PATCH] refactor: hosts - darwin --- hosts/README.md | 2 +- hosts/{fern => darwin_fern}/default.nix | 0 hosts/{fern => darwin_fern}/home.nix | 0 hosts/{harmonica => darwin_harmonica}/default.nix | 0 hosts/{harmonica => darwin_harmonica}/home.nix | 0 systems/vars.nix | 8 ++++---- 6 files changed, 5 insertions(+), 5 deletions(-) rename hosts/{fern => darwin_fern}/default.nix (100%) rename hosts/{fern => darwin_fern}/home.nix (100%) rename hosts/{harmonica => darwin_harmonica}/default.nix (100%) rename hosts/{harmonica => darwin_harmonica}/home.nix (100%) diff --git a/hosts/README.md b/hosts/README.md index f26df53a..16e0ea9c 100644 --- a/hosts/README.md +++ b/hosts/README.md @@ -1,6 +1,6 @@ # Hosts -1. macOS +1. macOS(darwin) 1. `fern`: MacBook Pro 2022 13-inch M2 16G, mainly for business. 1. `harmonica`: MacBook Pro 2020 13-inch i5 16G, for personal use. 2. `idols` diff --git a/hosts/fern/default.nix b/hosts/darwin_fern/default.nix similarity index 100% rename from hosts/fern/default.nix rename to hosts/darwin_fern/default.nix diff --git a/hosts/fern/home.nix b/hosts/darwin_fern/home.nix similarity index 100% rename from hosts/fern/home.nix rename to hosts/darwin_fern/home.nix diff --git a/hosts/harmonica/default.nix b/hosts/darwin_harmonica/default.nix similarity index 100% rename from hosts/harmonica/default.nix rename to hosts/darwin_harmonica/default.nix diff --git a/hosts/harmonica/home.nix b/hosts/darwin_harmonica/home.nix similarity index 100% rename from hosts/harmonica/home.nix rename to hosts/darwin_harmonica/home.nix diff --git a/systems/vars.nix b/systems/vars.nix index d5b71680..bccf1893 100644 --- a/systems/vars.nix +++ b/systems/vars.nix @@ -155,25 +155,25 @@ in { # darwin systems darwin_harmonica_modules = { darwin-modules = [ - ../hosts/harmonica + ../hosts/darwin_harmonica ../modules/darwin ../secrets/darwin.nix ]; home-module.imports = [ - ../hosts/harmonica/home.nix + ../hosts/darwin_harmonica/home.nix ../home/darwin ]; }; darwin_fern_modules = { darwin-modules = [ - ../hosts/fern + ../hosts/darwin_fern ../modules/darwin ../secrets/darwin.nix ]; home-module.imports = [ - ../hosts/fern/home.nix + ../hosts/darwin_fern/home.nix ../home/darwin ]; };