Final tweaks for a working macos config

This matches the setup that is currently functioning on my mac.
timraymond · Nov 26, 2024 · 66efb47 · 66efb47
1 parent 3beba53
commit 66efb47
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/flake.nix b/flake.nix
@@ -52,7 +52,7 @@
     };
 
     darwinConfigurations = {
-      macbook = darwin.lib.darwinSystem {
+      ceres = darwin.lib.darwinSystem {
         system = "x86_64-darwin";
         modules = [
           ./modules/darwin.nix

diff --git a/home/default.nix b/home/default.nix
@@ -46,14 +46,19 @@
     mutableKeys = true;
   };
 
-  services = {
-    keybase.enable = true;
-    kbfs.enable = true;
-    gpg-agent = {
-      enable = true;
-      defaultCacheTtl = 1800;
-      pinentryPackage = pkgs.pinentry-curses;
-      enableSshSupport = true;
-    };
-  };
+  services = lib.mkMerge [
+    {
+      gpg-agent = {
+        enable = true;
+        defaultCacheTtl = 1800;
+        pinentryPackage = pkgs.pinentry-curses;
+        enableSshSupport = true;
+      };
+    }
+
+    (lib.mkIf (!pkgs.stdenv.isDarwin) {
+      keybase.enable = true;
+      kbfs.enable = true;
+    })
+  ];
 }
diff --git a/modules/darwin.nix b/modules/darwin.nix
@@ -18,7 +18,7 @@
         KeyRepeat = 2;
       };
       dock = {
-        autohide = true;
+        autohide = false;
         showhidden = true;
         mru-spaces = false;
       };
@@ -32,4 +32,9 @@
   programs.zsh.enable = true;
 
   services.nix-daemon.enable = true;
+
+  users.users.tim = {
+    name = "tim";
+    home = "/Users/tim";
+  };
 }