From 4aa86d92aae3a6c4f88d95fbeb5186976bdfab8b Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Tue, 17 Mar 2026 12:00:50 +0100
Subject: [PATCH] gitbutler-cli: init at 0.18.8

---
 flake.lock                 | 41 +++++++++++++++++++++++++++-----------
 flake.nix                  |  1 +
 modules/base/home/fish.nix |  7 +------
 modules/base/home/git.nix  | 10 +++++++++-
 4 files changed, 40 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index e8a33c4..6f3d02a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1989,11 +1989,11 @@
     },
     "nixpkgs-latest-factorio": {
       "locked": {
-        "lastModified": 1773726764,
-        "narHash": "sha256-QmQKd/wYY1Xjfu1+TJ1i+C6nK7HH54qUtYboK70FseY=",
+        "lastModified": 1773744283,
+        "narHash": "sha256-LW6uTevl6UYRbKkv0nwVMyr4g+6Ohg92wfkFN7pfYkE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ade7e63e7b6c6069bb73373fd92bd17487a7d54d",
+        "rev": "f1e2c6cda52aa82fd8ec02bc7056009971ad46c8",
         "type": "github"
       },
       "original": {
@@ -2005,11 +2005,11 @@
     },
     "nixpkgs-latest-minecraft": {
       "locked": {
-        "lastModified": 1773726764,
-        "narHash": "sha256-QmQKd/wYY1Xjfu1+TJ1i+C6nK7HH54qUtYboK70FseY=",
+        "lastModified": 1773744283,
+        "narHash": "sha256-LW6uTevl6UYRbKkv0nwVMyr4g+6Ohg92wfkFN7pfYkE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ade7e63e7b6c6069bb73373fd92bd17487a7d54d",
+        "rev": "f1e2c6cda52aa82fd8ec02bc7056009971ad46c8",
         "type": "github"
       },
       "original": {
@@ -2051,11 +2051,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1773726764,
-        "narHash": "sha256-QmQKd/wYY1Xjfu1+TJ1i+C6nK7HH54qUtYboK70FseY=",
+        "lastModified": 1773744283,
+        "narHash": "sha256-LW6uTevl6UYRbKkv0nwVMyr4g+6Ohg92wfkFN7pfYkE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ade7e63e7b6c6069bb73373fd92bd17487a7d54d",
+        "rev": "f1e2c6cda52aa82fd8ec02bc7056009971ad46c8",
         "type": "github"
       },
       "original": {
@@ -2130,6 +2130,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-temp": {
+      "locked": {
+        "lastModified": 1773742739,
+        "narHash": "sha256-aWFbxP2i0bfbPicu+ymfY4vS5+r8QINuN7ry7HDiF4Q=",
+        "owner": "Daholli",
+        "repo": "nixpkgs",
+        "rev": "4e67af585996176d4d24640b12b744f06df871cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Daholli",
+        "repo": "nixpkgs",
+        "rev": "4e67af585996176d4d24640b12b744f06df871cc",
+        "type": "github"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1773646010,
@@ -2461,6 +2477,7 @@
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-rpi": "nixpkgs-rpi",
         "nixpkgs-stable": "nixpkgs-stable_2",
+        "nixpkgs-temp": "nixpkgs-temp",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "simple-nixos-mailserver": "simple-nixos-mailserver",
         "sops-nix": "sops-nix",
@@ -2733,11 +2750,11 @@
         "nixpkgs": "nixpkgs_12"
       },
       "locked": {
-        "lastModified": 1773695806,
-        "narHash": "sha256-HYmp4Ym/dlkRIPap7GFznNUNuDTTW0iIcOtHmhRzl3w=",
+        "lastModified": 1773737882,
+        "narHash": "sha256-P6k0BtT1/idYveVRdcwAZk8By9UjZW8XOMhSoS6wTBY=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "ced61240cc38dee9e659a7ced0cd9a839c6085d3",
+        "rev": "a7f1db35d74faf04e5189b3a32f890186ace5c28",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index c84a5d6..03ed5d8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,6 +20,7 @@
 
     nixpkgs-latest-factorio = nixpkgs-master;
     nixpkgs-latest-minecraft = nixpkgs-master;
+    nixpkgs-temp.url = "github:Daholli/nixpkgs/4e67af585996176d4d24640b12b744f06df871cc";
 
     home-manager = {
       url = "github:nix-community/home-manager/master";
diff --git a/modules/base/home/fish.nix b/modules/base/home/fish.nix
index 6c702d7..fb3a48e 100644
--- a/modules/base/home/fish.nix
+++ b/modules/base/home/fish.nix
@@ -53,6 +53,7 @@
               ls = "eza -lah --icons --git";
               lss = "ls --total-size";
               lt = "ls -T --git-ignore";
+              bs = "but status";
             };
             functions = {
               checkHash = "nix hash to-sri --type sha256 $(nix-prefetch-url --unpack $argv)";
@@ -64,12 +65,6 @@
 
               syncfactoriomodstoserver = ''rsync -aP ~/.factorio/mods/ root@loptland:/var/lib/factorio/mods/ --delete && ssh root@loptland "systemctl restart systemd-tmpfiles-resetup.service && systemctl restart factorio.service"'';
             };
-            plugins = with pkgs.fishPlugins; [
-              {
-                name = "forgit";
-                src = forgit.src;
-              }
-            ];
           };
 
           yazi = {
diff --git a/modules/base/home/git.nix b/modules/base/home/git.nix
index b874728..7332ef7 100644
--- a/modules/base/home/git.nix
+++ b/modules/base/home/git.nix
@@ -11,6 +11,7 @@ topLevel: {
     homeManager.cholli =
       {
         config,
+        inputs,
         lib,
         osConfig,
         pkgs,
@@ -18,11 +19,18 @@ topLevel: {
       }:
       let
         username = topLevel.config.flake.meta.users.cholli.username;
+
+        temp = import inputs.nixpkgs-temp {
+          system = pkgs.stdenv.hostPlatform.system;
+          config.allowUnfree = true;
+        };
       in
       {
         home.packages = [
           pkgs.git-credential-manager
-        ];
+          temp.gitbutler-cli
+        ]
+        ++ lib.optional (osConfig.networking.hostName == "yggdrasil") pkgs.gitbutler;
 
         programs.git = {
           enable = true;