Update inputs, use Emacs from Homebrew, other small tweaks

flake.nix

@@ -20,16 +20,16 @@
   };
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-25.11-darwin";
 
     nixpkgs-master.url = "github:nixos/nixpkgs";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
 
-    nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-25.05";
+    nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-25.11";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
 
-    home-manager.url = "github:nix-community/home-manager/release-25.05";
+    home-manager.url = "github:nix-community/home-manager/release-25.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     flake-root.url = "github:srid/flake-root";
@@ -41,7 +41,6 @@
     treefmt.inputs.nixpkgs.follows = "nixpkgs";
 
     tilde-secrets.url = "git+ssh://git@github.com/ethnt/tilde-secrets";
-    # tilde-secrets.url = "git+file:///Users/et/Workspace/personal/tilde-secrets";
 
     emacs-overlay.url = "github:nix-community/emacs-overlay";
     emacs-overlay.inputs.nixpkgs.follows = "nixpkgs";

modules/development/treefmt.nix

@@ -1,7 +1,7 @@
 { inputs, ... }: {
   imports = [ inputs.treefmt.flakeModule ];
 
-  perSystem = { config, pkgs, lib, ... }:
+  perSystem = { config, pkgs, ... }:
     let
       treefmtConfig = {
         inherit (config.flake-root) projectRootFile;

modules/overlays/default.nix

@@ -9,7 +9,6 @@
         config.allowUnfree = true;
       };
     in {
-      inherit (nixpkgs-master) claude-code;
       nixpkgs-master-darwin-linux-builder = nixpkgs-master.darwin.linux-builder;
     };
   };

modules/profiles/home/git/common.nix

@@ -4,50 +4,55 @@
   programs.git = {
     enable = true;
 
-    userName = "Ethan Turkeltaub";
-
-    aliases = let
-      gitCommand = lib.getExe config.programs.git.package;
-      fzfCommand = lib.getExe pkgs.fzf;
-      ghCommand = lib.getExe pkgs.gh;
+    settings = let
+      delta = lib.getExe pkgs.delta;
+      git = lib.getExe config.programs.git.package;
+      fzf = lib.getExe pkgs.fzf;
+      gh = lib.getExe pkgs.gh;
       superprune = pkgs.writeShellScript "git-alias-superprune" ''
         echo 'Fetching remote then deleting branches that are gone. This may take a moment'
 
-        ${gitCommand} fetch -p
+        ${git} fetch -p
 
         gone=$(git for-each-ref --format '%(refname) %(upstream:track)' refs/heads | awk '$2 == "[gone]" {sub("refs/heads/", "", $1); print $1}')
         for branch in $gone; do
-          ${gitCommand} branch -D $branch;
+          ${git} branch -D $branch;
         done;
       '';
       co = pkgs.writeShellScript "git-alias-co" ''
-        ${gitCommand} checkout "$(${gitCommand} branch --sort="-committerdate" | ${fzfCommand} | tr -d '[:space:]')";
+        ${git} checkout "$(${git} branch --sort="-committerdate" | ${fzf} | tr -d '[:space:]')";
       '';
       wipe = pkgs.writeShellScript "git-alias-wipe" ''
-        ${gitCommand} add .
-        ${gitCommand} stash
+        ${git} add .
+        ${git} stash
       '';
     in {
-      s = "status";
-      superprune = "!sh ${superprune}";
-      co = "!sh ${co}";
-      wipe = "!sh ${wipe}";
-      sync = "!${ghCommand} repo sync";
-    };
+      user.name = "Ethan Turkeltaub";
+
+      alias = {
+        s = "status";
+        superprune = "!sh ${superprune}";
+        co = "!sh ${co}";
+        wipe = "!sh ${wipe}";
+        sync = "!${gh} repo sync";
+      };
 
-    ignores = [ "*~" "#*#" ".elc" ".#*" "flycheck_*.el" ".projectile" ];
+      core.pager = delta;
 
-    signing.signByDefault = config.programs.git.signing.key != null;
+      interactive.diffFilter = "${delta} --color-only";
 
-    extraConfig = let deltaCommand = lib.getExe pkgs.delta;
-    in {
-      core.pager = deltaCommand;
-      interactive.diffFilter = "${deltaCommand} --color-only";
       http = { sslCAinfo = "/etc/ssl/certs/ca-certificates.crt"; };
+
       color = {
         status = "always";
         diff = "always";
       };
+
+      init.defaultBranch = "main";
     };
+
+    ignores = [ "*~" "#*#" ".elc" ".#*" "flycheck_*.el" ".projectile" ];
+
+    signing.signByDefault = config.programs.git.signing.key != null;
   };
 }

