From 748624c12f6464adbbebf66e0c1fe98a318fe05c Mon Sep 17 00:00:00 2001
From: Tyler Mayoff <tyler.mayoff@hingehealth.com>
Date: Fri, 19 Sep 2025 09:15:59 -0400
Subject: [PATCH] updates

---
 dot_config/flake/flake.nix                                | 4 ++--
 dot_config/flake/machines/hinge/home.nix                  | 2 +-
 dot_config/flake/modules/darwin/PaperWM.spoon/default.nix | 6 ++++--
 dot_config/flake/modules/home/ghostty.nix                 | 2 --
 run_nix-rebuild.sh                                        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix
index 603488a..56041d8 100644
--- a/dot_config/flake/flake.nix
+++ b/dot_config/flake/flake.nix
@@ -12,8 +12,8 @@
     };
 
     darwin = {
-      url = "github:nix-darwin/nix-darwin/nix-darwin-25.05";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-darwin/nix-darwin/master";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
     # Software
diff --git a/dot_config/flake/machines/hinge/home.nix b/dot_config/flake/machines/hinge/home.nix
index b37d01a..da4687b 100644
--- a/dot_config/flake/machines/hinge/home.nix
+++ b/dot_config/flake/machines/hinge/home.nix
@@ -2,7 +2,7 @@
   imports = [
     ../../home/common.nix
     ../../home/helide
-    ../../home/ghostty.nix
+    ../../modules/home/ghostty.nix
     ../../modules/darwin/PaperWM.spoon
   ];
 
diff --git a/dot_config/flake/modules/darwin/PaperWM.spoon/default.nix b/dot_config/flake/modules/darwin/PaperWM.spoon/default.nix
index 3a62fa6..136647f 100644
--- a/dot_config/flake/modules/darwin/PaperWM.spoon/default.nix
+++ b/dot_config/flake/modules/darwin/PaperWM.spoon/default.nix
@@ -13,8 +13,8 @@
       source = pkgs.fetchFromGitHub {
         owner = "mogenson";
         repo = "PaperWM.spoon";
-        rev = "bc8291448d8b3e977a097b33b0626f43c16bd3b3";
-        hash = "sha256-/YGzldTfWWuKRZcvQHp+2p+hxtQk90midKQJ2SvPKZQ=";
+        rev = "cmd-drag";
+        hash = "sha256-5lDxVP4KSPdSY+Vzv3wQHGDKKUevGl2qm2YWiCLuS98=";
       };
     };
 
@@ -51,6 +51,8 @@
         -- spoon.FocusMode:start()
 
         PaperWM = hs.loadSpoon("PaperWM")
+        PaperWM.drag_window = { "alt", "cmd" }
+        PaperWM.lift_window = { "alt", "cmd", "shift" }
         PaperWM:bindHotkeys({
             -- switch to a new focused window in tiled grid
             focus_left  = {{"alt", "cmd"}, "left"},
diff --git a/dot_config/flake/modules/home/ghostty.nix b/dot_config/flake/modules/home/ghostty.nix
index f428444..1588c95 100644
--- a/dot_config/flake/modules/home/ghostty.nix
+++ b/dot_config/flake/modules/home/ghostty.nix
@@ -8,8 +8,6 @@
       else pkgs.unstable.ghostty;
 
     settings = {
-      auto-update = false;
-
       theme = "light:Rose Pine Dawn,dark:Rose Pine";
       macos-option-as-alt = "left";
 
diff --git a/run_nix-rebuild.sh b/run_nix-rebuild.sh
index 70410c6..bcc0d09 100755
--- a/run_nix-rebuild.sh
+++ b/run_nix-rebuild.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 [[ $(command -v nixos-rebuild) ]] && nh os switch ~/.config/flake
-[[ $(command -v darwin-rebuild) ]] && sudo darwin-rebuild switch --flake ~/.config/flake/
+[[ $(command -v darwin-rebuild) ]] && nh darwin switch ~/.config/flake/
 [[ $(command -v home-manager) ]] && nh home switch ~/.config/flake/
 
 exit 0