diff --git a/flake.lock b/flake.lock index 25e29f099163927ac676af42640ff4370f7fb36b..29aacec8d55f6034434c58fb2d1667291ec9e6d8 100644 --- a/flake.lock +++ b/flake.lock @@ -25,7 +25,9 @@ } }, "bennet": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1720757073, @@ -43,7 +45,9 @@ } }, "blog": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1740539434, @@ -61,7 +65,9 @@ } }, "cfg-playground": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1729196682, @@ -95,63 +101,9 @@ "repo": "flake-utils", "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_6" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "foundry": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1726638033, @@ -169,8 +121,12 @@ } }, "git-age": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5" + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1699932777, @@ -188,7 +144,9 @@ } }, "git-pr": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1724120640, @@ -206,8 +164,12 @@ } }, "golink": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_7" + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1733941744, @@ -225,7 +187,7 @@ } }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1734344598, @@ -242,7 +204,7 @@ } }, "jolheiser": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1730336541, @@ -274,135 +236,43 @@ } }, "nixpkgs": { "locked": { - "lastModified": 1741310760, - "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", + "lastModified": 1726447378, + "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "de0fe301211c267807afd11b12613f5511ff7433", + "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1741481966, - "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5c2eeaafda070b7c357b839f13bb53c1d4334001", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { + "nixpkgs_2": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", - "owner": "nixos", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_13": { - "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", - "type": "github" - }, - "original": { - "id": "nixpkgs", "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_14": { - "locked": { - "lastModified": 1741310760, - "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "de0fe301211c267807afd11b12613f5511ff7433", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_15": { - "locked": { - "lastModified": 1741481966, - "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5c2eeaafda070b7c357b839f13bb53c1d4334001", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1741481966, - "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5c2eeaafda070b7c357b839f13bb53c1d4334001", - "type": "github" - }, - "original": { - "owner": "nixos", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1741379970, - "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -414,102 +284,43 @@ } }, "nixpkgs_4": { "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", + "lastModified": 1736798957, + "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", + "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_5": { "locked": { - "lastModified": 1741481966, - "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5c2eeaafda070b7c357b839f13bb53c1d4334001", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1741310760, - "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "de0fe301211c267807afd11b12613f5511ff7433", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_7": { - "locked": { - "lastModified": 1741310760, - "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "de0fe301211c267807afd11b12613f5511ff7433", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixpkgs-unstable", - "type": "indirect" - } - }, - "nixpkgs_8": { - "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", - "type": "github" - }, - "original": { - "owner": "NixOS", "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1729880355, - "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" + "type": "indirect" } }, "resume": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_11" + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1697473034, @@ -531,6 +342,7 @@ "agenix": "agenix", "bennet": "bennet", "blog": "blog", "cfg-playground": "cfg-playground", + "flake-utils": "flake-utils", "foundry": "foundry", "git-age": "git-age", "git-pr": "git-pr", @@ -538,7 +350,7 @@ "golink": "golink", "home-manager": "home-manager", "jolheiser": "jolheiser", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_4", "resume": "resume", "tailproxy": "tailproxy", "tclip": "tclip", @@ -576,69 +388,11 @@ "repo": "default", "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" - } - }, - "systems_4": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tailproxy": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1729968274, @@ -740,8 +494,10 @@ } }, "tclip": { "inputs": { - "nixpkgs": "nixpkgs_13", - "utils": "utils" + "nixpkgs": "nixpkgs_5", + "utils": [ + "flake-utils" + ] }, "locked": { "lastModified": 1733922802, @@ -759,7 +515,9 @@ } }, "ugit": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": [ + "nixpkgs" + ], "tailwind-ctp": "tailwind-ctp", "tailwind-ctp-lsp": "tailwind-ctp-lsp" }, @@ -777,28 +535,14 @@ "type": "git", "url": "https://git.jolheiser.com/ugit.git" } }, - "utils": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "website": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_15", + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ], "tailwind-ctp": "tailwind-ctp_2", "tailwind-ctp-lsp": "tailwind-ctp-lsp_2" }, diff --git a/flake.nix b/flake.nix index eacccdad8644ee72c73fe730739f5b19df6dd356..c4dbfe596e0e816199a37b1bce89c7e110bb247d 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; jolheiser.url = "git+https://git.jolheiser.com/nixpkgs.git"; + flake-utils.url = "github:numtide/flake-utils"; # Only expressed here to use for followers agenix = { url = "github:ryantm/agenix"; inputs = { @@ -12,19 +13,68 @@ darwin.follows = ""; home-manager.follows = ""; }; }; - website.url = "git+https://git.jolheiser.com/jolheiser.com.git"; - resume.url = "git+https://git.jolheiser.com/resume.git"; - blog.url = "git+https://git.jolheiser.com/blog.git"; - bennet.url = "git+https://git.jolheiser.com/bennet.git"; - git-age.url = "git+https://git.jolheiser.com/git-age.git"; - cfg-playground.url = "git+https://git.jolheiser.com/cfg-playground.git"; - ugit.url = "git+https://git.jolheiser.com/ugit.git"; - git-pr.url = "git+https://git.jolheiser.com/git-pr-nix.git"; + website = { + url = "git+https://git.jolheiser.com/jolheiser.com.git"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; + resume = { + url = "git+https://git.jolheiser.com/resume.git"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; + blog = { + url = "git+https://git.jolheiser.com/blog.git"; + inputs = { + nixpkgs.follows = "nixpkgs"; + }; + }; + bennet = { + url = "git+https://git.jolheiser.com/bennet.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + git-age = { + url = "git+https://git.jolheiser.com/git-age.git"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; + cfg-playground = { + url = "git+https://git.jolheiser.com/cfg-playground.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + ugit = { + url = "git+https://git.jolheiser.com/ugit.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + git-pr = { + url = "git+https://git.jolheiser.com/git-pr-nix.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Other flakes - golink.url = "github:tailscale/golink"; - tclip.url = "github:tailscale-dev/tclip"; + golink = { + url = "github:tailscale/golink"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; + tclip = { + url = "github:tailscale-dev/tclip"; + inputs = { + utils.follows = "flake-utils"; + }; + }; foundry.url = "github:reckenrode/nix-foundryvtt"; - tailproxy.url = "git+https://git.jolheiser.com/tailproxy.git"; + tailproxy = { + url = "git+https://git.jolheiser.com/tailproxy.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs =