diff --git a/flake.lock b/flake.lock index 2a15f8fa..9d191248 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1638632700, - "narHash": "sha256-pXmsEC9QQsDoNVq5EGye7CSOh0c2eK4OY7UKs2yHPRk=", + "lastModified": 1641966622, + "narHash": "sha256-Tr/9lRGdC8XEQJB/jPlTLuG0t5Iah/XB7ubbivlXGCQ=", "owner": "accentor", "repo": "flake", - "rev": "4fa6bc15fc1b8f7b77d0a02cf9ea9e5e6366b945", + "rev": "d17c288f86e992b8ab868af72a8201177293c394", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1641926379, - "narHash": "sha256-zvp7ATyqNv9952TwxPcRg3t8BI2HEIrnPdZHRaUOoU0=", + "lastModified": 1641960704, + "narHash": "sha256-eRy6FKNcFBxQV9UdvjSQUoGxFhLnqTDk1RHRtWe0mWQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c41bd1462ade47da23e5df9a82badb19c9185bb0", + "rev": "ba90d4ee66469dced4f2de1749d41e3551558934", "type": "github" }, "original": { @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1641915897, - "narHash": "sha256-C5Vw7B8BKA/kr9tWVYjEdD3AjstXFqoxkkzrOwfQZxk=", + "lastModified": 1641937533, + "narHash": "sha256-IJbR1nNV6v/ruWv9iUFi9/qa8tFLmMhbVjzvhSWCWJY=", "owner": "nix-community", "repo": "home-manager", - "rev": "5209ea0d8c77399ec4987590e9738953f15f8d80", + "rev": "d07df8d9a80a4a34ea881bee7860ae437c5d44a5", "type": "github" }, "original": { @@ -114,8 +114,7 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs", "tetris": "tetris", - "utils": "utils", - "zeroad": "zeroad" + "utils": "utils" } }, "tetris": { @@ -125,11 +124,11 @@ ] }, "locked": { - "lastModified": 1641928399, - "narHash": "sha256-55FwNVfgHReLbaktBx31rtPJFkp+HenD8uLTzV2+GEA=", + "lastModified": 1641933561, + "narHash": "sha256-Xhlr2DkcSHuOizHlkP1GdzJZ+bZaVKamTNKLQoxFUyo=", "owner": "chvp", "repo": "tetris", - "rev": "dd70718cac370d2bc44c1b45848969386282970b", + "rev": "3cc806f9e933c64f133447dc59365e921ecde768", "type": "github" }, "original": { @@ -155,26 +154,6 @@ "repo": "flake-utils-plus", "type": "github" } - }, - "zeroad": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1641927600, - "narHash": "sha256-1zZyiAODX6fwGNylT4/hP/2OphIOctAevl9VPTtbssg=", - "owner": "chvp", - "repo": "0ad-flake", - "rev": "1b93201ef3c24479c3ecd598bb05ad8a3f0faf67", - "type": "github" - }, - "original": { - "owner": "chvp", - "repo": "0ad-flake", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 60ec686f..95904d5e 100644 --- a/flake.nix +++ b/flake.nix @@ -21,13 +21,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; utils.url = "github:gytis-ivaskevicius/flake-utils-plus"; - zeroad = { - url = "github:chvp/0ad-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; - outputs = inputs@{ self, nixpkgs, accentor, agenix, emacs-overlay, home-manager, zeroad, tetris, utils }: + outputs = inputs@{ self, nixpkgs, accentor, agenix, emacs-overlay, home-manager, tetris, utils }: let customPackages = callPackage: { jdtls = callPackage ./packages/jdtls { }; @@ -41,7 +37,6 @@ overlaysBuilder = _: [ emacs-overlay.overlay (self: super: customPackages self.callPackage) - (self: super: { zeroad = zeroad.packages.x86_64-linux.zeroad; }) (self: super: { tetris = tetris.packages.x86_64-linux.tetris; }) ]; };