all: up

darwin/home.nix

···
     kubectl
     betterdisplay
     monitorcontrol
+    # zed-editor
 
     ice-bar
 
     go
     gopls
-    gotools
     nix-your-shell
   ] ++ (import ../bin { inherit pkgs host; });
 }

flake.lock

···
         "type": "github"
       }
     },
-    "crane_2": {
-      "locked": {
-        "lastModified": 1742394900,
-        "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-stable"
         ]
       },
       "locked": {
-        "lastModified": 1747494142,
-        "narHash": "sha256-7TAUwDVZWq82t/x3+zZ5y+Tjl2hLL2c8+8pv9zCUbTo=",
+        "lastModified": 1749744770,
+        "narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "8e251e45346e9d58e0eece2512e40c183f967e8f",
+        "rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
         "type": "github"
       },
       "original": {
         "owner": "lnl7",
-        "ref": "master",
+        "ref": "nix-darwin-25.05",
         "repo": "nix-darwin",
         "type": "github"
       }
     },
-    "flake-compat": {
-      "locked": {
-        "lastModified": 1733328505,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
···
         ]
       },
       "locked": {
-        "lastModified": 1747439237,
-        "narHash": "sha256-5rCGrnkglKKj4cav1U3HC+SIUNJh08pqOK4spQv9RjA=",
+        "lastModified": 1750654717,
+        "narHash": "sha256-YXlhTUGaLAY1rSosaRXO5RSGriEyF9BGdLkpKV+9jyI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ae755329092c87369b9e9a1510a8cf1ce2b1c708",
+        "rev": "4c9e99e8e8e36bcdfa9cdb102e45e4dc95aa5c5b",
         "type": "github"
       },
       "original": {
···
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1747129300,
-        "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
+        "lastModified": 1750431636,
+        "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "e81fd167b33121269149c57806599045fd33eeed",
+        "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712",
         "type": "github"
       },
       "original": {
···
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747327360,
-        "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
+        "lastModified": 1750506804,
+        "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
+        "rev": "4206c4cb56751df534751b058295ea61357bbbaa",
         "type": "github"
       },
       "original": {
···
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1747517186,
-        "narHash": "sha256-ESuD8SaqgysQQ5wW3H49egueDyT4h2jhCM84WcPOCMQ=",
+        "lastModified": 1750680047,
+        "narHash": "sha256-Wy8PNgpFr6FwdSwmYu5PnnU2ed+TyMN6c37r8pM985k=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f65f287d309c02a57c7a2b0ce26c6cf46dc3149",
+        "rev": "eeab26971f913ba86193d6cba38d9688a4d94ed8",
         "type": "github"
       },
       "original": {
···
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1747335874,
-        "narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=",
+        "lastModified": 1750400657,
+        "narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858",
+        "rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
···
         "nixpkgs": "nixpkgs",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-stable": "nixpkgs-stable",
-        "prompt": "prompt",
-        "zed": "zed"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "zed",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1747363019,
-        "narHash": "sha256-N4dwkRBmpOosa4gfFkFf/LTD8oOcNkAyvZ07JvRDEf0=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "0e624f2b1972a34be1a9b35290ed18ea4b419b6f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
+        "prompt": "prompt"
       }
     },
     "systems": {
···
       "original": {
         "owner": "nix-systems",
         "repo": "default",
-        "type": "github"
-      }
-    },
-    "zed": {
-      "inputs": {
-        "crane": "crane_2",
-        "flake-compat": "flake-compat",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1747508752,
-        "narHash": "sha256-RlZKLttv4fTa4AcwYbcrJjeVUHVV9Up8ek7PL/FGtnI=",
-        "owner": "zed-industries",
-        "repo": "zed",
-        "rev": "230eb12f7220aea21733a259b670201bc79c7020",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zed-industries",
-        "repo": "zed",
         "type": "github"
       }
     }

flake.nix

···
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
+    nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05";
     nixpkgs-master.url = "github:NixOS/nixpkgs/master";
 
 
