From 7281f05669e92e3568f837591912350b32951555 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Tue, 30 Dec 2025 10:33:31 -0800
Subject: organize programs in a way that makes sense to me

---
 machines/HQ-KWNY2VH41P.nix | 37 --------------------------------
 machines/mba-m2.nix        | 53 ----------------------------------------------
 machines/mba-personal.nix  | 47 ++++++++++++++++++++++++++++++++++++++++
 machines/mbp-work.nix      | 37 ++++++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+), 90 deletions(-)
 delete mode 100644 machines/HQ-KWNY2VH41P.nix
 delete mode 100644 machines/mba-m2.nix
 create mode 100644 machines/mba-personal.nix
 create mode 100644 machines/mbp-work.nix

(limited to 'machines')

diff --git a/machines/HQ-KWNY2VH41P.nix b/machines/HQ-KWNY2VH41P.nix
deleted file mode 100644
index fc4340d..0000000
--- a/machines/HQ-KWNY2VH41P.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [
-    ../profiles/darwin.nix
-    ../profiles/home-manager.nix
-  ];
-
-  users.users.fcuny = {
-    home = "/Users/fcuny";
-    shell = pkgs.fish;
-  };
-
-  environment.shells = [ pkgs.fish ];
-
-  programs.fish.enable = true;
-  programs.fish.shellInit = ''
-    # Nix
-    if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
-      source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
-    end
-    # End Nix
-  '';
-
-  home-manager.users.fcuny = {
-    home.stateVersion = "23.05";
-    home.username = "fcuny";
-    home.homeDirectory = "/Users/fcuny";
-    imports = [
-      ../home/profiles/mac.nix
-      ../home/profiles/work.nix
-    ];
-    userinfo = {
-      email = "fcuny@roblox.com";
-      fullName = "Franck Cuny";
-    };
-  };
-}
diff --git a/machines/mba-m2.nix b/machines/mba-m2.nix
deleted file mode 100644
index e9fd500..0000000
--- a/machines/mba-m2.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ pkgs, ... }:
-{
-  age.secrets = {
-    ssh-remote-builder.file = ../secrets/ssh-remote-builder.age;
-  };
-
-  imports = [
-    ../profiles/darwin.nix
-    ../profiles/home-manager.nix
-    ../profiles/remote-builder.nix
-  ];
-
-  # https://github.com/nix-darwin/nix-darwin/issues/1339
-  ids.gids.nixbld = 30000;
-
-  networking.hostName = "mba-m2";
-
-  users.users.fcuny = {
-    home = "/Users/fcuny";
-    shell = pkgs.fish;
-  };
-
-  environment.shells = [ pkgs.fish ];
-
-  programs.fish.enable = true;
-  programs.fish.shellInit = ''
-    # Nix
-    if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
-      source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
-    end
-    # End Nix
-  '';
-
-  home-manager.users.fcuny = {
-    home.stateVersion = "23.05";
-    home.username = "fcuny";
-    home.homeDirectory = "/Users/fcuny";
-    home.packages = with pkgs; [
-      element-desktop
-      hledger
-    ];
-    imports = [
-      ../home/profiles/mac.nix
-      ../home/profiles/media.nix
-      ../home/profiles/security.nix
-      ../home/profiles/restic.nix
-    ];
-    userinfo = {
-      email = "franck@fcuny.net";
-      fullName = "Franck Cuny";
-    };
-  };
-}
diff --git a/machines/mba-personal.nix b/machines/mba-personal.nix
new file mode 100644
index 0000000..d606a42
--- /dev/null
+++ b/machines/mba-personal.nix
@@ -0,0 +1,47 @@
+{ pkgs, ... }:
+{
+  age.secrets = {
+    ssh-remote-builder.file = ../secrets/ssh-remote-builder.age;
+  };
+
+  imports = [
+    ../profiles/darwin.nix
+    ../profiles/home-manager.nix
+    ../profiles/remote-builder.nix
+  ];
+
+  # https://github.com/nix-darwin/nix-darwin/issues/1339
+  ids.gids.nixbld = 30000;
+
+  networking.hostName = "mba-m2";
+
+  users.users.fcuny = {
+    home = "/Users/fcuny";
+    shell = pkgs.fish;
+  };
+
+  environment.shells = [ pkgs.fish ];
+
+  programs.fish.enable = true;
+  programs.fish.shellInit = ''
+    # Nix
+    if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
+      source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
+    end
+    # End Nix
+  '';
+
+  home-manager.users.fcuny = {
+    home.stateVersion = "23.05";
+    home.username = "fcuny";
+    home.homeDirectory = "/Users/fcuny";
+    imports = [
+      ../home/profiles/darwin.nix
+      ../home/profiles/personal.nix
+    ];
+    userinfo = {
+      email = "franck@fcuny.net";
+      fullName = "Franck Cuny";
+    };
+  };
+}
diff --git a/machines/mbp-work.nix b/machines/mbp-work.nix
new file mode 100644
index 0000000..fc4340d
--- /dev/null
+++ b/machines/mbp-work.nix
@@ -0,0 +1,37 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ../profiles/darwin.nix
+    ../profiles/home-manager.nix
+  ];
+
+  users.users.fcuny = {
+    home = "/Users/fcuny";
+    shell = pkgs.fish;
+  };
+
+  environment.shells = [ pkgs.fish ];
+
+  programs.fish.enable = true;
+  programs.fish.shellInit = ''
+    # Nix
+    if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
+      source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
+    end
+    # End Nix
+  '';
+
+  home-manager.users.fcuny = {
+    home.stateVersion = "23.05";
+    home.username = "fcuny";
+    home.homeDirectory = "/Users/fcuny";
+    imports = [
+      ../home/profiles/mac.nix
+      ../home/profiles/work.nix
+    ];
+    userinfo = {
+      email = "fcuny@roblox.com";
+      fullName = "Franck Cuny";
+    };
+  };
+}
-- 
cgit v1.2.3