From 0198f26ecd4a92ffef77748d3badebf6ea7a10ee Mon Sep 17 00:00:00 2001 From: zackartz Date: Fri, 21 Jun 2024 11:14:31 -0400 Subject: [PATCH] 758 current 2024-06-21 11:14:29 24.11.20240621.1c0bec2 6.9.5-zen1 * --- flake.lock | 166 ++++++++++++----------------------------------------- flake.nix | 19 +++--- 2 files changed, 46 insertions(+), 139 deletions(-) diff --git a/flake.lock b/flake.lock index 172bade..c5719f5 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1715703984, - "narHash": "sha256-0BZkMui6aCqswMCouvp0G90tAxDOxVnxTvG6TDZsDaI=", + "lastModified": 1718921313, + "narHash": "sha256-TFJah1RW5qnYW7kajjAFPAS5j/0q0R3vz9zPjrRA0Mc=", "owner": "Aylur", "repo": "ags", - "rev": "11150225e62462bcd431d1e55185e810190a730a", + "rev": "646d5ad073ff7f8b1d50cfbd40f5b8a250fcd59d", "type": "github" }, "original": { @@ -333,7 +333,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_6" + "flake-utils": "flake-utils_5" }, "locked": { "lastModified": 1715533576, @@ -388,25 +388,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_10" - }, - "locked": { - "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_5": { - "inputs": { - "systems": "systems_12" + "systems": "systems_11" }, "locked": { "lastModified": 1705309234, @@ -422,9 +404,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_14" + "systems": "systems_13" }, "locked": { "lastModified": 1694529238, @@ -440,9 +422,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { - "systems": "systems_15" + "systems": "systems_14" }, "locked": { "lastModified": 1685518550, @@ -458,21 +440,6 @@ "type": "github" } }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_3", @@ -487,11 +454,11 @@ ] }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1718879355, + "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a", "type": "github" }, "original": { @@ -669,11 +636,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1718835324, - "narHash": "sha256-U5eKTPAXppfSIqKqMIgbyuTBy1gr2seSOUl8sUSR8FE=", + "lastModified": 1718978185, + "narHash": "sha256-J5DjUiFsl+3Yb3xKUZLx2uORMpYlcy87SElModRrz40=", "ref": "refs/heads/main", - "rev": "fabc30df52ab5d2c369fc8acd4ff909a6ba3b8ac", - "revCount": 4870, + "rev": "19081bb66637f3a6302a25a6a10cb86cc9bbb505", + "revCount": 4871, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -865,48 +832,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1714955862, - "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", - "ref": "refs/tags/2.90-beta.1", - "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", - "revCount": 15501, - "type": "git", - "url": "https://git.lix.systems/lix-project/lix" - }, - "original": { - "ref": "refs/tags/2.90-beta.1", - "type": "git", - "url": "https://git.lix.systems/lix-project/lix" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils_4", - "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1718778751, - "narHash": "sha256-DdcMvX9r29uHMlz7P1Shgs5xZw9WkZ4ObMGYzwROAiw=", - "ref": "refs/heads/main", - "rev": "909e593ae9f5fe338ab19b4ed9d52bb0ea09bad8", - "revCount": 90, - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" - }, - "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" - } - }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat_2", @@ -917,11 +842,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1718775905, - "narHash": "sha256-1o1A/esIIRAkXfd20TmYU6jJTF3YHUlcAUNezQnizM4=", + "lastModified": 1718935491, + "narHash": "sha256-Dk+ZTVu3CuVv4UPbif3GmR7eT3zAE/mQ+3UUvFHknKE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "42261b7220526fb7fd72912ab3e647019e1d1148", + "rev": "cc2d148e283e05cce751c5cc50ce38bbc0589f61", "type": "github" }, "original": { @@ -933,11 +858,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1718749922, - "narHash": "sha256-DAx1WRYBHL9AkPKrJP0aBEtvoH3VgAXJTfALRlkD8ds=", + "lastModified": 1718890629, + "narHash": "sha256-TLJ8xTHKgnbsMnlmfQ7eF5+aafjo5PlFQFF3mkrIsBs=", "owner": "neovim", "repo": "neovim", - "rev": "a2d510e1015d57f28ab20c5d2897527cae15b9c4", + "rev": "0e3e1e6b6d8370f1fcc9887d5cb931b131450a1c", "type": "github" }, "original": { @@ -984,11 +909,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1718714799, + "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", "type": "github" }, "original": { @@ -1092,11 +1017,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1718606988, - "narHash": "sha256-pmjP5ePc1jz+Okona3HxD7AYT0wbrCwm9bXAlj08nDM=", + "lastModified": 1718870667, + "narHash": "sha256-jab3Kpc8O1z3qxwVsCMHL4+18n5Wy/HHKyu1fcsF7gs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "38d3352a65ac9d621b0cd3074d3bef27199ff78f", + "rev": "9b10b8f00cb5494795e5f51b39210fed4d2b0748", "type": "github" }, "original": { @@ -1108,11 +1033,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1718816291, - "narHash": "sha256-wqQUoA6AW3gifOfEeBQVZ3ulropw0iXwmZRT0Ef2Kls=", + "lastModified": 1718954653, + "narHash": "sha256-uIZlOpCIi/GZ3xrkA87CAHqbTvsTbVQV1JjnP33slxs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5b75ddc9a3e93465bc939dcbacb281879b64b9ed", + "rev": "1c0bec249943cd3e03f876554b8af7d1e32a09e1", "type": "github" }, "original": { @@ -1207,7 +1132,7 @@ "resume": { "inputs": { "nixpkgs": "nixpkgs_8", - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1717172081, @@ -1230,7 +1155,7 @@ "nixpkgs" ], "rust-overlay": "rust-overlay_3", - "systems": "systems_13" + "systems": "systems_12" }, "locked": { "lastModified": 1718716836, @@ -1258,8 +1183,6 @@ "hyprland": "hyprland", "kb-gui": "kb-gui", "lanzaboote": "lanzaboote", - "lix": "lix", - "lix-module": "lix-module", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_7", @@ -1267,7 +1190,7 @@ "rio-term": "rio-term", "snowfall-lib": "snowfall-lib", "spicetify-nix": "spicetify-nix", - "systems": "systems_16", + "systems": "systems_15", "waybar": "waybar" } }, @@ -1317,7 +1240,7 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_9" }, "locked": { @@ -1358,7 +1281,7 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] @@ -1423,6 +1346,7 @@ } }, "systems_12": { + "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1438,7 +1362,6 @@ } }, "systems_13": { - "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1483,21 +1406,6 @@ "type": "github" } }, - "systems_16": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1689347949, diff --git a/flake.nix b/flake.nix index 3f7f2ff..f9d5d04 100644 --- a/flake.nix +++ b/flake.nix @@ -76,15 +76,15 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - lix = { - url = "git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; - flake = false; - }; - lix-module = { - url = "git+https://git.lix.systems/lix-project/nixos-module"; - inputs.lix.follows = "lix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # lix = { + # url = "git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; + # flake = false; + # }; + # lix-module = { + # url = "git+https://git.lix.systems/lix-project/nixos-module"; + # inputs.lix.follows = "lix"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; systems.url = "github:nix-systems/default"; spicetify-nix = { @@ -123,7 +123,6 @@ catppuccin.nixosModules.catppuccin blog.nixosModule agenix.nixosModules.default - lix-module.nixosModules.default ]; }; }