From a8568b19befc2065c56af162380d23deca18c3e8 Mon Sep 17 00:00:00 2001 From: notohh Date: Sun, 26 May 2024 16:43:09 -0400 Subject: [PATCH] flake: add wezterm overlay & update --- flake.lock | 318 ++++++++++++++++++++++++++++++++++++++++------------- flake.nix | 1 + 2 files changed, 245 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index cb1f9ca..57b9cd2 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1716000408, - "narHash": "sha256-jIGTdIcHtRpY3fcfNUbcTv2IOVGW9srUzLrcYgK07Ik=", + "lastModified": 1716638635, + "narHash": "sha256-exRwSztMwH4IZ//3+Xq9hnyONVOnQ2Yo41gJRJWA78E=", "owner": "atuinsh", "repo": "atuin", - "rev": "95c91689441c66228cd8eb2e94e9b43a848d75f4", + "rev": "2e88321aecfd1c4a7fa69a1794ecdf34a401c358", "type": "github" }, "original": { @@ -483,7 +483,25 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_14" + "systems": "systems_12" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_15" }, "locked": { "lastModified": 1710146030, @@ -499,6 +517,23 @@ "type": "github" } }, + "freetype2": { + "flake": false, + "locked": { + "lastModified": 1687587065, + "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=", + "owner": "wez", + "repo": "freetype2", + "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "type": "github" + }, + "original": { + "owner": "wez", + "repo": "freetype2", + "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -553,6 +588,23 @@ "type": "github" } }, + "harfbuzz": { + "flake": false, + "locked": { + "lastModified": 1711722720, + "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=", + "owner": "harfbuzz", + "repo": "harfbuzz", + "rev": "63973005bc07aba599b47fdd4cf788647b601ccd", + "type": "github" + }, + "original": { + "owner": "harfbuzz", + "ref": "8.4.0", + "repo": "harfbuzz", + "type": "github" + } + }, "helix": { "inputs": { "crane": "crane_2", @@ -561,11 +613,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1715885401, - "narHash": "sha256-Ay87mjRXLGwBtgKW+SdfrsyUlDIygPQksaZXTV9PMSM=", + "lastModified": 1716520196, + "narHash": "sha256-OdZe7n3+cHUnN3Lq5Ou89OEJq0kMdbnFMJeKCE+CFnc=", "owner": "helix-editor", "repo": "helix", - "rev": "2301430e37a98192de7864faa2d8c1b84860f400", + "rev": "f1c9580e4b636d014fefb61080d8d019c14e37b7", "type": "github" }, "original": { @@ -581,11 +633,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1716668005, + "narHash": "sha256-daQD/pphMJUriHiWfKo9V4Kpi7+GIAE0As47Mpko0TI=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "d179da4e81bcd4227e8abf4b62b92c4ae214ae39", "type": "github" }, "original": { @@ -631,11 +683,11 @@ ] }, "locked": { - "lastModified": 1715791817, - "narHash": "sha256-J069Uhv/gCMFLX1dSh2f+9ZTM09r1Nv3oUfocCnWKow=", + "lastModified": 1716576411, + "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "7c3aa03dffb53921e583ade3d4ae3f487e390e7e", + "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621", "type": "github" }, "original": { @@ -651,11 +703,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1715699575, - "narHash": "sha256-MLTUVPcRbH9i+AchIK+3SaeF3K27NGLApQCRoQEsc3s=", + "lastModified": 1716309977, + "narHash": "sha256-4jDQIcMDSFOOMBxVTEiC6Ck1vdc0kAFvv+StxnnE59Q=", "owner": "hyprwm", "repo": "hypridle", - "rev": "afa6e21b8881a4a7d01b960ee4a2421c495777aa", + "rev": "cb169c4e06cec9b4349e3668427e729d22328a54", "type": "github" }, "original": { @@ -674,11 +726,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716063601, - "narHash": "sha256-gAuCKupztnqai1tZ6TyCFCRbeFzbggL0Oe0vl0/cwK8=", + "lastModified": 1716669967, + "narHash": "sha256-wq91XpwR0tv7e7KwSp0qzvu31EMssznl8DzbNy4M4Hk=", "ref": "refs/heads/main", - "rev": "f8857e6072bd85b95393499688872aaf7f088b5b", - "revCount": 4719, + "rev": "553232a3e4c112c8511309e6b685cb614895e714", + "revCount": 4743, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -800,11 +852,11 @@ ] }, "locked": { - "lastModified": 1715791527, - "narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=", + "lastModified": 1716473782, + "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee", + "rev": "87d5d984109c839482b88b4795db073eb9ed446f", "type": "github" }, "original": { @@ -860,7 +912,7 @@ "xdg-portal-hyprland", "nixpkgs" ], - "systems": "systems_12" + "systems": "systems_13" }, "locked": { "lastModified": 1713121246, @@ -883,11 +935,11 @@ "systems": "systems_9" }, "locked": { - "lastModified": 1715970545, - "narHash": "sha256-WD6Iyb9DV1R5a2A0UIVT8GyzRhs9ntOPGKDubEUUVNs=", + "lastModified": 1716660337, + "narHash": "sha256-RFu231c1uaCTmjwvzsV7wA5fNq/d4OhKFc+2/25ReRE=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "997f222b0fec6ac74ec718b53600e77c2b26860a", + "rev": "58c93d8de886e06f57875fc651d60e2dcfc32989", "type": "github" }, "original": { @@ -903,11 +955,11 @@ "systems": "systems_11" }, "locked": { - "lastModified": 1715699621, - "narHash": "sha256-8DmIFq+3od8OZmDYB/okBWgnOdv87AK37wUhppkEY+U=", + "lastModified": 1716658811, + "narHash": "sha256-tJ/roE0BqzO2Sn73fF+50RpYYrRS5hDCHI8BmiuPMjA=", "owner": "hyprwm", "repo": "hyprpaper", - "rev": "b2f8274e1d52b0008f770f1136c9d58f77530202", + "rev": "2c57525de840e4edada2cfd2924659b80f513ece", "type": "github" }, "original": { @@ -946,11 +998,11 @@ ] }, "locked": { - "lastModified": 1715879663, - "narHash": "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=", + "lastModified": 1716058375, + "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f5181a068c1b06f2db51f6222e50a0c665a2b0c3", + "rev": "3afed4364790aebe0426077631af1e164a9650cc", "type": "github" }, "original": { @@ -959,17 +1011,34 @@ "type": "github" } }, + "libpng": { + "flake": false, + "locked": { + "lastModified": 1549245649, + "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=", + "owner": "glennrp", + "repo": "libpng", + "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", + "type": "github" + }, + "original": { + "owner": "glennrp", + "repo": "libpng", + "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", + "type": "github" + } + }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts_3", "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1716167790, - "narHash": "sha256-oPo3lkpXOiixYHyCXLwN3+B2D/wbk1p9wVP3q3EuzSA=", + "lastModified": 1716513383, + "narHash": "sha256-WKO8A3PvMRTXB5wNhFyTNXnYQThSazIyVqY5Yh4YIiI=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "ddf67a243c20d781563d6a4066be164720b32afa", + "rev": "a1b37351bf0fe01192eeb93f643749f2e0f944eb", "type": "github" }, "original": { @@ -1132,11 +1201,11 @@ }, "nixpkgs_13": { "locked": { - "lastModified": 1715961556, - "narHash": "sha256-+NpbZRCRisUHKQJZF3CT+xn14ZZQO+KjxIIanH3Pvn4=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4a6b83b05df1a8bd7d99095ec4b4d271f2956b64", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { @@ -1179,6 +1248,22 @@ } }, "nixpkgs_16": { + "locked": { + "lastModified": 1705403940, + "narHash": "sha256-bl7E3w35Bleiexg01WsN0RuAQEL23HaQeNBC2zjt+9w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f0326542989e1bdac955ad6269b334a8da4b0c95", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_17": { "locked": { "lastModified": 1712963716, "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", @@ -1194,7 +1279,7 @@ "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_18": { "locked": { "lastModified": 1716097317, "narHash": "sha256-1UMrLtgzielG/Sop6gl6oTSM4pDt7rF9j9VuxhDWDlY=", @@ -1292,11 +1377,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1715787315, - "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", + "lastModified": 1716330097, + "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", + "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", "type": "github" }, "original": { @@ -1340,11 +1425,11 @@ }, "nur": { "locked": { - "lastModified": 1716177927, - "narHash": "sha256-E4RcAhpz7BLe+U4xf98n9mqWN3/Ipzn/4gw08eUiSpY=", + "lastModified": 1716669940, + "narHash": "sha256-3zLf6KEEV95HZkANmeCXW2MAhzBFo+FXgUdW0HNxBCA=", "owner": "nix-community", "repo": "NUR", - "rev": "f2af73098c2630ce26f3ab97e95e295ea69ee0c5", + "rev": "8bf38e282e0068e064378c6296982de3875025a1", "type": "github" }, "original": { @@ -1361,11 +1446,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1715870890, - "narHash": "sha256-nacSOeXtUEM77Gn0G4bTdEOeFIrkCBXiyyFZtdGwuH0=", + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fa606cccd7b0ccebe2880051208e4a0f61bfc8c1", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", "type": "github" }, "original": { @@ -1397,6 +1482,7 @@ "pre-commit-hooks": "pre-commit-hooks", "sops-nix": "sops-nix", "stylix": "stylix", + "wezterm": "wezterm", "xdg-portal-hyprland": "xdg-portal-hyprland", "yazi": "yazi" } @@ -1449,6 +1535,31 @@ } }, "rust-overlay_3": { + "inputs": { + "flake-utils": [ + "wezterm", + "flake-utils" + ], + "nixpkgs": [ + "wezterm", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1705457855, + "narHash": "sha256-5cCHQtP/PEHK1YNTQyZN9v8ehpLTjc723ZSKAP3Tva8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a854609265af0e9f48c92e497679edf8fab9e690", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_4": { "inputs": { "flake-utils": [ "yazi", @@ -1481,11 +1592,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1716087663, - "narHash": "sha256-zuSAGlx8Qk0OILGCC2GUyZ58/SJ5R3GZdeUNQ6IS0fQ=", + "lastModified": 1716400300, + "narHash": "sha256-0lMkIk9h3AzOHs1dCL9RXvvN4PM8VBKb+cyGsqOKa4c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0bf1808e70ce80046b0cff821c019df2b19aabf5", + "rev": "b549832718b8946e875c016a4785d204fcfc2e53", "type": "github" }, "original": { @@ -1509,11 +1620,11 @@ "nixpkgs": "nixpkgs_15" }, "locked": { - "lastModified": 1716037261, - "narHash": "sha256-eF0A36GdegKkEiwFArjCysGU/XEYvzj7x5jfkFMtmqM=", + "lastModified": 1716456264, + "narHash": "sha256-s9Tyj5pEivl/AsvrpkUkfR1Iu3zHfXpviPfe4HbPJ5I=", "owner": "danth", "repo": "stylix", - "rev": "76e7daf5a16d442ac98e844582f7dc1354610886", + "rev": "290c8aef476ce98fff9cefc059284429d561a085", "type": "github" }, "original": { @@ -1569,16 +1680,16 @@ }, "systems_12": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1598,6 +1709,21 @@ } }, "systems_14": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_15": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1750,19 +1876,46 @@ "type": "github" } }, + "wezterm": { + "inputs": { + "flake-utils": "flake-utils_5", + "freetype2": "freetype2", + "harfbuzz": "harfbuzz", + "libpng": "libpng", + "nixpkgs": "nixpkgs_16", + "rust-overlay": "rust-overlay_3", + "zlib": "zlib" + }, + "locked": { + "dir": "nix", + "lastModified": 1716230749, + "narHash": "sha256-S7xUWNt+PxjQqYO7Dv+IUXcQ5kvrOJYFIgPqDSoiPJc=", + "owner": "notohh", + "repo": "wezterm", + "rev": "5c74307039a31d95cfaba61771fb223cb07002b6", + "type": "github" + }, + "original": { + "dir": "nix", + "owner": "notohh", + "ref": "nix-add-overlay", + "repo": "wezterm", + "type": "github" + } + }, "xdg-portal-hyprland": { "inputs": { "hyprland-protocols": "hyprland-protocols_2", "hyprlang": "hyprlang_5", - "nixpkgs": "nixpkgs_16", - "systems": "systems_13" + "nixpkgs": "nixpkgs_17", + "systems": "systems_14" }, "locked": { - "lastModified": 1715788457, - "narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=", + "lastModified": 1716290197, + "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943", + "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", "type": "github" }, "original": { @@ -1788,11 +1941,11 @@ ] }, "locked": { - "lastModified": 1715788457, - "narHash": "sha256-32HOkjSIyANphV0p5gIwP4ONU/CcinhwOyVFB+tL/d0=", + "lastModified": 1716290197, + "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "af7c87a32f5d67eb2ada908a6a700f4e74831943", + "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", "type": "github" }, "original": { @@ -1803,16 +1956,16 @@ }, "yazi": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_17", - "rust-overlay": "rust-overlay_3" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_18", + "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1716116644, - "narHash": "sha256-Wj/Zd+Lm8f4FapTOztT7acB5lCTFsjmudrLzmGRwknY=", + "lastModified": 1716648968, + "narHash": "sha256-GgjzBE+XcwW6gCqryRG3lvzt1SAcAHlBreG1KbmXYng=", "owner": "sxyazi", "repo": "yazi", - "rev": "c2affae3a9e7d33e69fc5a2d6dfb01dd252e25b0", + "rev": "061faea1c58c42f5c920915f5c351d52a26ef2f1", "type": "github" }, "original": { @@ -1820,6 +1973,23 @@ "repo": "yazi", "type": "github" } + }, + "zlib": { + "flake": false, + "locked": { + "lastModified": 1484501380, + "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=", + "owner": "madler", + "repo": "zlib", + "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f", + "type": "github" + }, + "original": { + "owner": "madler", + "ref": "v1.2.11", + "repo": "zlib", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 81bf21c..bdf58a6 100755 --- a/flake.nix +++ b/flake.nix @@ -80,6 +80,7 @@ stylix.url = "github:danth/stylix"; eww.url = "github:elkowar/eww"; anyrun.url = "github:Kirottu/anyrun"; + wezterm.url = "github:notohh/wezterm?dir=nix&ref=nix-add-overlay"; deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs";