From e83f4ded85e148e458bc86a5cf5ed85ca633b5b0 Mon Sep 17 00:00:00 2001 From: zackartz Date: Thu, 23 May 2024 23:43:27 -0400 Subject: [PATCH] 678 current 2024-05-23 23:43:18 24.11.20240523.2ee89d5 6.9.1-zen1 * --- flake.lock | 225 ++++++++++++++----------- flake.nix | 59 +------ systems/x86_64-linux/earth/default.nix | 2 + 3 files changed, 128 insertions(+), 158 deletions(-) diff --git a/flake.lock b/flake.lock index dde6a90..3885644 100644 --- a/flake.lock +++ b/flake.lock @@ -163,6 +163,22 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1650374568, @@ -178,7 +194,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -244,11 +260,11 @@ ] }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -316,7 +332,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_6" + "flake-utils": "flake-utils_5" }, "locked": { "lastModified": 1715533576, @@ -371,25 +387,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_9" - }, - "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_11" + "systems": "systems_10" }, "locked": { "lastModified": 1705309234, @@ -405,9 +403,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_13" + "systems": "systems_12" }, "locked": { "lastModified": 1694529238, @@ -423,9 +421,9 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_6": { "inputs": { - "systems": "systems_14" + "systems": "systems_13" }, "locked": { "lastModified": 1685518550, @@ -463,6 +461,28 @@ "type": "github" } }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "neovim-nightly-overlay", + "pre-commit-hooks", + "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" + } + }, "hercules-ci-effects": { "inputs": { "flake-parts": "flake-parts_4", @@ -608,11 +628,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716480279, - "narHash": "sha256-iZmMWUnWMY+bn+kGKdsXL4y1zs9hViSRwMii01j7Wok=", + "lastModified": 1716491954, + "narHash": "sha256-Qf1mEPacXhhM5KFm7HG2F/UBfzkjSBK57gKquA5TAVY=", "ref": "refs/heads/main", - "rev": "255272ea18a1bd899168b2d2063b6f153edda919", - "revCount": 4731, + "rev": "4e42107d25dc47ee94da282db233f85f1e4c6bd0", + "revCount": 4733, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -775,44 +795,21 @@ "type": "github" } }, - "neovim-flake": { - "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "dir": "contrib", - "lastModified": 1715815279, - "narHash": "sha256-Pf7ZlqPnr195NZb5ADzMVsXurPMjRZ+JMXf6JxvXArE=", - "owner": "neovim", - "repo": "neovim", - "rev": "9ca81b025990911c2a0dbda92af39ba84983bac3", - "type": "github" - }, - "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_3", "hercules-ci-effects": "hercules-ci-effects", - "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_6" + "neovim-src": "neovim-src", + "nixpkgs": "nixpkgs_6", + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1715817852, - "narHash": "sha256-UH5o7hT72oAavJTG2NxlpMyQe3BQMniQAsgTugWtlc4=", + "lastModified": 1716503225, + "narHash": "sha256-5EG1FkoRgs1SHAS+NdEcaUDnp5jXhq+MtLoM2n2RyMc=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "7b5ca2486bba58cac80b9229209239740b67cf90", + "rev": "6045b353d451becbdc8764a2ba62a57242909e2b", "type": "github" }, "original": { @@ -821,6 +818,22 @@ "type": "github" } }, + "neovim-src": { + "flake": false, + "locked": { + "lastModified": 1716501420, + "narHash": "sha256-VO9RCUNwiU627oVjR5gfsyz8z6VHkuW2VFT53xth1ig=", + "owner": "neovim", + "repo": "neovim", + "rev": "e7859d2ad504a3e3cae1d540d5fd4f9b560d154a", + "type": "github" + }, + "original": { + "owner": "neovim", + "repo": "neovim", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1712450863, @@ -967,27 +980,27 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1715774670, - "narHash": "sha256-iJYnKMtLi5u6hZhJm94cRNSDG5Rz6ZzIkGbhPFtDRm0=", + "lastModified": 1716451822, + "narHash": "sha256-0lT5RVelqN+dgXWWneXvV5ufSksW0r0TDQi8O6U2+o8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3fcfcfabd01b947a1e4f36622bbffa3985bdac6", + "rev": "3305b2b25e4ae4baee872346eae133cf6f611783", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "3305b2b25e4ae4baee872346eae133cf6f611783", "type": "github" } }, "nixpkgs_7": { "locked": { - "lastModified": 1716438273, - "narHash": "sha256-qgmg3oXm+PYWnO06g2aetPOAKvQkgC63NjNh0m9ZHNI=", + "lastModified": 1716479278, + "narHash": "sha256-2eh7rYxQOntkUjFXtlPH7lBuUDd4isu/YHRjNJW7u1Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3efa0a2a30e551229188707569e85495e73090f3", + "rev": "2ee89d5a0167a8aa0f2a5615d2b8aefb1f299cd4", "type": "github" }, "original": { @@ -1064,6 +1077,33 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_3", + "gitignore": "gitignore_2", + "nixpkgs": [ + "neovim-nightly-overlay", + "nixpkgs" + ], + "nixpkgs-stable": [ + "neovim-nightly-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1098,7 +1138,7 @@ "resume": { "inputs": { "nixpkgs": "nixpkgs_8", - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1715054505, @@ -1121,14 +1161,14 @@ "nixpkgs" ], "rust-overlay": "rust-overlay_3", - "systems": "systems_12" + "systems": "systems_11" }, "locked": { - "lastModified": 1716476872, - "narHash": "sha256-tImPGwMbeiKOL3G0KlquxJUFK2lmAfEJRUkgmPaiDp0=", + "lastModified": 1716504305, + "narHash": "sha256-4tvQpgnXUpBZ36Wqp8m9KN6eH3565zL7molmbkd5GIM=", "owner": "raphamorim", "repo": "rio", - "rev": "d8c8cf8ce83b4e88f4928aed12b2aa17a7c3dc61", + "rev": "d807675cf402495014d94709470d38f6f90a9ad8", "type": "github" }, "original": { @@ -1158,7 +1198,7 @@ "rio-term": "rio-term", "snowfall-lib": "snowfall-lib", "spicetify-nix": "spicetify-nix", - "systems": "systems_15", + "systems": "systems_14", "waybar": "waybar" } }, @@ -1208,7 +1248,7 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": "nixpkgs_9" }, "locked": { @@ -1227,18 +1267,18 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1716456697, - "narHash": "sha256-05gmA4Kc0nISkRGpWRvVWk+rgukNosnHdEfwObPsRJM=", + "lastModified": 1716511874, + "narHash": "sha256-h1cj+qotlb+UJRaOGemtBFst8V0OFwjml4jDp2f7V2g=", "owner": "snowfallorg", "repo": "lib", - "rev": "34c1697a5346b6e8d6cd123295ae07399f47634d", + "rev": "439d463a8af79082bf51f8ba76b3db3da1aa2193", "type": "github" }, "original": { @@ -1249,7 +1289,7 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] @@ -1299,6 +1339,7 @@ } }, "systems_11": { + "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1314,7 +1355,6 @@ } }, "systems_12": { - "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1359,21 +1399,6 @@ "type": "github" } }, - "systems_15": { - "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": 1681028828, @@ -1496,17 +1521,17 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1716362227, - "narHash": "sha256-o+OVh6c6CW6NNidCbRfdp+9JpERyzrAB/2Eaza0Q6r4=", + "lastModified": 1716498229, + "narHash": "sha256-AlZvxD8UnagX8iz2O/cyruJqH8HDRJ9oD28JM/Mf36E=", "owner": "Alexays", "repo": "Waybar", - "rev": "35a9ca476dc2595c28fd1d3a34cc26be4f14077a", + "rev": "10664922c93b890f059ffe189d05ed7e82baed50", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c276e9a..49e872a 100644 --- a/flake.nix +++ b/flake.nix @@ -94,7 +94,7 @@ inherit inputs; src = ./.; - overlays = [inputs.neovim-nightly-overlay.overlay]; + overlays = [inputs.neovim-nightly-overlay.overlays.default]; snowfall = { namespace = "custom"; @@ -121,61 +121,4 @@ agenix.nixosModules.default ]; }; - - # outputs = { - # self, - # nixpkgs, - # nixpkgs_stable, - # systems, - # ... - # } @ inputs: let - # eachSystem = f: - # nixpkgs.lib.genAttrs (import systems) ( - # system: - # f nixpkgs.legacyPackages.${system} - # ); - # in { - # nixosConfigurations.pluto = nixpkgs_stable.lib.nixosSystem { - # specialArgs = {inherit inputs;}; - # modules = [ - # ./hosts/pluto/configuration.nix - # inputs.home-manager_stable.nixosModules.default - # inputs.blog.nixosModule - # inputs.agenix.nixosModules.default - # ]; - # }; - # - # nixosConfigurations.earth = nixpkgs.lib.nixosSystem { - # specialArgs = {inherit inputs;}; - # modules = [ - # ./hosts/earth/configuration.nix - # inputs.lanzaboote.nixosModules.lanzaboote - # inputs.home-manager.nixosModules.default - # inputs.catppuccin.nixosModules.catppuccin - # inputs.agenix.nixosModules.default - # ]; - # }; - # - # nixosConfigurations.live = nixpkgs.lib.nixosSystem { - # system = "x86_64-linux"; - # specialArgs = {inherit inputs;}; - # modules = [ - # "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix" - # "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" - # # ./hosts/live/configuration.nix - # ]; - # }; - # - # devShells = eachSystem (pkgs: { - # default = pkgs.mkShell { - # buildInputs = [ - # pkgs.nixd - # pkgs.alejandra - # pkgs.stylua - # pkgs.lua-language-server - # pkgs.luajitPackages.lua-lsp - # ]; - # }; - # }); - # }; } diff --git a/systems/x86_64-linux/earth/default.nix b/systems/x86_64-linux/earth/default.nix index a4effeb..24a24a1 100644 --- a/systems/x86_64-linux/earth/default.nix +++ b/systems/x86_64-linux/earth/default.nix @@ -56,6 +56,8 @@ # PasswordAuthentication = true; # }; + time.timeZone = "America/Detroit"; + environment.systemPackages = [ pkgs.BeatSaberModManager pkgs.sbctl