Update

darwin/common/homebrew.nix

@@ -18,6 +18,7 @@
       "bartender"
       "discord"
       "gitkraken"
+      "ghostty"
       "the-unarchiver"
       "visual-studio-code"
       "raycast"

darwin/common/nixpkgs.nix

@@ -1,7 +1,9 @@
-{...}: {
+{outputs, ...}: {
   nixpkgs = {
     config = {
       allowUnfree = true;
     };
+
+    overlays = builtins.attrValues outputs.overlays;
   };
 }

flake.nix

@@ -72,6 +72,8 @@
           };
       };
 
+      packages = (import ./pkgs {inherit pkgs;});
+
       devShell = with pkgs;
         mkShell {
           packages = [
@@ -87,6 +89,8 @@
         };
     })
     // {
+      overlays = import ./overlays;
+
       darwinConfigurations = {
         "QN63HFT2NY" = darwin.lib.darwinSystem {
           system = "aarch64-darwin";

home/profiles/desktop/default.nix

@@ -21,9 +21,20 @@
     ];
   };
 
-  programs.mise = {
+  programs.ghostty = {
     enable = true;
+    package = pkgs.stubin; # dummy
     enableFishIntegration = true;
+    installBatSyntax = false;
+    clearDefaultKeybinds = true;
+    settings = {
+      "theme" = "rose-pine";
+      "font-size" = 14;
+      "font-family" ="UDEV Gothic 35NFLG";
+      "shell-integration" = "fish";
+      "command" ="${pkgs.fish}/bin/fish -c";
+      "keybind" = "global:alt+t=toggle_quick_terminal";
+    };
   };
 
   programs.git = {
@@ -100,15 +111,6 @@
       amend = "commit --amend";
       precommit = "diff --cached --diff-algorithm=minimal -w";
       remotes = "remote -v";
-      delete-merged-branches = ''
-        !git checkout -q main && \
-          git for-each-ref refs/heads/ "--format=%(refname:short)" | \
-          while read branch; do
-            mergeBase=$(git merge-base main $branch) && \
-              [[ $(git cherry main $(git commit-tree $(git rev-parse $branch^{tree}) -p $mergeBase -m _)) == "-"* ]] && \
-              git branch -D $branch;
-        done
-      '';
     };
 
     ignores = [

home/profiles/minimal/default.nix

@@ -30,9 +30,6 @@
   programs.bat = {
     enable = true;
     config.style = "changes,header";
-    extraPackages = with pkgs.bat-extras; [
-      batman
-    ];
   };
 
   programs.fzf = {

overlays/default.nix

@@ -0,0 +1,3 @@
+{
+  additions = final: _prev: import ../pkgs {pkgs = final;};
+}

pkgs/default.nix

@@ -0,0 +1,3 @@
+{pkgs ? null}: {
+  stubin = pkgs.callPackage ./stubin.nix {};
+}

pkgs/stubin.nix

@@ -0,0 +1,31 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  ...
+}:
+buildGoModule rec {
+  pname = "stubin";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "k1LoW";
+    repo = "stubin";
+    rev = "v${version}";
+    sha256 = "sha256-nLqZF36q09n/dc+RMQxxECA2Ku6g3M94X7kwZFwmJCw=";
+  };
+  vendorHash = "sha256-KTGnuVN0+HJ7xr7+/mKSrdfF5c+XW0wDLtn5F2nCL3M=";
+
+  ldflags = [
+    "-s -w"
+  ];
+
+  doCheck = false;
+  doInstallCheck = false;
+
+  meta = with lib; {
+    homepage = "https://github.com/k1LoW/stubin";
+    mainProgram = "stubin";
+    license = licenses.mit;
+  };
+}