modules/profiles/home/haskell.nix

@@ -8,4 +8,6 @@
     :seti -XTypeApplications
     :seti -XOverloadedStrings
   '';
+
+  home.sessionPath = [ "$HOME/.cabal/bin" ];
 }

modules/profiles/home/zed-editor.nix

@@ -19,6 +19,10 @@
         dark = "Nord Dark";
       };
 
+      # Ergonomics
+      tab_size = 2;
+      hard_tabs = false;
+
       # Git
       git.inline_blame.enabled = false;
 

modules/profiles/system/core/nix-config.nix

@@ -1,4 +1,4 @@
-{ flake, pkgs, ... }: {
+{ pkgs, ... }: {
   nixpkgs = {
     # NOTE: This relies on all hosts having the same `system`. If a system comes along that is different, this cannot
     # be set to the flake-wide `pkgs`, as it is here: https://nix-darwin.github.io/nix-darwin/manual/index.html#opt-nixpkgs.pkgs

modules/profiles/system/darwin/brew.nix

@@ -8,13 +8,16 @@
 
     brews = [ "pinentry-mac" ];
 
+    taps = [ "railwaycat/emacsmacport" ];
+
     casks = [
       "1password"
       "arc"
       "cleanshot"
       "dash"
       "docker-desktop"
       "elgato-stream-deck"
+      "emacs-mac-spacemacs-icon"
       "ghostty"
       "fantastical"
       "firefox"

modules/profiles/system/darwin/common.nix

@@ -6,7 +6,7 @@
     settings = {
       trusted-users = [ config.system.primaryUser ];
       extra-nix-path = [ "darwin-config=${flake}/lib/compat/darwin" ];
-      extra-experimental-features = [ "nix-command" "flakes" "ca-derivations" ];
+      extra-experimental-features = [ "nix-command" "flakes" ];
     };
   };
 

modules/profiles/system/home-manager/common.nix

@@ -1,4 +1,4 @@
-{ flake, lib, ... }: {
+{ flake, ... }: {
   home-manager = {
     inherit (flake.lib.hm) sharedModules extraSpecialArgs;
 

users/et/profiles/git.nix

@@ -1,7 +1,6 @@
 {
   programs.git = {
-    userEmail = "et@mercury.com";
-    userName = "Ethan Turkeltaub";
+    settings = { user.email = "et@mercury.com"; };
     signing.key = "F8E4DBB3201AFD1E";
   };
 }

users/et/profiles/tmuxp.nix

@@ -2,18 +2,32 @@
   programs.tmuxp.workspaces = {
     tilde = {
       session_name = "tilde";
-      windows = [{
-        focus = true;
-        layout = "c5e0,212x37,0,0,3";
-        options = { };
-        panes = [{
+      windows = [
+        {
           focus = true;
-          shell_command = "direnv reload";
-        }];
-        start_directory =
-          "${config.home.homeDirectory}/Workspace/personal/tilde";
-        window_name = "fish";
-      }];
+          layout = "c5e0,212x37,0,0,3";
+          options = { };
+          panes = [{
+            focus = true;
+            shell_command = "direnv reload";
+          }];
+          start_directory =
+            "${config.home.homeDirectory}/Workspace/personal/tilde";
+          window_name = "tilde";
+        }
+        {
+          focus = false;
+          layout = "c5e0,212x37,0,0,3";
+          options = { };
+          panes = [{
+            focus = true;
+            shell_command = "direnv reload";
+          }];
+          start_directory =
+            "${config.home.homeDirectory}/Workspace/personal/tilde-secrets";
+          window_name = "tilde-secrets";
+        }
+      ];
     };
   };
 }

users/et/profiles/tools.nix

@@ -1,5 +1,5 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [ claude-code graphite-cli fnm mkcert ];
+  home.packages = with pkgs; [ graphite-cli fnm mkcert ];
 
   programs.fish.interactiveShellInit = let fnm = pkgs.lib.getExe pkgs.fnm;
   in ''

users/ethan/profiles/git.nix

@@ -1,7 +1,6 @@
 {
   programs.git = {
-    userEmail = "ethan@turkeltaub.dev";
-    userName = "Ethan Turkeltaub";
+    settings = { user.email = "ethan@turkeltaub.dev"; };
     signing.key = "0x690FEBBF6380166A";
   };
 }