From 031865260e2f6c8a2184cbdf62d3f77abaf69b46 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Wed, 17 Sep 2025 00:06:27 +0530 Subject: [PATCH] feat: update flake dependencies and disable yabai service --- darwin/kuro/services/default.nix | 6 +- darwin/kuro/services/yabai.nix | 2 +- flake.lock | 125 ++++++++++++++++++------------- flake.nix | 4 + home/programs/default.nix | 1 + overlays.nix | 11 +++ 6 files changed, 91 insertions(+), 58 deletions(-) diff --git a/darwin/kuro/services/default.nix b/darwin/kuro/services/default.nix index 9a7c4045..8c006884 100644 --- a/darwin/kuro/services/default.nix +++ b/darwin/kuro/services/default.nix @@ -1,9 +1,9 @@ {...}: { imports = [ - ./yabai.nix - ./skhd.nix ./tailscale.nix - # ./ollama.nix # ./aerospace.nix + # ./ollama.nix + # ./skhd.nix + # ./yabai.nix ]; } diff --git a/darwin/kuro/services/yabai.nix b/darwin/kuro/services/yabai.nix index 9b89cf02..24de6848 100644 --- a/darwin/kuro/services/yabai.nix +++ b/darwin/kuro/services/yabai.nix @@ -1,7 +1,7 @@ {...}: { services = { yabai = { - enable = true; + enable = false; enableScriptingAddition = true; config = { mouse_follows_focus = "on"; diff --git a/flake.lock b/flake.lock index c98b5ab7..26e88119 100644 --- a/flake.lock +++ b/flake.lock @@ -457,11 +457,11 @@ "csshacks": { "flake": false, "locked": { - "lastModified": 1757600619, - "narHash": "sha256-CXOzUb3whLgxbp+HSInE/5KG+20L+cGPc/DjiGSoj3U=", + "lastModified": 1757991741, + "narHash": "sha256-O9SXRWmXdzJXu/BgmunVUV15EriheCkAb7VEdwTjemM=", "owner": "MrOtherGuy", "repo": "firefox-csshacks", - "rev": "e31863b2889655e30000b5149caf31aa74469595", + "rev": "41e003708fb3cbd8fc9985447d267381ce8c6a26", "type": "github" }, "original": { @@ -1194,11 +1194,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1757737252, - "narHash": "sha256-i0GfdFWNlIgFuVjCnf6/nSTqnNU4PSXb+6NBxGJkspE=", + "lastModified": 1758031303, + "narHash": "sha256-VpYvdgigjrSGnqV75ErHxmb+AP+qjTWdG8UrAE5JNts=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "0c63946bdb68080cd5cac0f97622b8509b6776a5", + "rev": "a32d4988f775d72a24cd8a27ab1a9778773b7868", "type": "github" }, "original": { @@ -1290,11 +1290,11 @@ ] }, "locked": { - "lastModified": 1757698511, - "narHash": "sha256-UqHHGydF/q3jfYXCpvYLA0TWtvByOp1NwOKCUjhYmPs=", + "lastModified": 1757997814, + "narHash": "sha256-F+1aoG+3NH4jDDEmhnDUReISyq6kQBBuktTUqCUWSiw=", "owner": "nix-community", "repo": "home-manager", - "rev": "a3fcc92180c7462082cd849498369591dfb20855", + "rev": "5820376beb804de9acf07debaaff1ac84728b708", "type": "github" }, "original": { @@ -1310,11 +1310,11 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1757808926, + "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", "type": "github" }, "original": { @@ -1450,11 +1450,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1757774222, - "narHash": "sha256-U9+acA664xoegzxNDGA7xzvCW3Gplg1aq1TZurF2Ro0=", + "lastModified": 1757977770, + "narHash": "sha256-opWeyLdiAoI4OfEatTnijIu8JBcdAwFdd6MW2pErK4c=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "16c18dde24450cce451f102fa09b8f7b60060306", + "rev": "5e96fac52fbd353eaf51ac436d1ada16a021e5f2", "type": "github" }, "original": { @@ -1626,11 +1626,11 @@ "systems": "systems_10" }, "locked": { - "lastModified": 1757520666, - "narHash": "sha256-jYV+vPzfii7HSr3RSHMMP8msjvljsfOQd6JWpKjgLuw=", + "lastModified": 1757960074, + "narHash": "sha256-B9M91muCv6Qn88sSGXKI7v00nQ2uY9W6vC/6UBta4ac=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "450ae1e5f09fa95c970fb370c037e60d3b4783f2", + "rev": "a7f2634a9e5c1fc25a0d83d3e7ca0fca0a06e1b7", "type": "github" }, "original": { @@ -2146,11 +2146,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1757218147, - "narHash": "sha256-IwOwN70HvoBNB2ckaROxcaCvj5NudNc52taPsv5wtLk=", + "lastModified": 1757822619, + "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "9b144dc3ef6e42b888c4190e02746aab13b0e97f", + "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", "type": "github" }, "original": { @@ -2277,11 +2277,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1757773722, - "narHash": "sha256-DwxmQZ9D+hEe7h968RvFIVm6gidiVpGKZl8HanbI7FY=", + "lastModified": 1758042318, + "narHash": "sha256-z1D6I/H1Cg+tBvz9L4lhNC/tSrUuMmEbKqqrZYsKKBs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b8df34ffe22cfc4f6c6229aa29d8ee67657cbec0", + "rev": "93b1ca689db2d45504a9db2fba906547bd082029", "type": "github" }, "original": { @@ -2341,11 +2341,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -2415,11 +2415,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -2463,11 +2463,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1757487488, - "narHash": "sha256-zwE/e7CuPJUWKdvvTCB7iunV4E/+G0lKfv4kk/5Izdg=", + "lastModified": 1757745802, + "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ab0f3607a6c7486ea22229b92ed2d355f1482ee0", + "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "type": "github" }, "original": { @@ -2487,11 +2487,11 @@ "systems": "systems_16" }, "locked": { - "lastModified": 1757619215, - "narHash": "sha256-AAg3S94zMF4BtByF2k9/K/tbC0awNHCc50GxCjccUhw=", + "lastModified": 1758034804, + "narHash": "sha256-+F8LeixQ+8Wt6jMk7kd4o74Pdp70bpuQ1mw4tGqD3Ew=", "owner": "nix-community", "repo": "nixvim", - "rev": "43c6f7293eba3fa5ff699e339e55270305e51cab", + "rev": "334d2eb26eb3680d21ee26af2d7e66604468f61b", "type": "github" }, "original": { @@ -2512,11 +2512,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1757772783, - "narHash": "sha256-m3rVW2QylC+9a77vYJsNJc2sUXK1xH7LM+/503PAdwY=", + "lastModified": 1758026178, + "narHash": "sha256-ryKSs2h+JlIv2CHqe/tgtoQy/oJqWV+wmr3VKWTvufc=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "b5bb58f45ce84edce95707344baef07b9edb1361", + "rev": "72fae833144265786c6bb5fe482f088969a60d2b", "type": "github" }, "original": { @@ -2572,11 +2572,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1757774280, - "narHash": "sha256-6zr/O28OQ5yrayBLkJwog5UL5gA/ttxxDIvrrxujfM0=", + "lastModified": 1758038335, + "narHash": "sha256-zDIMvKyBM/F4aiS3XVBpwaEBpPwlmvbXGjt22l0H6b0=", "owner": "nix-community", "repo": "nur", - "rev": "e944a857f0f66056d80dda20cbed0c649fede72d", + "rev": "1b4c76b4c9d3bfeca70dbb6010d0828fc4b0333f", "type": "github" }, "original": { @@ -2595,11 +2595,11 @@ ] }, "locked": { - "lastModified": 1756738487, - "narHash": "sha256-8QX7Ab5CcICp7zktL47VQVS+QeaU4YDNAjzty7l7TQE=", + "lastModified": 1757885130, + "narHash": "sha256-56CMb5W/pgjKLh0bx2ekhn5rde/YmgR63HAqrY9/BCw=", "owner": "NuschtOS", "repo": "search", - "rev": "5feeaeefb571e6ca2700888b944f436f7c05149b", + "rev": "fae3c59a646e00c4b1d359c50b27458a0713d2fd", "type": "github" }, "original": { @@ -2779,6 +2779,7 @@ "tree-sitter-slint": "tree-sitter-slint", "typr": "typr", "volt": "volt", + "yabai": "yabai", "zen-browser": "zen-browser", "zeronsd": "zeronsd", "zjstatus": "zjstatus" @@ -2998,11 +2999,11 @@ ] }, "locked": { - "lastModified": 1757730403, - "narHash": "sha256-Jxl4OZRVsXs8JxEHUVQn3oPu6zcqFyGGKaFrlNgbzp0=", + "lastModified": 1757989933, + "narHash": "sha256-9cpKYWWPCFhgwQTww8S94rTXgg8Q8ydFv9fXM6I8xQM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3232f7f8bd07849fc6f4ae77fe695e0abb2eba2c", + "rev": "8249aa3442fb9b45e615a35f39eca2fe5510d7c3", "type": "github" }, "original": { @@ -3039,11 +3040,11 @@ ] }, "locked": { - "lastModified": 1757503115, - "narHash": "sha256-S9F6bHUBh+CFEUalv/qxNImRapCxvSnOzWBUZgK1zDU=", + "lastModified": 1758007585, + "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0bf793823386187dff101ee2a9d4ed26de8bbf8c", + "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", "type": "github" }, "original": { @@ -3547,6 +3548,22 @@ "type": "github" } }, + "yabai": { + "flake": false, + "locked": { + "lastModified": 1757932066, + "narHash": "sha256-hpZJFz7bP9nKcYEj+zOMHolIQWOFG1mblc3iuEOTOKE=", + "owner": "koekeishiya", + "repo": "yabai", + "rev": "fe34a03e390a17a48ae0e489bd40d668a5c5c542", + "type": "github" + }, + "original": { + "owner": "koekeishiya", + "repo": "yabai", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", @@ -3555,11 +3572,11 @@ ] }, "locked": { - "lastModified": 1757740624, - "narHash": "sha256-hrlkhnUH3V9Vlr5AuvGtL0NaJVjAPs2IgNF39c0l45Q=", + "lastModified": 1757999874, + "narHash": "sha256-kgV3ms4hR86tIxaNAYJI8NNgkmEygN+JwkXCPAx2P2U=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9deb0308c1d7d271500902bbcbedc7eec3760043", + "rev": "7dcbd22ca3943e4cfb3122f96cf515f028b3236a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 390f6cf0..62b57c85 100644 --- a/flake.nix +++ b/flake.nix @@ -206,6 +206,10 @@ url = "github:immich-app/immich/v1.142.0"; flake = false; }; + yabai = { + url = "github:koekeishiya/yabai"; + flake = false; + }; }; outputs = { diff --git a/home/programs/default.nix b/home/programs/default.nix index d9beadff..6da8dd26 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -51,6 +51,7 @@ home.packages = with pkgs; [ _1password-cli + asciidoctor alejandra aria2 ast-grep diff --git a/overlays.nix b/overlays.nix index dfa5c270..cb2dc3e1 100644 --- a/overlays.nix +++ b/overlays.nix @@ -231,6 +231,17 @@ src = inputs.nixpkgs-stable.legacyPackages.${prev.system}.fprintd.src; }); kitty = inputs.nixpkgs-stable.legacyPackages.${prev.system}.kitty; + immich-latest = prev.immich.overrideAttrs (oldAttrs: { + version = "v1.142.0"; + src = inputs.immich; + }); + yabai = prev.yabai.overrideAttrs (oldAttrs: { + version = "7.2.16"; + src = final.fetchzip { + url = "https://git.darksailor.dev/servius/yabai-bin/raw/commit/f236ad5aafb98a25fdd73384de1fd41524b53dfb/yabai-v7.2.16.tar.gz"; + hash = "sha256-h+3Hnk+kVThz3JwxYjL40HsMhLyBNt66elVbUTw+Sko="; + }; + }); }; csshacks = final: prev: { csshacks = inputs.csshacks;