From 4dc8f7d2a571c62ab6c8752a01ffe91cabe6670d Mon Sep 17 00:00:00 2001 From: smayzy Date: Tue, 15 Jul 2025 23:04:46 +0200 Subject: [PATCH] update and add overlay for broken openjdk8 --- flake.lock | 68 +++++++++++++---------------------------- flake.nix | 5 +-- hosts/common/common.nix | 4 ++- overlays/default.nix | 3 ++ overlays/fix-jdk8.nix | 3 ++ 5 files changed, 34 insertions(+), 49 deletions(-) create mode 100644 overlays/default.nix create mode 100644 overlays/fix-jdk8.nix diff --git a/flake.lock b/flake.lock index 717b975..cef89ea 100644 --- a/flake.lock +++ b/flake.lock @@ -85,7 +85,10 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "nvf", + "nixpkgs" + ] }, "locked": { "lastModified": 1749398372, @@ -124,7 +127,10 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": [ + "nvf", + "systems" + ] }, "locked": { "lastModified": 1731533236, @@ -180,11 +186,11 @@ ] }, "locked": { - "lastModified": 1752062782, - "narHash": "sha256-Dod77HcIByOyfGLEJOgRxg2Fmk2Y5lVgMEcN/xVEt/8=", + "lastModified": 1752603129, + "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", "owner": "nix-community", "repo": "home-manager", - "rev": "bec8ff39811568eb7c8c8d1e2a1a476326748f51", + "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", "type": "github" }, "original": { @@ -226,11 +232,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751984180, - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", + "lastModified": 1752480373, + "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", + "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", "type": "github" }, "original": { @@ -240,21 +246,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1750215678, @@ -302,14 +293,14 @@ "flake-utils": "flake-utils", "mnw": "mnw", "nixpkgs": "nixpkgs_2", - "systems": "systems_2" + "systems": "systems" }, "locked": { - "lastModified": 1752075018, - "narHash": "sha256-RJnQJooI1Jc7U4gvEKErbiIcgqGtEeUWddvxIjQfP58=", + "lastModified": 1752417534, + "narHash": "sha256-06CASFKAxc81QycTSsTw26EJOKi6VgMie6wp0ZUnvqE=", "owner": "notashelf", "repo": "nvf", - "rev": "9aa90885640d19b1375e6dec75c6cb125ac0f0c2", + "rev": "5e2df2dd5b83c07bad3d5e17dc056b52541ecb9c", "type": "github" }, "original": { @@ -340,7 +331,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_3", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -348,11 +339,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1752073281, - "narHash": "sha256-SreB7pgUb8nOTDA9K2GFKiIam6MN2oJ5du/KVgvsRaU=", + "lastModified": 1752598315, + "narHash": "sha256-pSm1BqcA6wido27VeNAi86SjpurpL84+ciAXQmrtSzk=", "owner": "danth", "repo": "stylix", - "rev": "7b9a528d6ce61feef42ef3ede42792438e59e205", + "rev": "45749a791efd692c04dee4702b86a31535ed30d2", "type": "github" }, "original": { @@ -391,21 +382,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 86052be..2174cc9 100644 --- a/flake.nix +++ b/flake.nix @@ -21,12 +21,13 @@ outputs = { self, nixpkgs, nix-flatpak, nvf, ... } @ inputs: let system = "x86_64-linux"; + overlays = builtins.attrValues (import ./overlays); in { nixosConfigurations = { desktop1 = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs system; }; + specialArgs = { inherit inputs system overlays; }; modules = [ ./hosts/desktop1/configuration.nix nix-flatpak.nixosModules.nix-flatpak @@ -35,7 +36,7 @@ ]; }; laptop1 = nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs system; }; + specialArgs = { inherit inputs system overlays; }; modules = [ ./hosts/laptop1/configuration.nix nix-flatpak.nixosModules.nix-flatpak diff --git a/hosts/common/common.nix b/hosts/common/common.nix index 5c61171..3eabdf9 100644 --- a/hosts/common/common.nix +++ b/hosts/common/common.nix @@ -1,4 +1,4 @@ -{ inputs, config, pkgs, lib, ... }: +{ inputs, config, pkgs, lib, overlays, ... }: { imports = @@ -7,6 +7,8 @@ ../../modules/nix/default.nix ]; + nixpkgs.overlays = overlays; + users.users.smayzy = { isNormalUser = true; description = "smayzy"; diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..8e4f16c --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,3 @@ +{ + fix-jdk8 = import ./fix-jdk8.nix; +} diff --git a/overlays/fix-jdk8.nix b/overlays/fix-jdk8.nix new file mode 100644 index 0000000..c9c5803 --- /dev/null +++ b/overlays/fix-jdk8.nix @@ -0,0 +1,3 @@ +final: prev: { + jdk8 = final.openjdk8-bootstrap; +}