diff --git a/Justfile b/Justfile index 01c36fc3..67ef9a45 100644 --- a/Justfile +++ b/Justfile @@ -124,7 +124,7 @@ s-hypr mode="default": ############################################################################ # -# Darwin related commands, harmonica is my macbook pro's hostname +# Darwin related commands # ############################################################################ @@ -141,15 +141,6 @@ darwin-rollback: use {{utils_nu}} *; darwin-rollback -# Deploy to harmonica(macOS host) -[macos] -[group('desktop')] -ha mode="default": - #!/usr/bin/env nu - use {{utils_nu}} *; - darwin-build "harmonica" {{mode}}; - darwin-switch "harmonica" {{mode}} - # Depoly to fern(macOS host) [macos] [group('desktop')] diff --git a/README.md b/README.md index d9b09485..0768458a 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ You don't have to go through the pain I've experienced again! Check out my | **Text Editor** | [Neovim][Neovim] | | **Fonts** | [Nerd fonts][Nerd fonts] | | **Image Viewer** | [imv][imv] | -| **Screenshot Software** | [hyprshot][hyprshot] | +| **Screenshot Software** | [hyprshot][hyprshot] | | **Screen Recording** | [OBS][OBS] | | **Filesystem & Encryption** | tmpfs on `/`, [Btrfs][Btrfs] subvolumes on a [LUKS][LUKS] encrypted partition for persistent, unlock via passphrase | | **Secure Boot** | [lanzaboote][lanzaboote] | @@ -132,15 +132,11 @@ nix-shell -p just nushell # 3. comment home-manager's code in lib/macosSystem.nix to speed up the first deployment. # 4. comment out the proxy settings in scripts/darwin_set_proxy.py if the proxy is not ready yet. -# 4. deploy harmonica's configuration(macOS Intel) -just ha - # deploy fern's configuration(Apple Silicon) just fe # deploy with details -just ha debug -# just fe debug +just fe debug ``` > [What y'all will need when Nix drives you to drink.](https://www.youtube.com/watch?v=Eni9PPPPBpg) diff --git a/hosts/README.md b/hosts/README.md index b1585e93..9ab69a80 100644 --- a/hosts/README.md +++ b/hosts/README.md @@ -1,11 +1,5 @@ # Hosts -1. `12kingdoms`: - 1. `shoukei`: NixOS on Macbook Pro 2020 Intel i5, 13.3-inch, 16G RAM + 512G SSD. -1. `darwin`(macOS) - 1. `fern`: MacBook Pro 2022 13-inch M2 16G, mainly for business. - 1. `harmonica`: MacBook Pro 2020 13-inch i5 16G, for personal use. -1. `k8s`: My Kubevirt & Kubernetes Clusters 1. `idols` 1. `ai`: My main computer, with NixOS + I5-13600KF + RTX 4090 GPU, for gaming & daily use. 2. `aquamarine`: Kubevirt Virtual Machine. @@ -13,6 +7,12 @@ and other services. 3. `ruby`: Not used now. 4. `kana`: Not used now. +1. `k8s`: My Kubevirt & Kubernetes Clusters +1. `darwin`(macOS) + 1. `fern`: MacBook Pro 2022 13-inch M2 16G, mainly for personal use. + 1. `frieren`: MacBook Pro 2024 14-inch M4Pro 48G, mainly for work. +1. `12kingdoms`: + 1. `shoukei`: NixOS on MacBook Pro 2022 M2. 1. Other aarch64/riscv64 SBCs: [ryan4yin/nixos-config-sbc](https://github.com/ryan4yin/nixos-config-sbc)