From cc7973d4c118f6322c78336c0ec9eda91d247195 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 11 Nov 2024 22:12:59 +0100
Subject: replace mba with marvin

---
 flake.nix         |  8 ++++----
 system/marvin.nix | 40 ++++++++++++++++++++++++++++++++++++++++
 system/mba.nix    | 44 --------------------------------------------
 user/marvin.nix   | 36 ++++++++++++++++++++++++++++++++++++
 user/mba.nix      | 36 ------------------------------------
 5 files changed, 80 insertions(+), 84 deletions(-)
 create mode 100644 system/marvin.nix
 delete mode 100644 system/mba.nix
 create mode 100644 user/marvin.nix
 delete mode 100644 user/mba.nix

diff --git a/flake.nix b/flake.nix
index 4f754cc7..8dad9fa1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -111,18 +111,18 @@
           ./system/linde.nix
         ];
       };
-      darwinConfigurations.mba = darwin.lib.darwinSystem {
+      darwinConfigurations.marvin = darwin.lib.darwinSystem {
         system = utils.lib.system.aarch64-darwin;
         specialArgs = { inherit inputs; };
         modules = [
-          ./system/mba.nix
+          ./system/marvin.nix
           personal.darwinModules.caddy
         ];
       };
-      homeConfigurations."alan@mba" = mkHomeConfiguration {
+      homeConfigurations."alan@marvin" = mkHomeConfiguration {
         system = utils.lib.system.aarch64-darwin;
         modules = [
-          ./user/mba.nix
+          ./user/marvin.nix
           nix-index-database.hmModules.nix-index
           (secrets + "/default.nix")
           (secrets + "/ssh.nix")
diff --git a/system/marvin.nix b/system/marvin.nix
new file mode 100644
index 00000000..68caa190
--- /dev/null
+++ b/system/marvin.nix
@@ -0,0 +1,40 @@
+{ ... }: {
+  imports = [
+    ./settings/darwin.nix
+    ./settings/dev.nix
+    ./settings/programs/shell.nix
+  ];
+
+  services.caddy = {
+    user = "root";
+    group = "wheel";
+  };
+
+  services.activate-system.enable = true;
+
+  environment.variables.LANG = "en_GB.UTF-8";
+
+  # Used for backwards compatibility, please read the changelog before changing.
+  # $ darwin-rebuild changelog
+  system.stateVersion = 4;
+
+  # You should generally set this to the total number of logical cores in your system.
+  # $ sysctl -n hw.ncpu
+  nix.settings = {
+    max-jobs = 8;
+    cores = 4;
+    auto-optimise-store = false; # https://github.com/NixOS/nix/issues/7273
+  };
+
+  nix.buildMachines = [
+    {
+      protocol = "ssh-ng";
+      sshUser = "nixremote";
+      hostName = "linde.alanpearce.eu";
+      system = "aarch64-linux";
+      maxJobs = 2;
+      speedFactor = 1;
+      supportedFeatures = [ ];
+    }
+  ];
+}
diff --git a/system/mba.nix b/system/mba.nix
deleted file mode 100644
index ede4542d..00000000
--- a/system/mba.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ ... }: {
-  imports = [
-    ./settings/darwin.nix
-    ./settings/dev.nix
-    ./settings/programs/shell.nix
-  ];
-
-  services.caddy = {
-    user = "root";
-    group = "wheel";
-  };
-
-  networking = {
-    hostName = "mba";
-  };
-
-  services.activate-system.enable = true;
-
-  environment.variables.LANG = "en_GB.UTF-8";
-
-  # Used for backwards compatibility, please read the changelog before changing.
-  # $ darwin-rebuild changelog
-  system.stateVersion = 4;
-
-  # You should generally set this to the total number of logical cores in your system.
-  # $ sysctl -n hw.ncpu
-  nix.settings = {
-    max-jobs = 8;
-    cores = 4;
-    auto-optimise-store = false; # https://github.com/NixOS/nix/issues/7273
-  };
-
-  nix.buildMachines = [
-    {
-      protocol = "ssh-ng";
-      sshUser = "nixremote";
-      hostName = "linde.alanpearce.eu";
-      system = "aarch64-linux";
-      maxJobs = 2;
-      speedFactor = 1;
-      supportedFeatures = [ ];
-    }
-  ];
-}
diff --git a/user/marvin.nix b/user/marvin.nix
new file mode 100644
index 00000000..b76bdd74
--- /dev/null
+++ b/user/marvin.nix
@@ -0,0 +1,36 @@
+{ pkgs, ... }: {
+  imports = [
+    ./settings/base.nix
+    ./settings/development/base.nix
+    ./settings/development/javascript.nix
+    ./settings/development/golang.nix
+    ./settings/development/web.nix
+    ./settings/darwin.nix
+    ./settings/emacs.nix
+    ./settings/fish.nix
+    ./settings/git.nix
+    ./settings/kitty.nix
+    ./settings/nixpkgs.nix
+    ./settings/ssh.nix
+    ./settings/user-interface.nix
+  ];
+
+  home.username = "alan";
+  home.homeDirectory = "/Users/alan";
+  home.stateVersion = "22.11";
+
+  launchd.agents.colima = {
+    enable = true;
+    config = {
+      ProgramArguments = [ "${pkgs.colima}/bin/colima" "start" ];
+      RunAtLoad = true;
+      # It doesn't run in the foreground, yet...
+      # KeepAlive = true;
+      WorkingDirectory = "/Users/alan";
+      StandardOutPath = "/Users/alan/Library/Logs/colima.log";
+      StandardErrorPath = "/Users/alan/Library/Logs/colima.log";
+      EnvironmentVariables.HOME = "/Users/alan";
+    };
+  };
+
+}
diff --git a/user/mba.nix b/user/mba.nix
deleted file mode 100644
index b76bdd74..00000000
--- a/user/mba.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ pkgs, ... }: {
-  imports = [
-    ./settings/base.nix
-    ./settings/development/base.nix
-    ./settings/development/javascript.nix
-    ./settings/development/golang.nix
-    ./settings/development/web.nix
-    ./settings/darwin.nix
-    ./settings/emacs.nix
-    ./settings/fish.nix
-    ./settings/git.nix
-    ./settings/kitty.nix
-    ./settings/nixpkgs.nix
-    ./settings/ssh.nix
-    ./settings/user-interface.nix
-  ];
-
-  home.username = "alan";
-  home.homeDirectory = "/Users/alan";
-  home.stateVersion = "22.11";
-
-  launchd.agents.colima = {
-    enable = true;
-    config = {
-      ProgramArguments = [ "${pkgs.colima}/bin/colima" "start" ];
-      RunAtLoad = true;
-      # It doesn't run in the foreground, yet...
-      # KeepAlive = true;
-      WorkingDirectory = "/Users/alan";
-      StandardOutPath = "/Users/alan/Library/Logs/colima.log";
-      StandardErrorPath = "/Users/alan/Library/Logs/colima.log";
-      EnvironmentVariables.HOME = "/Users/alan";
-    };
-  };
-
-}
-- 
cgit 1.4.1