diff --git a/devices/deck/home.nix b/devices/deck/home.nix
index ae5c85e..e6403b8 100644
--- a/devices/deck/home.nix
+++ b/devices/deck/home.nix
@@ -25,7 +25,6 @@ in
 
   home.packages = with pkgs;[
     system-manager
-    nextcloud-client
   ];
 
   home.file = {
diff --git a/flake.lock b/flake.lock
index 892f8f2..2ea1544 100644
--- a/flake.lock
+++ b/flake.lock
@@ -118,11 +118,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1740089251,
-        "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=",
+        "lastModified": 1740387674,
+        "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30",
+        "rev": "d58f642ddb23320965b27beb0beba7236e9117b5",
         "type": "github"
       },
       "original": {
@@ -150,11 +150,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1740126099,
-        "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=",
+        "lastModified": 1740367490,
+        "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "32fb99ba93fea2798be0e997ea331dd78167f814",
+        "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
         "type": "github"
       },
       "original": {
@@ -166,11 +166,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1740162160,
-        "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=",
+        "lastModified": 1740339700,
+        "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9",
+        "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
         "type": "github"
       },
       "original": {
diff --git a/home-manager/base.nix b/home-manager/base.nix
index 64ce5be..bf2de1a 100644
--- a/home-manager/base.nix
+++ b/home-manager/base.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, lib, ... }:
 
 {
   imports = [
diff --git a/home-manager/base/terminal.nix b/home-manager/base/terminal.nix
index b2e1811..0b19eac 100644
--- a/home-manager/base/terminal.nix
+++ b/home-manager/base/terminal.nix
@@ -46,14 +46,6 @@ with lib;
       bash = {
         enable = true;
         bashrcExtra = ''
-          function y() {
-            local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd
-            yazi "$@" --cwd-file="$tmp"
-            if cwd="$(command cat -- "$tmp")" && [ -n "$cwd" ] && [ "$cwd" != "$PWD" ]; then
-              builtin cd -- "$cwd"
-            fi
-            rm -f -- "$tmp"
-          }
           source $(blesh-share)/ble.sh
           bleopt canvas_winch_action=redraw-prev
         '';
@@ -64,7 +56,7 @@ with lib;
         delta.enable = true;
         extraConfig = {
           credential = {
-            helper = [ "cache --timeout 21600" "${pkgs.git-credential-oauth}/bin/git-credential-oauth" "${pkgs.git-credential-manager}/bin/git-credential-manager" ];
+            helper = [ "cache --timeout 21600" "${pkgs.git-credential-manager}/bin/git-credential-manager" "${pkgs.git-credential-oauth}/bin/git-credential-oauth" ];
             credentialStore = "secretservice";
           };
           "credential \"https://dev.azure.com\"" = {
@@ -73,6 +65,35 @@ with lib;
           "credential \"https://git.worble.xyz\"" = {
             provider = "generic";
           };
+          # stealing from https://blog.gitbutler.com/how-git-core-devs-configure-git/
+          column = {
+            ui = "auto";
+          };
+          branch = {
+            sort = "-committerdate";
+          };
+          tag = {
+            sort = "version:refname";
+          };
+          diff = {
+            algorithm = "histogram";
+            colorMoved = "plain";
+            mnemonicPrefix = true;
+            renames = true;
+          };
+          push = {
+            followTags = true;
+          };
+          fetch = {
+            prune = true;
+            pruneTags = true;
+            all = true;
+          };
+          rebase = {
+            autoSquash = true;
+            autoStash = true;
+            updateRefs = true;
+          };
         };
       };
 
diff --git a/home-manager/firefox/firefox.nix b/home-manager/firefox/firefox.nix
index eb18893..a2891aa 100644
--- a/home-manager/firefox/firefox.nix
+++ b/home-manager/firefox/firefox.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
 {
   programs = {
diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix
index 06015fb..bb92adc 100644
--- a/home-manager/gaming.nix
+++ b/home-manager/gaming.nix
@@ -1,9 +1,9 @@
-{ inputs, pkgs, config, ... }:
+{ inputs, pkgs, ... }:
 
 {
   home.packages = with pkgs;[
     steamguard-cli
     bottles
-    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".ryujinx-greemdev
+    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".ryubing
   ];
 }