From c4a876be76229d12c8e69f76d3b0a425bca8cdbd Mon Sep 17 00:00:00 2001 From: RGBCube Date: Wed, 8 May 2024 10:04:30 +0300 Subject: [PATCH] Update lock --- flake.lock | 630 ++++++++++++++++++++++++++++++++++++++++++----------- flake.nix | 87 ++------ 2 files changed, 524 insertions(+), 193 deletions(-) diff --git a/flake.lock b/flake.lock index f962741..0038ae9 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1712079060, - "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", + "lastModified": 1715101957, + "narHash": "sha256-fs5uVQFTfgb4L9pnhldeyTHNcYwn1U4nKYoCBJ6W3W4=", "owner": "ryantm", "repo": "agenix", - "rev": "1381a759b205dff7a6818733118d02253340fd5e", + "rev": "07479c2e7396acaaaac5925483498154034ea80a", "type": "github" }, "original": { @@ -65,17 +65,15 @@ }, "fenix": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1713335151, - "narHash": "sha256-K97Xs+gvp9wbbpd+a4aSeeczWgtBs63ut6lAcDn3O4U=", + "lastModified": 1715063087, + "narHash": "sha256-cktPkcCmJ2sR0V/FaWEuCWmKuGPbwoMltih/EfF0mXg=", "owner": "nix-community", "repo": "fenix", - "rev": "fa179d2b1528f64ae43f83c485ef914d9c3fb85a", + "rev": "f8f16c1f2c83bea4e51e6522d988ec8bfcc8420e", "type": "github" }, "original": { @@ -84,7 +82,39 @@ "type": "github" } }, - "flakeCompat": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -100,11 +130,56 @@ "type": "github" } }, - "flakeUtils": { + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { - "systems": [ - "systems" - ] + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -120,28 +195,82 @@ "type": "github" } }, - "ghostty": { + "flake-utils_3": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { "inputs": { - "nixpkgs-stable": [ - "nixpkgs" - ], - "nixpkgs-unstable": [ - "nixpkgs" - ], - "nixpkgs-zig-0-12": "nixpkgs-zig-0-12", - "zig": [ - "zig" - ], - "zls": [ - "zig" - ] + "systems": "systems_5" }, "locked": { - "lastModified": 1713285560, - "narHash": "sha256-PlApALZSdBnRtXLk1XYksOzf47BU/V+vnIGjqrO1DmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "ghostty": { + "inputs": { + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig", + "zls": "zls" + }, + "locked": { + "lastModified": 1715137311, + "narHash": "sha256-8SWDXTQ/C9sCZRv3BZl3fAsKeaUjNBvP7IGU3AHqAX4=", "ref": "refs/heads/main", - "rev": "06c5528a59f61e61c7b8b21a51bb60a172ca7955", - "revCount": 5909, + "rev": "2b785127b1aa6aa1ea4126e4ddcc2e5cdf12f938", + "revCount": 6087, "type": "git", "url": "ssh://git@github.com/RGBCube/ghostty" }, @@ -166,6 +295,28 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "ghostty", + "zls", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "zls", @@ -193,11 +344,11 @@ ] }, "locked": { - "lastModified": 1713294767, - "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=", + "lastModified": 1715077503, + "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "owner": "nix-community", "repo": "home-manager", - "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7", + "rev": "6e277d9566de9976f47228dd8c580b97488734d4", "type": "github" }, "original": { @@ -222,11 +373,11 @@ ] }, "locked": { - "lastModified": 1713214463, - "narHash": "sha256-zAOOjqHAbccCRgJSuvTCA0FNLqKswN63LgVo43R7pxw=", + "lastModified": 1713612213, + "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "0a53b9957f0b17f1a0036b25198f569969ad43a0", + "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", "type": "github" }, "original": { @@ -238,50 +389,47 @@ "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": [ - "hyprlang" - ], - "nixpkgs": [ - "nixpkgs" - ], - "systems": [ - "systems" - ], - "wlroots": "wlroots", + "hyprlang": "hyprlang", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": "nixpkgs_2", + "systems": "systems_3", "xdph": "xdph" }, "locked": { - "lastModified": 1713351856, - "narHash": "sha256-5lf6GAXWtJanOTgu3jH0tF4aqoqCv8IcP43wp+pemWg=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "e57a2d7ec87ae775828ea8628ef4eeafce8e6e70", - "type": "github" + "lastModified": 1715148714, + "narHash": "sha256-hbNb9iO7W809WLmTa6i7OqtVSR/0B2L4L/Ra860GUO0=", + "ref": "refs/heads/main", + "rev": "70b5e6df70a7eac180e2c8e9c2bce70ff43b45ad", + "revCount": 4634, + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" }, "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/Hyprland" } }, "hyprland-protocols": { "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -293,9 +441,11 @@ "hyprlang": { "inputs": { "nixpkgs": [ + "hyprland", "nixpkgs" ], "systems": [ + "hyprland", "systems" ] }, @@ -315,9 +465,7 @@ }, "hyprpicker": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1713196199, @@ -333,6 +481,31 @@ "type": "github" } }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1715090986, + "narHash": "sha256-FXpQvmS9R7alwZ47XK5UIcAbC9YKSxc0+GOVYqwa0jM=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "94e32ec37e7215b16d5c1b41b1773ff6742e704b", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "langref": { "flake": false, "locked": { @@ -345,13 +518,73 @@ "url": "https://raw.githubusercontent.com/ziglang/zig/54bbc73f8502fe073d385361ddb34a43d12eec39/doc/langref.html.in" } }, + "langref_2": { + "flake": false, + "locked": { + "narHash": "sha256-Kz+m9yeJgAsUfNwGG6ZDqZ3ElLZMeQmVYzgg0EEUzV4=", + "type": "file", + "url": "https://raw.githubusercontent.com/ziglang/zig/a685ab1499d6560c523f0dbce2890dc140671e43/doc/langref.html.in" + }, + "original": { + "type": "file", + "url": "https://raw.githubusercontent.com/ziglang/zig/a685ab1499d6560c523f0dbce2890dc140671e43/doc/langref.html.in" + } + }, "nixpkgs": { "locked": { - "lastModified": 1713248628, - "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1702049175, + "narHash": "sha256-c/q2+tGHbmLgzT3sXyUKVJR98h1CTks2+nkVaoZPRM0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b15508bd65870620f1df5864e8e861dffbc4e428", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1713687659, + "narHash": "sha256-Yd8KuOBpZ0Slau/NxFhMPJI0gBxeax0vq/FD0rqKwuQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -361,18 +594,34 @@ "type": "github" } }, - "nixpkgs-zig-0-12": { + "nixpkgs_3": { "locked": { - "lastModified": 1712247214, - "narHash": "sha256-7PTw86NnE2nCQPf+PPI/kOKwmlbbTqUthYSz/nDnAoc=", - "owner": "vancluever", + "lastModified": 1683014792, + "narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "6726262c930716f601345b2c9d0c42ba069991b8", + "rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", "type": "github" }, "original": { - "owner": "vancluever", - "ref": "vancluever-zig-0-12", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1714906307, + "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -381,30 +630,26 @@ "inputs": { "ageNix": "ageNix", "fenix": "fenix", - "flakeCompat": "flakeCompat", - "flakeUtils": "flakeUtils", "ghostty": "ghostty", "ghosttyModule": "ghosttyModule", "homeManager": "homeManager", "hyprland": "hyprland", - "hyprlang": "hyprlang", "hyprpicker": "hyprpicker", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_4", "simpleMail": "simpleMail", - "systems": "systems_2", "themes": "themes", - "zig": "zig", - "zls": "zls" + "zig": "zig_2", + "zls": "zls_2" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1713285401, - "narHash": "sha256-/FSI+GvcLWR107Lr2ntTo4d+yw2cAFXnJBw/66hPn8c=", + "lastModified": 1714936835, + "narHash": "sha256-M+PpgfRMBfHo8Jb2ou/s3maAZbps0XnuHXQU9Hv9vL0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "d07f0240fd9ced3addb8bdcda6fb9a305cb6499f", + "rev": "c4618fe14d39992fbbb85c2d6cad028a232c13d2", "type": "github" }, "original": { @@ -417,22 +662,18 @@ "simpleMail": { "inputs": { "blobs": "blobs", - "flake-compat": [ - "flakeCompat" - ], + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ], - "utils": [ - "flakeUtils" - ] + "utils": "utils" }, "locked": { - "lastModified": 1713012165, - "narHash": "sha256-z/soXKDnz+w4Nw0LkRaM73YqolhSmIYy6cpg1F2ps8I=", + "lastModified": 1714720456, + "narHash": "sha256-e0WFe1BHqX23ADpGBc4ZRu38Mg+GICCZCqyS6EWCbHc=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "9f6635a0351c190179dc6904545f950108a23dd8", + "rev": "41059fc548088e49e3ddb3a2b4faeb5de018e60f", "type": "gitlab" }, "original": { @@ -471,6 +712,51 @@ "type": "github" } }, + "systems_3": { + "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_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "themes": { "locked": { "lastModified": 1702496684, @@ -486,29 +772,27 @@ "type": "github" } }, - "wlroots": { - "flake": false, + "utils": { + "inputs": { + "systems": "systems_4" + }, "locked": { - "lastModified": 1713124002, - "narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=", - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "owner": "numtide", + "repo": "flake-utils", "type": "github" } }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" @@ -523,11 +807,11 @@ ] }, "locked": { - "lastModified": 1713214484, - "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", + "lastModified": 1714060055, + "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", + "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", "type": "github" }, "original": { @@ -538,22 +822,88 @@ }, "zig": { "inputs": { - "flake-compat": [ - "flakeCompat" - ], - "flake-utils": [ - "flakeUtils" - ], + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1713659103, + "narHash": "sha256-WgWH0HPGsxd7Ov5M4Ug7qjmxbTeG8517xO6hY3198tU=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "a13735003a235a2e4e202b47277129f99bfc9294", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zig-overlay": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "ghostty", + "zls", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1711627798, + "narHash": "sha256-4BUZmgUFrrD5dRZbOUYRRQEDwLX/r7/ErLi+vHfB/+8=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "b01e0b81d1fa489e54362ea0a74f182eaa9a35bb", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zig-overlay_2": { + "inputs": { + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_6", + "nixpkgs": [ + "zls", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715041400, + "narHash": "sha256-yI67g+yU2J/tjytr9cTk51feKjLc+f9+BKE1KjlMNLQ=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "48bcb35d1d59509010af9a3da06af8750ab9593b", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zig_2": { + "inputs": { + "flake-compat": "flake-compat_4", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1713313372, - "narHash": "sha256-JqMBPQKPubOt3ToB0k4q+CTJqfwHfh5iaaFvLOr8GDA=", + "lastModified": 1715127580, + "narHash": "sha256-ea5S5q4oJlubzSq5O2BdYDYDOM5UiO4v3i+nHWvpmbQ=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "5dcefc19b3fb062bb2beb224d72759ca6c25c9cd", + "rev": "ae0fc0bf1d839afe871b507b9a9d8dbc326e6fcf", "type": "github" }, "original": { @@ -564,24 +914,46 @@ }, "zls": { "inputs": { - "flake-utils": [ - "flakeUtils" - ], + "flake-utils": "flake-utils_2", "gitignore": "gitignore", "langref": "langref", "nixpkgs": [ - "nixpkgs" + "ghostty", + "nixpkgs-stable" ], - "zig-overlay": [ - "zig" - ] + "zig-overlay": "zig-overlay" }, "locked": { - "lastModified": 1713110866, - "narHash": "sha256-ddSLREpgBq87dcbSisliSoSNqKl2x7kVf3E/tFumIXw=", + "lastModified": 1711925513, + "narHash": "sha256-DFgsGlEGsxLgtRrh7J+v8x4w+/cJatTCkrZP3/0Gb/o=", "owner": "zigtools", "repo": "zls", - "rev": "172c8f2ef81c95731d7bff6f69f8d497902fe999", + "rev": "4e01c08f558ea07462aaa7b71d2a24f86f47a855", + "type": "github" + }, + "original": { + "owner": "zigtools", + "ref": "master", + "repo": "zls", + "type": "github" + } + }, + "zls_2": { + "inputs": { + "flake-utils": "flake-utils_5", + "gitignore": "gitignore_2", + "langref": "langref_2", + "nixpkgs": [ + "nixpkgs" + ], + "zig-overlay": "zig-overlay_2" + }, + "locked": { + "lastModified": 1715076382, + "narHash": "sha256-PK+ML1V5qI2dTU4a/7108RBHYcsZXamQtO+xt7qmT2E=", + "owner": "zigtools", + "repo": "zls", + "rev": "a660910dcb0a12067983de8e230e2a581e6edbbd", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 708d2fd..9157e0b 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,19 @@ description = "RGBCube's NixOS Configuration Collection"; nixConfig = { - extra-substituters = "https://cache.garnix.io/"; - extra-trusted-public-keys = "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="; + extra-substituters = [ + "https://cache.garnix.io/" + "https://ghostty.cachix.org/" + "https://hyprland.cachix.org/" + "https://nix-community.cachix.org/" + ]; + + extra-trusted-public-keys = [ + "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" + "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; }; inputs = { @@ -25,82 +36,30 @@ simpleMail = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.utils.follows = "flakeUtils"; - inputs.flake-compat.follows = "flakeCompat"; - }; - - hyprland = { - url = "github:hyprwm/Hyprland"; - - inputs.hyprlang.follows = "hyprlang"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.systems.follows = "systems"; - }; - - hyprpicker = { - url = "github:hyprwm/hyprpicker"; - - inputs.nixpkgs.follows = "nixpkgs"; - }; - - ghostty = { - url = "git+ssh://git@github.com/RGBCube/ghostty"; - - inputs.nixpkgs-unstable.follows = "nixpkgs"; - inputs.nixpkgs-stable.follows = "nixpkgs"; - - inputs.zig.follows = "zig"; - inputs.zls.follows = "zig"; - }; - - fenix = { - url = "github:nix-community/fenix"; - inputs.nixpkgs.follows = "nixpkgs"; }; + hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + hyprpicker.url = "github:hyprwm/hyprpicker"; + + ghostty.url = "git+ssh://git@github.com/RGBCube/ghostty"; + ghosttyModule.url = "github:clo4/ghostty-hm-module"; + + fenix.url = "github:nix-community/fenix"; + zig = { url = "github:mitchellh/zig-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flakeUtils"; - inputs.flake-compat.follows = "flakeCompat"; + inputs.nixpkgs.follows = "nixpkgs"; }; zls = { url = "github:zigtools/zls/master"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flakeUtils"; - inputs.zig-overlay.follows = "zig"; + inputs.nixpkgs.follows = "nixpkgs"; }; - ghosttyModule.url = "github:clo4/ghostty-hm-module"; - themes.url = "github:RGBCube/ThemeNix"; - - # I don't use these, but I place them here and make the other - # inputs follow them, so I get much less duplicate code pulled in. - flakeUtils = { - url = "github:numtide/flake-utils"; - - inputs.systems.follows = "systems"; - }; - - flakeCompat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; - - systems.url = "github:nix-systems/default"; - - hyprlang = { - url = "github:hyprwm/hyprlang"; - - inputs.nixpkgs.follows = "nixpkgs"; - inputs.systems.follows = "systems"; - }; }; outputs = {