···
     };
 
     darwin = {
-      url = "github:lnl7/nix-darwin/master";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:lnl7/nix-darwin/nix-darwin-25.05";
+      inputs.nixpkgs.follows = "nixpkgs-stable";
     };
 
     prompt = {
···
       url = "github:MercuryTechnologies/nix-your-shell";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    zed = {
-      url = "github:zed-industries/zed";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =
···
     , nix-your-shell
     , home-manager
     , prompt
-    , # zed,
-      darwin
+    , darwin
     , ...
     }@inputs:
 

hosts/kvothe/configuration.nix

···
     fish.enable = true;
   };
 
-  services = {
-    tailscale = {
-      enable = true;
-    };
-  };
-
   environment = {
     variables = {
       EDITOR = "nvim";
···
       cleanup = "uninstall";
       upgrade = true;
     };
+    masApps = {
+      "Tailscale" = 1475387142;
+    };
     casks = [
       "orion"
       "karabiner-elements"
       "halloy"
-      "zed"
       "raycast"
       "signal@beta"
       "zen"
+      "ghostty"
+      "zed"
     ];
   };
 }

programs/common.nix

···
     ./fish.nix
     ./zed/default.nix
     ./jujutsu.nix
+    ./ghostty/default.nix
   ];
 
   programs = {

programs/ghostty.nix

···
-{ config
-, pkgs
-, lib
-, ...
-}:
-
-{
-  programs.ghostty = {
-    enable = true;
-    enableFishIntegration = true;
-    settings = {
-      term = "xterm-256color";
-      font-family = "SF Mono";
-      font-size = 12.0;
-      window-padding-x = 10;
-      window-padding-y = 10;
-      window-padding-balance = true;
-      window-theme = "ghostty";
-      theme = "icy";
-      adjust-cell-height = 10;
-    };
-
-    themes = {
-      icy = {
-        background = "f4f4f4";
-        foreground = "676767";
-        cursor-color = "676767"; # Fallback to foreground
-        selection-background = "aaaaaa";
-        selection-foreground = "525252";
-        palette = [
-          "0=f4f4f4" # Black (Normal)
-          "1=db7070" # Red (Normal)
-          "2=7c9f4b" # Green (Normal)
-          "3=d69822" # Yellow (Normal)
-          "4=6587bf" # Blue (Normal)
-          "5=b870ce" # Magenta (Normal)
-          "6=509c93" # Cyan (Normal)
-          "7=676767" # White (Normal)
-          "8=aaaaaa" # Black (Bright)
-          "9=c66666" # Red (Bright)
-          "10=6d8b42" # Green (Bright)
-          "11=e7e7e7" # Yellow (Bright)
-          "12=8a8a8a" # Blue (Bright)
-          "13=a262b5" # Magenta (Bright)
-          "14=43827b" # Cyan (Bright)
-          "15=525252" # White (Bright)
-        ];
-      };
-    };
-  };
-}

programs/ghostty/config.nix

···
+{ pkgs, ... }:
+{
+  settings = {
+    term = "xterm-256color";
+    font-family = "SF Mono";
+    font-size = 12.0;
+    window-padding-x = 10;
+    window-padding-y = 10;
+    window-padding-balance = true;
+    window-theme = "ghostty";
+    theme = "light:icy_light,dark:icy_dusk";
+    adjust-cell-height = 10;
+    macos-option-as-alt = "left";
+  };
+
+  themes = {
+    icy_dusk = {
+      background = "100f0f";
+      foreground = "fff6e3";
+      cursor-color = "509c93";
+      selection-background = "509c93";
+      selection-foreground = "fff6e3";
+      palette = [
+        "0=2a261f" # Black (Normal)
+        "1=db7070" # Red (Normal)
+        "2=7c9f4b" # Green (Normal)
+        "3=d69822" # Yellow (Normal)
+        "4=509c93" # Blue (Normal)
+        "5=b870ce" # Magenta (Normal)
+        "6=509c93" # Cyan (Normal)
+        "7=fff6e3" # White (Normal)
+        "8=4a443d" # Black (Bright)
+        "9=c66666" # Red (Bright)
+        "10=6d8b42" # Green (Bright)
+        "11=4a443d" # Yellow (Bright)
+        "12=6b635a" # Blue (Bright)
+        "13=a262b5" # Magenta (Bright)
+        "14=43827b" # Cyan (Bright)
+        "15=fff9eb" # White (Bright)
+      ];
+    };
+
+    icy_light = {
+      background = "fffdf5";
+      foreground = "4a443d";
+      cursor-color = "509c93";
+      selection-background = "fceccc";
+      selection-foreground = "4a443d";
+      palette = [
+        "0=4a443d" # Black (Normal)
+        "1=db7070" # Red (Normal)
+        "2=7c9f4b" # Green (Normal)
+        "3=d69822" # Yellow (Normal)
+        "4=6587bf" # Blue (Normal)
+        "5=b870ce" # Magenta (Normal)
+        "6=509c93" # Cyan (Normal)
+        "7=fffdf5" # White (Normal)
+        "8=776e63" # Black (Bright)
+        "9=c66666" # Red (Bright)
+        "10=6d8b42" # Green (Bright)
+        "11=d8cbbe" # Yellow (Bright)
+        "12=6587bf" # Blue (Bright)
+        "13=a262b5" # Magenta (Bright)
+        "14=43827b" # Cyan (Bright)
+        "15=2a261f" # White (Bright)
+      ];
+    };
+  };
+}

programs/ghostty/default.nix

···
+{ config
+, pkgs
+, lib
+, ...
+}:
+
+let
+  config = import ./config.nix { inherit pkgs; };
+  keyValue = pkgs.formats.keyValue {
+    listsAsDuplicateKeys = true;
+    mkKeyValue = lib.generators.mkKeyValueDefault { } " = ";
+  };
+
+  isLinux = pkgs.stdenv.isLinux;
+  isDarwin = pkgs.stdenv.isDarwin;
+in
+{
+  programs.ghostty = lib.mkIf isLinux {
+    enable = true;
+    enableFishIntegration = true;
+    settings = config.settings;
+    themes = config.themes;
+  };
+
+  home.file = lib.mkIf isDarwin {
+    ".config/ghostty/config".source =
+      keyValue.generate "ghostty-config" config.settings;
+    ".config/ghostty/themes/icy_light".source =
+      keyValue.generate "ghostty-icy_light-theme" config.themes.icy_light;
+    ".config/ghostty/themes/icy_dusk".source =
+      keyValue.generate "ghostty-icy_dusk-theme" config.themes.icy_dusk;
+  };
+}

programs/ssh.nix

···
         user = "git";
         hostname = "github.com";
       };
+      "test.hel.tangled.network" = {
+        forwardAgent = true;
+      };
     };
   };
 }

programs/tmux.nix

···
       bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "wl-copy"
       bind-key -T copy-mode-vi v send-keys -X begin-selection
       bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "wl-copy"
-      bind-key -T copy-mode-vi r send-keys -X rectangle-toggle
+      bind-key -T copy-mode-vi r send-keys -X rectangle-togglost
       bind P paste-buffer
 
       # pop-up pane to open urls
···
       set -g status-justify right
       set -g status-right ""
       set -g status-left ""
-      set -g status-style "bg=colour0"
-      set -ag status-style "fg=colour7"
+      set -g status-style "bg=color7"
+      set -ag status-style "fg=color0"
 
       set -g window-status-current-format "#[fg=colour15]    #W"
       set -g window-status-format "#[fg=colour8]    #W"
···
       set -g status-left-length 100
 
       # dim inactive pane
-      set -g window-style 'fg=color8,bg=default'
-      set -g window-active-style 'fg=color7,bg=default'
+      # set -g window-style 'fg=color8,bg=default'
+      # set -g window-active-style 'fg=color7,bg=default'
 
       set -g default-terminal "xterm-256color"
       set -ga terminal-overrides ',xterm-256color:Tc'

programs/zed/settings.nix

···
     notification_panel = {
       button = false;
     };
-    assistant = {
+    agent = {
       default_model = {
-        provider = "zed.dev";
-        model = "claude-3-7-sonnet-latest";
+        provider = "anthropic";
+        model = "claude-4-sonnet";
       };
       version = "2";
-      enabled = true;
       button = false;
     };
     scrollbar = {