fish: fix git prompt not showing staged changes if there's no commit

flake.lock

@@ -176,11 +176,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723685519,
-        "narHash": "sha256-GkXQIoZmW2zCPp1YFtAYGg/xHNyFH/Mgm79lcs81rq0=",
+        "lastModified": 1726590912,
+        "narHash": "sha256-5bxY85siOIqOcQ8TOMAWLkMUZvLUADS2i5TsZhzUIZY=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "276a0d055a720691912c6a34abb724e395c8e38a",
+        "rev": "d32d1504c77d7f6ba7e033357dcf638baceab9b7",
         "type": "github"
       },
       "original": {
@@ -393,11 +393,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720042825,
-        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
+        "lastModified": 1726592409,
+        "narHash": "sha256-2Y6CDvD/BD43WLS77PHu6dUHbdUfFhuzkY8oJAecD/U=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
+        "rev": "2ab00f89dd3ecf8012f5090e6d7ca1a7ea30f594",
         "type": "github"
       },
       "original": {
@@ -414,11 +414,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723352546,
-        "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
+        "lastModified": 1726449931,
+        "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
+        "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
         "type": "github"
       },
       "original": {
@@ -456,11 +456,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723556749,
-        "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=",
+        "lastModified": 1726447378,
+        "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4a92571f9207810b559c9eac203d1f4d79830073",
+        "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
         "type": "github"
       },
       "original": {

scripts/auto_connect_gamepad

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-list_paired_controllers() {
-    bluetoothctl devices Paired | grep 'Controller' | cut -d' ' -f2
-}
-
-count_connected_controllers() {
-    bluetoothctl devices Connected | grep 'Controller' | wc -l
-}
-
-try_to_connect_to_all_controllers() {
-    list_paired_controllers | while read paired_controller; do
-        echo "Trying to connect to controller $paired_controller"
-        bluetoothctl connect "$paired_controller"
-    done
-}
-
-while true; do
-    echo "looping"
-    if test "$(count_connected_controllers)" -ne 0 ; then
-        echo "there is a controller connected, not attempting to connect to any other"
-        sleep 10s
-        continue
-    fi
-    sleep 1s
-    try_to_connect_to_all_controllers
-done

scripts/default.nix

@@ -124,11 +124,6 @@
       zbar
       wl-clipboard
     ];
-    auto_connect_gamepad = [
-      bluez
-      coreutils
-      gnugrep
-    ];
     powerplay-led-idle = [
       bash
       libinput

system/bluetooth.nix

@@ -6,7 +6,7 @@
     settings = {
       General = {
         DiscoverableTimeout = 0;
-        # Discoverable = true;
+        Discoverable = true;
         AlwaysPairable = true;
       };
       Policy = {

user/controller.nix

@@ -1,26 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  systemd.user.services = {
-    autoconnect-gamepad = {
-      Unit = {
-        Description = "Attempt to connect to game controllers";
-        PartOf = [ "graphical-session.target" ];
-        After = [ "graphical-session.target" ];
-      };
-      Service = {
-        ExecStart = lib.getExe pkgs.auto_connect_gamepad;
-      };
-      Install = {
-        WantedBy = [ "sway-session.target" ];
-      };
-    };
-  };
-
-  xdg.desktopEntries = {
-    disconnect-controller = {
-      name = "Disconnect Controller";
-      exec = "bluetoothctl disconnect 84:30:95:97:1A:79";
-      terminal = false;
-    };
-  };
-}

user/fish/fish_prompt.fish

@@ -103,9 +103,8 @@ function fish_git_prompt
        _fish_prompt_warn "init"
     end
 
-    git rev-parse HEAD -- &>/dev/null
-    or return
-
+    # if we have at least one commit
+    if git rev-parse HEAD -- &>/dev/null
         # print a "↑" if ahead of origin
         test 0 -ne (git log --oneline "$git_remote_branch"..HEAD -- | wc -l)
         and set -f _git_sync_ahead '↑'
@@ -127,6 +126,7 @@ function fish_git_prompt
             _fish_prompt_normal '↻'
             _fish_prompt_warn $git_log_unpushed[1]
         end
+    end
 
     ############################################################
     # Right side represents WorkTree/Staged

user/home.nix

@@ -8,7 +8,6 @@
 }:
 {
   imports = [
-    ./controller.nix
     ./waybar
     ./helix.nix
     ./kakoune

user/pass.nix

@@ -9,7 +9,12 @@
   config = {
     programs.password-store = {
       enable = true;
-      package = pkgs.pass.withExtensions (ex: with ex; [ pass-otp ]);
+      package = pkgs.pass.withExtensions (
+        ex: with ex; [
+          pass-otp
+          pass-import
+        ]
+      );
     };
     services = {
       pass-secret-service.enable = true;

user/sway/default.nix

@@ -71,6 +71,7 @@ in
           "*" = {
             bg = "${theme.background} fill";
             mode = "1920x1080@144.000Hz";
+            adaptive_sync = "on";
           };
         };
         fonts = {