diff --git a/flake.lock b/flake.lock index d55bd20aaa37b2420ae0a896578f3e2b6c976cbc..875bc7ca4b247ad240d324550ee8e6c4b0871c33 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ], "systems": "systems" }, "locked": { - "lastModified": 1747575206, - "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "4835b1dc898959d8547a871ef484930675cb47f1", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "inputs": { "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -130,15 +130,33 @@ "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": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -154,11 +172,11 @@ "git-hooks": "git-hooks", "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1744481095, - "narHash": "sha256-uQdjHsZ9Brb+6wjuUm84EK3YfUTxF39xG40yJ8IrBp8=", + "lastModified": 1744397145, + "narHash": "sha256-z0lNSzTSZ/4FY2hT69BiPJXrgXasQ0z7V9k33wCURUQ=", "ref": "refs/heads/main", - "rev": "4499a4b1aa0b7487dcc7f399f2d77691ee1ecc5d", - "revCount": 19, + "rev": "09d9ac8c345fd6b65c964c8aa1963fd9fa47f066", + "revCount": 12, "type": "git", "url": "https://code.winston.sh/winston/forge-lines.git" }, @@ -172,11 +190,11 @@ "inputs": { "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1748450994, - "narHash": "sha256-BWdJ+3lPmK99kjWfBlppKSRIH0sBlT1fpUkSvlgmvoA=", + "lastModified": 1726638033, + "narHash": "sha256-+hcgXKG5t/9wibv+8T9WASWItBAWb0tsmcZXH+VIYdw=", "owner": "reckenrode", "repo": "nix-foundryvtt", - "rev": "d5fe29ab69176aa0c7727fa7c57889a2aa577355", + "rev": "bf07f9dd916a97a091f8ab83358c2f295bea9ec9", "type": "github" }, "original": { @@ -234,11 +252,11 @@ "inputs": { "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1743732004, - "narHash": "sha256-R5nguJT1Z03GU/f+LVCDRyd5sBuAGwIczv8PCHgsl+4=", + "lastModified": 1742931784, + "narHash": "sha256-PmIcfhdv3o6i7KY45RToaXYFh/PG9GnoUVHb9+lk+/8=", "ref": "refs/heads/main", - "rev": "6de19e02d22485494f9ff12f1ade8b31ebb54ba7", - "revCount": 13, + "rev": "1f286f2ad5110232fe282f5234b58cfe9fcea941", + "revCount": 12, "type": "git", "url": "https://git.jolheiser.com/git-pr-nix.git" }, @@ -271,15 +289,15 @@ } }, "golink": { "inputs": { - "nixpkgs": "nixpkgs_8", - "systems": "systems_3" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1748546644, - "narHash": "sha256-HMoXUvYz+p3vTK0hp445Vc7Od9F6oHV0FrRBPx1b2Fs=", + "lastModified": 1733941744, + "narHash": "sha256-cIml0ewF5j2cQySLHkMmV1rl7cVH8wuoPFeFDCARi1A=", "owner": "tailscale", "repo": "golink", - "rev": "a98f4c4dffd89d9e2052904ac5abfa5b11016382", + "rev": "d55b2a3302777d7f9943863644d4c84ecacb31b7", "type": "github" }, "original": { @@ -293,11 +311,11 @@ "inputs": { "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1748651212, - "narHash": "sha256-blV7kzaDgqRoynZ8qtao/fkWkGZ15YM7i3d1qeopiqc=", + "lastModified": 1734344598, + "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=", "owner": "nix-community", "repo": "home-manager", - "rev": "b65126fa71e744c53fbae44d90139d3069711ac4", + "rev": "83ecd50915a09dca928971139d3a102377a8d242", "type": "github" }, "original": { @@ -305,9 +323,27 @@ "id": "home-manager", "type": "indirect" } }, + "jolheiser": { + "inputs": { + "nixpkgs": "nixpkgs_10" + }, + "locked": { + "lastModified": 1730336541, + "narHash": "sha256-riD9xYV4572wT9TsIn394RQKPg+ImkVIVmeWXv61cjs=", + "ref": "refs/heads/main", + "rev": "43980b064e87f4bcb5d4429f6e89c0bb83883d0f", + "revCount": 2, + "type": "git", + "url": "https://git.jolheiser.com/nixpkgs.git" + }, + "original": { + "type": "git", + "url": "https://git.jolheiser.com/nixpkgs.git" + } + }, "mazanoke": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1746646765, @@ -325,11 +361,11 @@ } }, "nixos-hardware": { "locked": { - "lastModified": 1748634340, - "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", + "lastModified": 1734352517, + "narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", + "rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd", "type": "github" }, "original": { @@ -339,11 +375,11 @@ } }, "nixpkgs": { "locked": { - "lastModified": 1720657034, - "narHash": "sha256-nPhbeFdyN8yn+EXmnPcBWisoypndtQbNIhSKmAinv3E=", + "lastModified": 1741310760, + "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "212defe037698e18fc9521dfe451779a8979844c", + "rev": "de0fe301211c267807afd11b12613f5511ff7433", "type": "github" }, "original": { @@ -370,6 +406,22 @@ } }, "nixpkgs_10": { "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" + } + }, + "nixpkgs_11": { + "locked": { "lastModified": 1746397377, "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=", "owner": "nixos", @@ -384,13 +436,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": { @@ -400,13 +452,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { - "lastModified": 1697383814, - "narHash": "sha256-NoGJsi8R4GyQX6GHJS9lIXyrbrybqyqA8v6HVixHs5E=", + "lastModified": 1741481966, + "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9606c209b83b772aea897eeb1468aec9d21033c3", + "rev": "5c2eeaafda070b7c357b839f13bb53c1d4334001", "type": "github" }, "original": { @@ -415,13 +467,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "type": "github" }, "original": { @@ -431,13 +483,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -446,7 +498,7 @@ "ref": "nixos-unstable", "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { "lastModified": 1736241350, "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", @@ -462,7 +514,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_17": { "locked": { "lastModified": 1747060738, "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", @@ -478,7 +530,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_18": { "locked": { "lastModified": 1695806987, "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", @@ -494,7 +546,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_19": { "locked": { "lastModified": 1699343069, "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", @@ -528,11 +580,11 @@ } }, "nixpkgs_3": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1741379970, + "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f", "type": "github" }, "original": { @@ -560,27 +612,27 @@ } }, "nixpkgs_5": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1726447378, + "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { "locked": { - "lastModified": 1699923567, - "narHash": "sha256-oVMICs/4eZdIkbZvKs/JZe0SwrON/2d5veuwhBOrnmE=", + "lastModified": 1741481966, + "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d6c73222280b7f69109dfa5c9572f4b74c3453c", + "rev": "5c2eeaafda070b7c357b839f13bb53c1d4334001", "type": "github" }, "original": { @@ -607,11 +659,11 @@ } }, "nixpkgs_8": { "locked": { - "lastModified": 1743472173, - "narHash": "sha256-xwNv3FYTC5pl4QVZ79gUxqCEvqKzcKdXycpH5UbYscw=", + "lastModified": 1741310760, + "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88e992074d86ad50249de12b7fb8dbaadf8dc0c5", + "rev": "de0fe301211c267807afd11b12613f5511ff7433", "type": "github" }, "original": { @@ -622,11 +674,11 @@ } }, "nixpkgs_9": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -638,8 +690,8 @@ } }, "resume": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_12" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1697473034, @@ -668,9 +720,10 @@ "git-age": "git-age", "git-pr": "git-pr", "golink": "golink", "home-manager": "home-manager", + "jolheiser": "jolheiser", "mazanoke": "mazanoke", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "resume": "resume", "tailproxy": "tailproxy", "tclip": "tclip", @@ -755,14 +808,14 @@ } }, "tailproxy": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_14" }, "locked": { - "lastModified": 1740421538, - "narHash": "sha256-B66IafTKXW/aoheX32EDPkOOa8PEldJbdBLlbeRtN1Y=", + "lastModified": 1729968274, + "narHash": "sha256-YmGgnwar4mGwK3+TRO3W7wvFHcIZ21JEm95PRroJpzQ=", "ref": "refs/heads/main", - "rev": "f1919cfe154506a77a6d71f74c74775d060f0de0", - "revCount": 10, + "rev": "a7b8073ad6a2eaf931415b41156e0bba9e51fc76", + "revCount": 9, "type": "git", "url": "https://git.jolheiser.com/tailproxy.git" }, @@ -815,7 +868,7 @@ } }, "tailwind-ctp-lsp_2": { "inputs": { - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1699401590, @@ -833,7 +886,7 @@ } }, "tailwind-ctp_2": { "inputs": { - "nixpkgs": "nixpkgs_17" + "nixpkgs": "nixpkgs_18" }, "locked": { "lastModified": 1695841587, @@ -851,15 +904,15 @@ } }, "tclip": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "utils": "utils" }, "locked": { - "lastModified": 1748361314, - "narHash": "sha256-OpbRZBs/3+F0pulG06vqkGcMW5P7S4BGQWpdDheB6Lw=", + "lastModified": 1733922802, + "narHash": "sha256-VUSU+lA5NH0yAhJP86vSFbPBivvt8t+sXlG8GeakLHQ=", "owner": "tailscale-dev", "repo": "tclip", - "rev": "e022fc33592806f2cecb34f05ce2db977bc6e231", + "rev": "db34ae162e1d3fbb528d228fb20f248f3b0008d2", "type": "github" }, "original": { @@ -870,16 +923,16 @@ } }, "ugit": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "tailwind-ctp": "tailwind-ctp", "tailwind-ctp-lsp": "tailwind-ctp-lsp" }, "locked": { - "lastModified": 1747241595, - "narHash": "sha256-mzDMJpXx+OXThNyUNV4hhCWl8/rO5XIprJVRtWlVWvo=", + "lastModified": 1744918697, + "narHash": "sha256-qikJFZcuwkqVBT73gNQNX68MfWAla4qt7NuvsZfuR9Q=", "ref": "refs/heads/main", - "rev": "68992f08078cf7278bed3e59ffd85ae5502fbfcd", - "revCount": 89, + "rev": "dc88be2777ad21ef271d2eb08985702abe9fde6c", + "revCount": 84, "type": "git", "url": "https://git.jolheiser.com/ugit.git" }, @@ -908,7 +961,7 @@ } }, "website": { "inputs": { - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_17", "tailwind-ctp": "tailwind-ctp_2", "tailwind-ctp-lsp": "tailwind-ctp-lsp_2" }, diff --git a/flake.nix b/flake.nix index d4bf99c73982453ad27c35186d2def722bc8735d..77adb9608f4a51a0dcf5f61a789a02076da535df 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ description = "jolheiser's nixos config"; inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + jolheiser.url = "git+https://git.jolheiser.com/nixpkgs.git"; agenix = { url = "github:ryantm/agenix"; inputs = { @@ -51,7 +52,7 @@ }; tclip = inputs.tclip.packages.${prev.system}.tclip; templ = inputs.templ.packages.${prev.system}.templ; }) - inputs.golink.overlays.default + inputs.golink.overlay ]; system = "x86_64-linux"; pkgs = import inputs.nixpkgs { inherit system; };