new plists

- Convert SSH config to template with @SSH_KEY@ placeholder
- Add sshKey field to host configurations (mac14, ordio)
- Update home.nix to dynamically substitute SSH keys per host
- Change docker cask to docker-desktop in cask.nix
- Add development packages to ordio host (mkcert, dnsmasq, etc.)
- Disable nix in darwin.nix configuration

cask.nix

@@ -15,7 +15,7 @@
   "lihaoyun6/tap/quickrecorder"
 
   # Dev
-  "docker"
+  "docker-desktop"
   "sloth"
   "vscodium"
   "bruno"

darwin.nix

@@ -6,6 +6,7 @@
   ...
 }:
 {
+  nix.enable = false;
   nix.settings.experimental-features = "nix-command flakes";
 
   # Set Git commit hash for darwin-version.
@@ -69,6 +70,13 @@
     remapCapsLockToEscape = true;
   };
 
+  # Power
+  power = {
+    sleep = {
+      computer = "never";
+    };
+  };
+
   # Other
   system.startup.chime = false;
 

files/git/config.personal

@@ -1,4 +0,0 @@
-[user]
-	name = cupcakearmy
-	email = hi@nicco.io
-	signingkey = 3235314B4D31232F

files/git/config.work

@@ -1,4 +0,0 @@
-[user]
-	name = Niccolo Borgioli
-	email = hi@nicco.io
-	signingkey = 4897ACD13A65977C

files/git/gitconfig

@@ -7,18 +7,19 @@
 	excludesfile = ~/.gitignore_global
 	autocrlf = input
 	ignorecase=false
-[commit]
-	gpgsign = false
 
 [pull]
 	rebase = false
-
 [push]
 	autoSetupRemote = true
 [branch]
 	sort = -committerdate
 [alias]
 	fpush = push --force-with-lease
+[tag]
+	gpgsign = true
+[commit]
+	gpgsign = true
 
 [include]
     path = ~/.gitconfig.local

home/home.nix

@@ -29,11 +29,13 @@
       ".config/ghostty/config".source = ../files/ghostty/config;
       ".gitconfig".source = ../files/git/gitconfig;
       ".gitignore_global".source = ../files/git/gitignore_global;
-      ".gitconfig.local".source = ../files/git/config.work;
+      ".gitconfig.local".source = ../secrets/git/config.${host.hostName};
       ".config/nvim".source = ../files/nvim;
 
       # Secrets
-      ".ssh/config".source = ../secrets/ssh/config;
+      ".ssh/config".text = builtins.replaceStrings [ "@SSH_KEY@" ] [ host.sshKey ] (
+        builtins.readFile ../secrets/ssh/config.template
+      );
     };
 
     shellAliases = {

hosts/default.nix

@@ -1,5 +1,4 @@
 [
   (import ./mac14.nix)
-  (import ./mac16.nix)
   (import ./ordio.nix)
 ]

hosts/mac14.nix

@@ -2,6 +2,7 @@
   username = "cupcakearmy";
   hostName = "mac14";
   platform = "aarch64-darwin";
+  sshKey = "legba";
 
   extras = {
     casks = [

hosts/mac16.nix

@@ -1,22 +0,0 @@
-{
-  username = "niccoloborgioli";
-  hostName = "mac16";
-  platform = "aarch64-darwin";
-
-  extras = {
-    casks = [
-      "phpstorm"
-      "datagrip"
-      "tailscale"
-      "android-studio"
-    ];
-    pkgs =
-      pkgs: with pkgs; [
-        phrase-cli
-        boundary
-        awscli2
-        _1password-cli
-        vault
-      ];
-  };
-}

hosts/ordio.nix

@@ -2,12 +2,18 @@
   username = "nicco";
   hostName = "ordio";
   platform = "aarch64-darwin";
+  sshKey = "ordio";
 
   extras = {
     casks = [
+      "tableplus"
+      "http-toolkit"
+      "phpstorm"
     ];
     pkgs =
       pkgs: with pkgs; [
+        mkcert
+        dnsmasq
       ];
   };
 }