From 82297c4565d91e7529833a818852d9e5fb16bcbd Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Thu, 20 Nov 2025 08:23:36 -0500 Subject: [PATCH] Cleanup --- dot_config/flake/home/helix.nix | 2 +- dot_config/flake/machines/hinge/darwin.nix | 1 + dot_config/flake/machines/hinge/home.nix | 6 ++++-- .../flake/modules/darwin/PaperWM.spoon/default.nix | 10 +++++----- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dot_config/flake/home/helix.nix b/dot_config/flake/home/helix.nix index 0d2e393..e0d5a2c 100644 --- a/dot_config/flake/home/helix.nix +++ b/dot_config/flake/home/helix.nix @@ -72,7 +72,7 @@ tab-width = 2; unit = " "; }; - language-servers = [{name = "clangd";}]; + language-servers = ["clangd"]; } { name = "slang"; diff --git a/dot_config/flake/machines/hinge/darwin.nix b/dot_config/flake/machines/hinge/darwin.nix index 2c99fd0..855b9bf 100644 --- a/dot_config/flake/machines/hinge/darwin.nix +++ b/dot_config/flake/machines/hinge/darwin.nix @@ -92,6 +92,7 @@ in { "wget" "ios-deploy" "unzip" + "yarn" "xz" "llvm@20" diff --git a/dot_config/flake/machines/hinge/home.nix b/dot_config/flake/machines/hinge/home.nix index 9d71510..33d4802 100644 --- a/dot_config/flake/machines/hinge/home.nix +++ b/dot_config/flake/machines/hinge/home.nix @@ -88,6 +88,10 @@ name = "cpp"; language-servers = ["clangd" "lsp_ai"]; } + { + name = "objc"; + language-servers = ["clangd" "lsp_ai"]; + } { name = "python"; language-servers = ["ruff" "basedpyright" "lsp_ai"]; @@ -160,13 +164,11 @@ uv unstable.jiratui - unstable.opencode ffmpeg sccache just nodejs_24 - yarn cocoapods ]; diff --git a/dot_config/flake/modules/darwin/PaperWM.spoon/default.nix b/dot_config/flake/modules/darwin/PaperWM.spoon/default.nix index 75accfe..3948d85 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 = "511b94fd492a2ea1ae2907864b88c2dbc85608d1"; - hash = "sha256-s2IwtYkcf+rPfEA6XhyohsRZQNW8OYl4m9tlBuepvpI="; + rev = "19b1f036b3f2464f9debb3a5429337572f385f14"; + hash = "sha256-+YGbBqHFSuizz0yd20NWjyeOOz3AjpLox9MkLbCUE7I="; }; }; @@ -47,9 +47,9 @@ -- WarpMouse.margin = 8 -- optionally set how far past a screen edge the mouse should warp, default is 2 pixels WarpMouse:start() - hs.loadSpoon("FocusMode") - spoon.FocusMode:start() - spoon.FocusMode.eventSettleDelay = 0.03 + -- hs.loadSpoon("FocusMode") + -- spoon.FocusMode:start() + -- spoon.FocusMode.eventSettleDelay = 0.03 PaperWM = hs.loadSpoon("PaperWM") PaperWM.drag_window = { "alt", "cmd" }