From 935942449813b76e21e081cd6d70fc0e83e7a529 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 13 Nov 2023 20:05:35 -0600 Subject: [PATCH] feat: macos overlays until nixpkgs updated --- flake.lock | 121 ++++++++++++++++++-------------- flake.nix | 6 +- overlays/sketchybar/default.nix | 10 +++ overlays/yabai/default.nix | 3 + 4 files changed, 85 insertions(+), 55 deletions(-) create mode 100644 overlays/yabai/default.nix diff --git a/flake.lock b/flake.lock index 0f47d5c55..475c10ff7 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1699569089, - "narHash": "sha256-MdOnyXrmMdVU9o7GpcbWKgehoK9L76ihp8rTikPcC1k=", + "lastModified": 1699867978, + "narHash": "sha256-+arl45HUOcBdKiRGrKXZYXDyBQ6MQGkYPZa/28f6Yzo=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c8f385766ba076a096caa794309c40f89894d88a", + "rev": "e67f2bf515343da378c3f82f098df8ca01bccc5f", "type": "github" }, "original": { @@ -543,11 +543,11 @@ ] }, "locked": { - "lastModified": 1699663185, - "narHash": "sha256-hI3CZPINBWstkMN+ptyzWibw5eRtFCiEvO7zR61bGBs=", + "lastModified": 1699783872, + "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "owner": "nix-community", "repo": "home-manager", - "rev": "691cbcc03af6ad1b5384c0e0e0b5f2298f58c5ce", + "rev": "280721186ab75a76537713ec310306f0eba3e407", "type": "github" }, "original": { @@ -567,11 +567,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1699663960, - "narHash": "sha256-eiKziDK6qEki5Raos/cDRVlAgioqjKKgGqCOG31yNB8=", + "lastModified": 1699893778, + "narHash": "sha256-Sq/l7BPoeCMtTFQ/B0qdAmNgrykDMAz8Vv2neZqGJbU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e44d6de555da72bd45ebd01c1293d53ea2700d3f", + "rev": "5edb4e4a304bbef1de30a36f7b921ea328d7efc6", "type": "github" }, "original": { @@ -587,11 +587,11 @@ ] }, "locked": { - "lastModified": 1699207529, - "narHash": "sha256-FedgUGYiA4ZapIywsLSFgvXGyoFraBB44bI63+F00QE=", + "lastModified": 1699804941, + "narHash": "sha256-noxbidHzQSGS0jY9M5aWIq7yhVSXz8rzTEu53uiTu+c=", "owner": "hyprwm", "repo": "contrib", - "rev": "e2cb3559cf435bd26585405de0c6b23855786337", + "rev": "f2dc4a6a8be9f99177a5ebd23d4e028cbd859237", "type": "github" }, "original": { @@ -658,11 +658,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1699186103, - "narHash": "sha256-B13wpM9/sLYBO2TjxFYLhPUD9v3LVFVOmH12pGB3E0w=", + "lastModified": 1699790908, + "narHash": "sha256-8CO4KQhiEyO7rce4KVOq8arpk9802fVwxtN/oLeRFag=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "99ff947f29d9c89fe26072b1927e594ee45ccda0", + "rev": "6c60a229fa422698325b2788e93dfeeba3f11391", "type": "github" }, "original": { @@ -717,11 +717,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1699261003, - "narHash": "sha256-wkOVJ2wkPpTYqipDF693bEAUQ838xjloUcs6WNsTMlw=", + "lastModified": 1699796151, + "narHash": "sha256-k/yMWbtMHpiNHeR0ihNPV/idOUSRJuhf0RSCodxmOhc=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "2b55f473c960d38a40678d9831fc1dcb87615a98", + "rev": "213e801956397b3edc16d0c13a3d479b1e0c65a3", "type": "github" }, "original": { @@ -759,11 +759,11 @@ ] }, "locked": { - "lastModified": 1698486730, - "narHash": "sha256-MP4bGb3JXkmmECssp0B7i0OipUXN7HurAqvfP830NLg=", + "lastModified": 1699785596, + "narHash": "sha256-njXqFmAEju1qZFePg6E3sca4xVp3P3T/Dm+D+be1fQM=", "owner": "Mic92", "repo": "nix-ld", - "rev": "846421112563fb6cf0334d9f124449aada964088", + "rev": "35ba5d7e8e6f838121a422e25ca38a40c41b8636", "type": "github" }, "original": { @@ -810,11 +810,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1699159446, - "narHash": "sha256-cL63IjsbPl2otS7R4kdXbVOJOXYMpGw5KGZoWgdCuCM=", + "lastModified": 1699701045, + "narHash": "sha256-mDzUXK7jNO/utInWpSWEX1NgEEunVIpJg+LyPsDTfy0=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "627bc9b88256379578885a7028c9e791c29fb581", + "rev": "b689465d0c5d88e158e7d76094fca08cc0223aad", "type": "github" }, "original": { @@ -861,13 +861,29 @@ "type": "github" } }, + "nixpkgs-khanelinix": { + "locked": { + "lastModified": 1699838008, + "narHash": "sha256-F1J9LzDGY/DI3zKn4/9hzNMWjaB46cONs/7KLQRUm48=", + "owner": "khaneliman", + "repo": "nixpkgs", + "rev": "94b09ce439fd70446a02c8979284ac0ada251f95", + "type": "github" + }, + "original": { + "owner": "khaneliman", + "ref": "yabai-update", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { - "lastModified": 1699145078, - "narHash": "sha256-OO1b3jiMUGjafD2ErkbTPVgUlhmyWo2Z5i0k2kD1ViU=", + "lastModified": 1699750082, + "narHash": "sha256-4Vx6Vr975vPGzGACyu4u6JfWo2Auwy0AeC6sTSOXdTQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "174d7dc67189bc4a53f1bffb4fb9d0f13b79cd3c", + "rev": "55682344eae38a1975ccd2cfac0dcb4197faedf8", "type": "github" }, "original": { @@ -894,11 +910,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1699110214, - "narHash": "sha256-L2TU4RgtiqF69W8Gacg2jEkEYJrW+Kp0Mp4plwQh5b8=", + "lastModified": 1699756042, + "narHash": "sha256-bHHjQQBsEPOxLL+klYU2lYshDnnWY12SewzQ7n5ab2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78f3a4ae19f0e99d5323dd2e3853916b8ee4afee", + "rev": "9502d0245983bb233da8083b55d60d96fd3c29ff", "type": "github" }, "original": { @@ -918,11 +934,11 @@ ] }, "locked": { - "lastModified": 1699629370, - "narHash": "sha256-HwoRInCXXdEUcfXEnlWb7v4nuQLUo5dT9ZWTb2C1Vik=", + "lastModified": 1699902754, + "narHash": "sha256-c5i/MwKzFdzWi0trXq3aCtsW4LSStiN5SAfezB8uBUQ=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "62a9b65dfb8c182530887d567a7c796fe2bb514e", + "rev": "c66ac6fd29b2245d16b7f63ecf2bfac103ca6847", "type": "github" }, "original": { @@ -933,11 +949,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1699236715, - "narHash": "sha256-oel+a6B5mBO7vA1A/I9A9VTK2jW5shnYAuu08RYhmxQ=", + "lastModified": 1699794571, + "narHash": "sha256-a9fa+AYCSiL1w9GBz4bIoj/rw4hZIntpaCdhXqHSLfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0d93ec62e06faec6c52331a8a87bd5721b38ce14", + "rev": "44cf4801c0937b76cc6f416a0b160b5d1b3286af", "type": "github" }, "original": { @@ -985,11 +1001,11 @@ }, "nur": { "locked": { - "lastModified": 1699669594, - "narHash": "sha256-JoBm7M7bLvBjmsVOwaTEGrdtC07FAvcWWgPH4GRCFJU=", + "lastModified": 1699926094, + "narHash": "sha256-v9NXBEkxEjelXykUCuJVySix7kt/YCC45dcr64WTGzo=", "owner": "nix-community", "repo": "NUR", - "rev": "05186359993dfaae9be0bebdd8b2c63a75aec8ee", + "rev": "c14d73d1969e99562f8a1813adbf2af3d3e97de1", "type": "github" }, "original": { @@ -1078,6 +1094,7 @@ "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs", + "nixpkgs-khanelinix": "nixpkgs-khanelinix", "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", "ranger-devicons": "ranger-devicons", @@ -1124,11 +1141,11 @@ ] }, "locked": { - "lastModified": 1699669856, - "narHash": "sha256-OIb0WAoEMUA1EH70AwpWabdEpvYt/kJChBnb7XiXAJs=", + "lastModified": 1699841702, + "narHash": "sha256-EG1Fpw732KmcyFJB0tUNsvreRomwTI/H5ngqlGrfB1Y=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "efd15e11c8954051a47679e7718b4c2a9b68ce27", + "rev": "05c34b45e276a9939d1170b025faafe7a5fab2c8", "type": "github" }, "original": { @@ -1269,11 +1286,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1699311858, - "narHash": "sha256-W/sQrghPAn5J9d+9kMnHqi4NPVWVpy0V/qzQeZfS/dM=", + "lastModified": 1699915071, + "narHash": "sha256-EVZTfDVsB/g34pxieNIFwcUIbq8BmQL8Eu7K+VKbBz0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "664187539871f63857bda2d498f452792457b998", + "rev": "074ff78f8d6d9d3867ee34bad81fd424973e6509", "type": "github" }, "original": { @@ -1433,11 +1450,11 @@ ] }, "locked": { - "lastModified": 1698438538, - "narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=", + "lastModified": 1699786194, + "narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1", + "rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1", "type": "github" }, "original": { @@ -1499,18 +1516,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1697909146, - "narHash": "sha256-jU0I6FoCKnj4zIBL4daosFWh81U1fM719Z6cae8PxSY=", + "lastModified": 1699292815, + "narHash": "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I=", "owner": "wlroots", "repo": "wlroots", - "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", + "rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "47bf87ade2bd32395615a385ebde1fefbcdf79a2", + "rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1", "type": "gitlab" } }, diff --git a/flake.nix b/flake.nix index 88aba2a5a..afa377186 100644 --- a/flake.nix +++ b/flake.nix @@ -69,9 +69,9 @@ }; # Nixpkgs fork - # nixpkgs-khanelinix = { - # url = "github:khaneliman/nixpkgs"; - # }; + nixpkgs-khanelinix = { + url = "github:khaneliman/nixpkgs/yabai-update"; + }; # NixPkgs-Wayland nixpkgs-wayland = { diff --git a/overlays/sketchybar/default.nix b/overlays/sketchybar/default.nix index 16db80248..188c865b6 100644 --- a/overlays/sketchybar/default.nix +++ b/overlays/sketchybar/default.nix @@ -1,5 +1,15 @@ _: _final: prev: { sketchybar = prev.sketchybar.overrideAttrs (oldAttrs: { + + version = "2.19.3"; + + src = prev.fetchFromGitHub { + owner = "FelixKratz"; + repo = "SketchyBar"; + rev = "v2.19.3"; + hash = "sha256-QT926AnV9jLc1KvYks6ukIAcMbVHOupTJWQ6vBHpcxc="; + }; + # Create secondary sketchybar executable for dynamic island installPhase = '' ${oldAttrs.installPhase} diff --git a/overlays/yabai/default.nix b/overlays/yabai/default.nix new file mode 100644 index 000000000..08b28a474 --- /dev/null +++ b/overlays/yabai/default.nix @@ -0,0 +1,3 @@ +{ channels, ... }: _final: prev: { + inherit (channels.nixpkgs-khanelinix) yabai; +}