From 302e0f0ef4894e62f55b673dcc7818362782360b Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Tue, 19 Nov 2024 15:44:49 +0530 Subject: [PATCH] feat: Remove subflakes and integrate them into main flake --- flake.lock | 62 +++---------------------------------- flake.nix | 10 +++--- flakes/flake.lock | 78 ----------------------------------------------- flakes/flake.nix | 18 ----------- overlays.nix | 40 +++--------------------- 5 files changed, 13 insertions(+), 195 deletions(-) delete mode 100644 flakes/flake.lock delete mode 100644 flakes/flake.nix diff --git a/flake.lock b/flake.lock index 309ee406..0dbe19fc 100644 --- a/flake.lock +++ b/flake.lock @@ -270,11 +270,11 @@ "csshacks": { "flake": false, "locked": { - "lastModified": 1727838612, - "narHash": "sha256-CkdHaKZD5HYQ9AlZ1+WmM9SN8C+Z1fJQ1wXgNK8RN2k=", + "lastModified": 1731735181, + "narHash": "sha256-TNmMIc+HjYxC55GQrRgRIc8iZQugtFhiQ2xmugvRKsE=", "owner": "MrOtherGuy", "repo": "firefox-csshacks", - "rev": "69e53df519a6254083970d3bc458ed1c8119ebc6", + "rev": "14f2c867e741668270df1b83fd7e4e89c2684186", "type": "github" }, "original": { @@ -907,24 +907,6 @@ "type": "github" } }, - "flake-utils_16": { - "inputs": { - "systems": "systems_17" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_2": { "inputs": { "systems": "systems_3" @@ -2787,6 +2769,7 @@ "anyrun-nixos-options": "anyrun-nixos-options", "anyrun-rink": "anyrun-rink", "cachix-deploy-flake": "cachix-deploy-flake", + "csshacks": "csshacks", "deploy-rs": "deploy-rs", "flake-utils": "flake-utils_3", "home-manager": "home-manager", @@ -2808,7 +2791,6 @@ "openapi-tui": "openapi-tui", "rust-overlay": "rust-overlay_6", "sops-nix": "sops-nix", - "subflakes": "subflakes", "zjstatus": "zjstatus" } }, @@ -2983,25 +2965,6 @@ "type": "github" } }, - "subflakes": { - "inputs": { - "csshacks": "csshacks", - "flake-utils": "flake-utils_15", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-rsDjId8kxzZD6XmwljiEuGggvxheXkltJ1keQ93HxoQ=", - "path": "./flakes", - "type": "path" - }, - "original": { - "path": "./flakes", - "type": "path" - } - }, "systems": { "locked": { "lastModified": 1689347949, @@ -3122,21 +3085,6 @@ "type": "github" } }, - "systems_17": { - "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, @@ -3416,7 +3364,7 @@ "zjstatus": { "inputs": { "crane": "crane_5", - "flake-utils": "flake-utils_16", + "flake-utils": "flake-utils_15", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index 5c438545..8de8c7cf 100644 --- a/flake.nix +++ b/flake.nix @@ -62,12 +62,6 @@ url = "github:dj95/zjstatus"; inputs.nixpkgs.follows = "nixpkgs"; }; - subflakes = { - # TODO: Will eventualy move all the non-flake fetchFromGitHub urls to this flake - # As inputs for the flake that way I don't have to update the hashes manually - url = "path:./flakes"; - inputs.nixpkgs.follows = "nixpkgs"; - }; rust-overlay = { url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; @@ -100,6 +94,10 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + csshacks = { + url = "github:MrOtherGuy/firefox-csshacks"; + flake = false; + }; }; outputs = { diff --git a/flakes/flake.lock b/flakes/flake.lock deleted file mode 100644 index cd7ff07f..00000000 --- a/flakes/flake.lock +++ /dev/null @@ -1,78 +0,0 @@ -{ - "nodes": { - "csshacks": { - "flake": false, - "locked": { - "lastModified": 1727838612, - "narHash": "sha256-CkdHaKZD5HYQ9AlZ1+WmM9SN8C+Z1fJQ1wXgNK8RN2k=", - "owner": "MrOtherGuy", - "repo": "firefox-csshacks", - "rev": "69e53df519a6254083970d3bc458ed1c8119ebc6", - "type": "github" - }, - "original": { - "owner": "MrOtherGuy", - "repo": "firefox-csshacks", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "csshacks": "csshacks", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flakes/flake.nix b/flakes/flake.nix deleted file mode 100644 index aba757b3..00000000 --- a/flakes/flake.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - description = "Get all overlays as subflakes"; - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; - csshacks.url = "github:MrOtherGuy/firefox-csshacks"; - csshacks.flake = false; - }; - outputs = { - nixpkgs, - flake-utils, - ... - } @ inputs: let - overlay = final: prev: { - csshacks = inputs.csshacks; - }; - in {overlays.default = overlay;}; -} diff --git a/overlays.nix b/overlays.nix index 5c8d613a..416cce73 100644 --- a/overlays.nix +++ b/overlays.nix @@ -219,43 +219,10 @@ final.doctest ]; }); - # fprintd = prev.fprintd.overrideAttrs (oldAttrs: rec { - # version = "1.94.3"; - # src = final.fetchFromGitLab { - # domain = "gitlab.freedesktop.org"; - # owner = "libfprint"; - # repo = "fprintd"; - # rev = "v${version}"; - # sha256 = "sha256-shH+ctQAx4fpTMWTmo3wB45ZS38Jf8RknryPabfZ6QE="; - # }; - # patches = []; - # mesonCheckFlags = [ - # "--no-suite" - # "fprintd:PAM" - # "--no-suite" - # "fprintd:TestPamFprintd" - # ]; - # }); }; - # hyprwm = final: prev: { - # # hyprland = prev.hyprland.overrideAttrs (oldAttrs: { - # # src = prev.fetchFromGitHub { - # # owner = "hyprwm"; - # # repo = "hyprland"; - # # rev = "76610d9fb0ba5a2d495a963773c38b717d76776f"; - # # sha256 = "sha256-ghYa1VeYt90YFfqObVY87yESVEaO4RIGmQ8KsYX+6eY="; - # # }; - # # buildInputs = oldAttrs.buildInputs ++ [final.pkgs.wlroots.dev]; - # # }); - # }; - # _1password = final: prev: { - # _1password-gui = prev._1password-gui.override { - # polkitPolicyOwners = ["servius"]; - # }; - # # _1password = prev._1password.override { - # # polkitPolicyOwners = ["servius"]; - # # }; - # }; + csshacks = final: prev: { + csshacks = inputs.csshacks; + }; in [ inputs.subflakes.overlays.default libfprint @@ -274,4 +241,5 @@ in [ # catppuccin inputs.rust-overlay.overlays.default #inputs.hyprland.overlays.default + csshacks ]