diff --git a/_sources/generated.json b/_sources/generated.json index 17cfd37..ebf115a 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -1,55 +1,34 @@ { - "mender-cli": { - "cargoLock": null, - "date": null, - "extract": null, - "name": "mender-cli", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "mendersoftware", - "repo": "mender-cli", - "rev": "2.0.0", - "sha256": "sha256-jFWC1g/ebgMIqgBFgotBDwPcGNmAK3VsvfjiuRCN1ws=", - "sparseCheckout": [], - "type": "github" - }, - "version": "2.0.0" - }, "valheim.aaacrafting": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.aaacrafting", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-XdVVDXU/YfXHnpgjfDixFvRRIn+liunVSXqmGMLXGKY=", + "sha256": "sha256-YcKuJKSuhOYZVRNTfp1fYW+STecRYn/IrNVdOeC+rIE=", "type": "tarball", - "url": "https://thunderstore.io/package/download/Azumatt/AAA_Crafting/2.1.6/" + "url": "https://thunderstore.io/package/download/Azumatt/AAA_Crafting/2.1.5/" }, - "version": "2.1.6" + "version": "2.1.5" }, "valheim.architect": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.architect", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-tNlufmp8rMKBzcRWSp0o8FbtrPOpS5OZJACnG7N1Iqc=", + "sha256": "sha256-osxAsTjTyVH2qG69vMxr3LH1p1Y+8g6acGHqbfdz8fs=", "type": "tarball", - "url": "https://thunderstore.io/package/download/OdinPlus/OdinArchitect/1.6.5/" + "url": "https://thunderstore.io/package/download/OdinPlus/OdinArchitect/1.6.4/" }, - "version": "1.6.5" + "version": "1.6.4" }, "valheim.arearepair": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.arearepair", @@ -63,35 +42,35 @@ "version": "1.1.6" }, "valheim.autostore": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.autostore", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-ZSGQTxWtTBLrGU9oRPrXgLAauiwWVQQ2gv0Rzq7FHw4=", + "sha256": "sha256-h75EnPCQSXMrpDTNaxBHnG4hjYLzICYdU+sE0i/Hud4=", "type": "tarball", - "url": "https://thunderstore.io/package/download/Azumatt/AzuAutoStore/3.0.14/" + "url": "https://thunderstore.io/package/download/Azumatt/AzuAutoStore/3.0.11/" }, - "version": "3.0.14" + "version": "3.0.11" }, "valheim.backpacks": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.backpacks", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-ZHvN8J6DsRXRSzVZ3K12WSRtdKt40hMtzHMkYxl0ttU=", + "sha256": "sha256-xSfcLisLLPALx6l1Rtbt10YFUo112HV2I6BO/zCjr5w=", "type": "tarball", - "url": "https://thunderstore.io/package/download/Smoothbrain/Backpacks/1.3.8/" + "url": "https://thunderstore.io/package/download/Smoothbrain/Backpacks/1.3.6/" }, - "version": "1.3.8" + "version": "1.3.6" }, "valheim.betternetworking": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.betternetworking", @@ -105,7 +84,7 @@ "version": "2.3.2" }, "valheim.boneappetit": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.boneappetit", @@ -119,21 +98,21 @@ "version": "3.3.1" }, "valheim.campsite": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.campsite", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-vioZ7NoIWLfO0XlRCe/BEyRaouy1Kl+cPl0QXSyqjC8=", + "sha256": "sha256-hQzKXIVxbdq73E0NZlNX+aYLS5Mg6uczX8F8GKFUtec=", "type": "tarball", - "url": "https://thunderstore.io/package/download/OdinPlus/OdinCampsite/1.6.3/" + "url": "https://thunderstore.io/package/download/OdinPlus/OdinCampsite/1.6.1/" }, - "version": "1.6.3" + "version": "1.6.1" }, "valheim.cartography": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.cartography", @@ -147,21 +126,21 @@ "version": "3.1.1" }, "valheim.craftyboxes": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.craftyboxes", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-P7NucjydUf9TMJi8ObfTBA+WQsxKxeaM7N8N7mSDELY=", + "sha256": "sha256-+EKD+kBj7JHrwDi/yMPus8MZRtBApX7bOqPRrA3iXoY=", "type": "tarball", - "url": "https://thunderstore.io/package/download/Azumatt/AzuCraftyBoxes/1.8.14/" + "url": "https://thunderstore.io/package/download/Azumatt/AzuCraftyBoxes/1.8.12/" }, - "version": "1.8.14" + "version": "1.8.12" }, "valheim.customships": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.customships", @@ -175,21 +154,21 @@ "version": "0.4.1" }, "valheim.extendedinv": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.extendedinv", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-mua5nD0BLzkBFIfkfOIAUPQGlOP4sTQ9eqBqrJJJG3w=", + "sha256": "sha256-PDmlJw4hfMg1fqO/hPrT6Oss0Czci/Chvr+vz79m5JI=", "type": "tarball", - "url": "https://thunderstore.io/package/download/Azumatt/AzuExtendedPlayerInventory/2.4.1/" + "url": "https://thunderstore.io/package/download/Azumatt/AzuExtendedPlayerInventory/2.2.2/" }, - "version": "2.4.1" + "version": "2.2.2" }, "valheim.foodmove": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.foodmove", @@ -203,21 +182,21 @@ "version": "1.0.1" }, "valheim.jotunn": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.jotunn", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-6Qh5hcXM886OiOpcg73EU35kvnyvTtyJ1+7CSPzBsSA=", + "sha256": "sha256-AfiWmmoCsDtmvjTPw7AdiPYQZ055dTwq5GFvDD93e2M=", "type": "tarball", - "url": "https://thunderstore.io/package/download/ValheimModding/Jotunn/2.28.0/" + "url": "https://thunderstore.io/package/download/ValheimModding/Jotunn/2.27.1/" }, - "version": "2.28.0" + "version": "2.27.1" }, "valheim.jsondotnet": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.jsondotnet", @@ -231,7 +210,7 @@ "version": "13.0.4" }, "valheim.lazyvikings": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.lazyvikings", @@ -245,21 +224,21 @@ "version": "1.2.3" }, "valheim.mining": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.mining", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-zWSIDugJchxIfzAt9Ktc37L6ez09iK77pUowUWTndgE=", + "sha256": "sha256-SxQ+Z4T5Hg5w4X4+L++eArWZXhoXuarecKl6gdpcpNQ=", "type": "tarball", - "url": "https://thunderstore.io/package/download/Smoothbrain/Mining/1.1.6/" + "url": "https://thunderstore.io/package/download/Smoothbrain/Mining/1.1.5/" }, - "version": "1.1.6" + "version": "1.1.5" }, "valheim.missingpieces": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.missingpieces", @@ -273,7 +252,7 @@ "version": "2.2.2" }, "valheim.multiuserchest": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.multiuserchest", @@ -287,21 +266,21 @@ "version": "0.6.1" }, "valheim.planteasily": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.planteasily", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-A7WIMjNkkZoUD9xf5gswOv00/4j/NGkE+yD4gM+bAsY=", + "sha256": "sha256-HvjwiVBWs723LhHR7Xk6knugOU8eQewGiV+mZaAN5YU=", "type": "tarball", - "url": "https://thunderstore.io/package/download/Advize/PlantEasily/2.1.0/" + "url": "https://thunderstore.io/package/download/Advize/PlantEasily/2.0.3/" }, - "version": "2.1.0" + "version": "2.0.3" }, "valheim.quickteleport": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.quickteleport", @@ -315,21 +294,21 @@ "version": "1.1.0" }, "valheim.reclaim": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.reclaim", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-MIWKc6cdibXbFXKdMDdNsj7a1L6+jAMzJvhm79JQn/E=", + "sha256": "sha256-MnaJ7ulZdDemBrSzKnsgL0BN7UfRfRueFJRiL0iwjB8=", "type": "tarball", - "url": "https://thunderstore.io/package/download/Azumatt/Recycle_N_Reclaim/1.4.0/" + "url": "https://thunderstore.io/package/download/Azumatt/Recycle_N_Reclaim/1.3.10/" }, - "version": "1.4.0" + "version": "1.3.10" }, "valheim.savecrossbow": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.savecrossbow", @@ -343,7 +322,7 @@ "version": "1.0.2" }, "valheim.seedbed": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.seedbed", @@ -357,7 +336,7 @@ "version": "1.2.8" }, "valheim.servercharacters": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.servercharacters", @@ -371,7 +350,7 @@ "version": "1.4.16" }, "valheim.smoothsave": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.smoothsave", @@ -385,7 +364,7 @@ "version": "1.0.5" }, "valheim.spearfishing": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.spearfishing", @@ -399,21 +378,21 @@ "version": "1.0.4" }, "valheim.swim": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.swim", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-3BsC+cFLMtuW9pat5vTqHPt1Ak6fbXStaq6Kk9CdU3c=", + "sha256": "sha256-ZNGOZDwLqZ+AisdQKvSU2imqdCQ84jgzT38L1Fp4g4g=", "type": "tarball", - "url": "https://thunderstore.io/package/download/blacks7ar/VikingsDoSwim/1.4.1/" + "url": "https://thunderstore.io/package/download/blacks7ar/VikingsDoSwim/1.4.0/" }, - "version": "1.4.1" + "version": "1.4.0" }, "valheim.swimequip": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.swimequip", @@ -427,21 +406,21 @@ "version": "1.1.3" }, "valheim.targetportal": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "valheim.targetportal", "passthru": null, "pinned": false, "src": { - "sha256": "sha256-mW73PrH+AwZGTYk2zr2/MOTa5RsP5rDr/HKIeKqo9DI=", + "sha256": "sha256-qjeihonPwlja7sCRyKhJL53fWX4w1qfuFoOA6FAA7mw=", "type": "tarball", - "url": "https://thunderstore.io/package/download/Smoothbrain/TargetPortal/1.2.3/" + "url": "https://thunderstore.io/package/download/Smoothbrain/TargetPortal/1.2.1/" }, - "version": "1.2.3" + "version": "1.2.1" }, "vesktop.micfix": { - "cargoLock": null, + "cargoLocks": null, "date": null, "extract": null, "name": "vesktop.micfix", diff --git a/_sources/generated.nix b/_sources/generated.nix index 68f3e7b..25ffeef 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -1,37 +1,20 @@ # This file was generated by nvfetcher, please do not modify it manually. +{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { - fetchgit, - fetchurl, - fetchFromGitHub, - dockerTools, -}: -{ - mender-cli = { - pname = "mender-cli"; - version = "2.0.0"; - vendorHash = "sha256-vlcq9HGezJsorwsaVwvIKxi1pSoo4wTPmc6qCCVDdfI="; - src = fetchFromGitHub { - owner = "mendersoftware"; - repo = "mender-cli"; - rev = "2.0.0"; - fetchSubmodules = false; - sha256 = "sha256-jFWC1g/ebgMIqgBFgotBDwPcGNmAK3VsvfjiuRCN1ws="; - }; - }; "valheim.aaacrafting" = { pname = "valheim.aaacrafting"; - version = "2.1.6"; + version = "2.1.5"; src = fetchTarball { - url = "https://thunderstore.io/package/download/Azumatt/AAA_Crafting/2.1.6/"; - sha256 = "sha256-XdVVDXU/YfXHnpgjfDixFvRRIn+liunVSXqmGMLXGKY="; + url = "https://thunderstore.io/package/download/Azumatt/AAA_Crafting/2.1.5/"; + sha256 = "sha256-YcKuJKSuhOYZVRNTfp1fYW+STecRYn/IrNVdOeC+rIE="; }; }; "valheim.architect" = { pname = "valheim.architect"; - version = "1.6.5"; + version = "1.6.4"; src = fetchTarball { - url = "https://thunderstore.io/package/download/OdinPlus/OdinArchitect/1.6.5/"; - sha256 = "sha256-tNlufmp8rMKBzcRWSp0o8FbtrPOpS5OZJACnG7N1Iqc="; + url = "https://thunderstore.io/package/download/OdinPlus/OdinArchitect/1.6.4/"; + sha256 = "sha256-osxAsTjTyVH2qG69vMxr3LH1p1Y+8g6acGHqbfdz8fs="; }; }; "valheim.arearepair" = { @@ -44,18 +27,18 @@ }; "valheim.autostore" = { pname = "valheim.autostore"; - version = "3.0.14"; + version = "3.0.11"; src = fetchTarball { - url = "https://thunderstore.io/package/download/Azumatt/AzuAutoStore/3.0.14/"; - sha256 = "sha256-ZSGQTxWtTBLrGU9oRPrXgLAauiwWVQQ2gv0Rzq7FHw4="; + url = "https://thunderstore.io/package/download/Azumatt/AzuAutoStore/3.0.11/"; + sha256 = "sha256-h75EnPCQSXMrpDTNaxBHnG4hjYLzICYdU+sE0i/Hud4="; }; }; "valheim.backpacks" = { pname = "valheim.backpacks"; - version = "1.3.8"; + version = "1.3.6"; src = fetchTarball { - url = "https://thunderstore.io/package/download/Smoothbrain/Backpacks/1.3.8/"; - sha256 = "sha256-ZHvN8J6DsRXRSzVZ3K12WSRtdKt40hMtzHMkYxl0ttU="; + url = "https://thunderstore.io/package/download/Smoothbrain/Backpacks/1.3.6/"; + sha256 = "sha256-xSfcLisLLPALx6l1Rtbt10YFUo112HV2I6BO/zCjr5w="; }; }; "valheim.betternetworking" = { @@ -76,10 +59,10 @@ }; "valheim.campsite" = { pname = "valheim.campsite"; - version = "1.6.3"; + version = "1.6.1"; src = fetchTarball { - url = "https://thunderstore.io/package/download/OdinPlus/OdinCampsite/1.6.3/"; - sha256 = "sha256-vioZ7NoIWLfO0XlRCe/BEyRaouy1Kl+cPl0QXSyqjC8="; + url = "https://thunderstore.io/package/download/OdinPlus/OdinCampsite/1.6.1/"; + sha256 = "sha256-hQzKXIVxbdq73E0NZlNX+aYLS5Mg6uczX8F8GKFUtec="; }; }; "valheim.cartography" = { @@ -92,10 +75,10 @@ }; "valheim.craftyboxes" = { pname = "valheim.craftyboxes"; - version = "1.8.14"; + version = "1.8.12"; src = fetchTarball { - url = "https://thunderstore.io/package/download/Azumatt/AzuCraftyBoxes/1.8.14/"; - sha256 = "sha256-P7NucjydUf9TMJi8ObfTBA+WQsxKxeaM7N8N7mSDELY="; + url = "https://thunderstore.io/package/download/Azumatt/AzuCraftyBoxes/1.8.12/"; + sha256 = "sha256-+EKD+kBj7JHrwDi/yMPus8MZRtBApX7bOqPRrA3iXoY="; }; }; "valheim.customships" = { @@ -108,10 +91,10 @@ }; "valheim.extendedinv" = { pname = "valheim.extendedinv"; - version = "2.4.1"; + version = "2.2.2"; src = fetchTarball { - url = "https://thunderstore.io/package/download/Azumatt/AzuExtendedPlayerInventory/2.4.1/"; - sha256 = "sha256-mua5nD0BLzkBFIfkfOIAUPQGlOP4sTQ9eqBqrJJJG3w="; + url = "https://thunderstore.io/package/download/Azumatt/AzuExtendedPlayerInventory/2.2.2/"; + sha256 = "sha256-PDmlJw4hfMg1fqO/hPrT6Oss0Czci/Chvr+vz79m5JI="; }; }; "valheim.foodmove" = { @@ -124,10 +107,10 @@ }; "valheim.jotunn" = { pname = "valheim.jotunn"; - version = "2.28.0"; + version = "2.27.1"; src = fetchTarball { - url = "https://thunderstore.io/package/download/ValheimModding/Jotunn/2.28.0/"; - sha256 = "sha256-6Qh5hcXM886OiOpcg73EU35kvnyvTtyJ1+7CSPzBsSA="; + url = "https://thunderstore.io/package/download/ValheimModding/Jotunn/2.27.1/"; + sha256 = "sha256-AfiWmmoCsDtmvjTPw7AdiPYQZ055dTwq5GFvDD93e2M="; }; }; "valheim.jsondotnet" = { @@ -148,10 +131,10 @@ }; "valheim.mining" = { pname = "valheim.mining"; - version = "1.1.6"; + version = "1.1.5"; src = fetchTarball { - url = "https://thunderstore.io/package/download/Smoothbrain/Mining/1.1.6/"; - sha256 = "sha256-zWSIDugJchxIfzAt9Ktc37L6ez09iK77pUowUWTndgE="; + url = "https://thunderstore.io/package/download/Smoothbrain/Mining/1.1.5/"; + sha256 = "sha256-SxQ+Z4T5Hg5w4X4+L++eArWZXhoXuarecKl6gdpcpNQ="; }; }; "valheim.missingpieces" = { @@ -172,10 +155,10 @@ }; "valheim.planteasily" = { pname = "valheim.planteasily"; - version = "2.1.0"; + version = "2.0.3"; src = fetchTarball { - url = "https://thunderstore.io/package/download/Advize/PlantEasily/2.1.0/"; - sha256 = "sha256-A7WIMjNkkZoUD9xf5gswOv00/4j/NGkE+yD4gM+bAsY="; + url = "https://thunderstore.io/package/download/Advize/PlantEasily/2.0.3/"; + sha256 = "sha256-HvjwiVBWs723LhHR7Xk6knugOU8eQewGiV+mZaAN5YU="; }; }; "valheim.quickteleport" = { @@ -188,10 +171,10 @@ }; "valheim.reclaim" = { pname = "valheim.reclaim"; - version = "1.4.0"; + version = "1.3.10"; src = fetchTarball { - url = "https://thunderstore.io/package/download/Azumatt/Recycle_N_Reclaim/1.4.0/"; - sha256 = "sha256-MIWKc6cdibXbFXKdMDdNsj7a1L6+jAMzJvhm79JQn/E="; + url = "https://thunderstore.io/package/download/Azumatt/Recycle_N_Reclaim/1.3.10/"; + sha256 = "sha256-MnaJ7ulZdDemBrSzKnsgL0BN7UfRfRueFJRiL0iwjB8="; }; }; "valheim.savecrossbow" = { @@ -236,10 +219,10 @@ }; "valheim.swim" = { pname = "valheim.swim"; - version = "1.4.1"; + version = "1.4.0"; src = fetchTarball { - url = "https://thunderstore.io/package/download/blacks7ar/VikingsDoSwim/1.4.1/"; - sha256 = "sha256-3BsC+cFLMtuW9pat5vTqHPt1Ak6fbXStaq6Kk9CdU3c="; + url = "https://thunderstore.io/package/download/blacks7ar/VikingsDoSwim/1.4.0/"; + sha256 = "sha256-ZNGOZDwLqZ+AisdQKvSU2imqdCQ84jgzT38L1Fp4g4g="; }; }; "valheim.swimequip" = { @@ -252,10 +235,10 @@ }; "valheim.targetportal" = { pname = "valheim.targetportal"; - version = "1.2.3"; + version = "1.2.1"; src = fetchTarball { - url = "https://thunderstore.io/package/download/Smoothbrain/TargetPortal/1.2.3/"; - sha256 = "sha256-mW73PrH+AwZGTYk2zr2/MOTa5RsP5rDr/HKIeKqo9DI="; + url = "https://thunderstore.io/package/download/Smoothbrain/TargetPortal/1.2.1/"; + sha256 = "sha256-qjeihonPwlja7sCRyKhJL53fWX4w1qfuFoOA6FAA7mw="; }; }; "vesktop.micfix" = { diff --git a/flake.lock b/flake.lock index 61fc5a3..5ed46c3 100644 --- a/flake.lock +++ b/flake.lock @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1774007980, - "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", + "lastModified": 1773367248, + "narHash": "sha256-FFMc1uAwy2GYasd0rdNDVxKyAgzuoJH2M+GglBQbqf0=", "owner": "nix-community", "repo": "home-manager", - "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", + "rev": "be0c641a6a5564caa33982faa1fe2c60d92131c7", "type": "github" }, "original": { @@ -275,11 +275,11 @@ ] }, "locked": { - "lastModified": 1773422513, - "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", + "lastModified": 1772330611, + "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", + "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", "type": "github" }, "original": { @@ -471,11 +471,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1773282481, + "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1773970322, - "narHash": "sha256-xyO9ZV+cZk+HVmjS6P5Jzwl6ioRCKgeLQSSbUFtPrZk=", + "lastModified": 1773343795, + "narHash": "sha256-0+HEuOytpwyPt7i1jj6v2QJ+NXXisCYnL2XNwPBltvg=", "owner": "NotAShelf", "repo": "nvf", - "rev": "8aad181ec9057c56b6fe5d6081a399427e1d1dec", + "rev": "83b44eaf50b96bd5d06b1a56a3a51f1b2362db52", "type": "github" }, "original": { @@ -573,11 +573,11 @@ ] }, "locked": { - "lastModified": 1773889674, - "narHash": "sha256-+ycaiVAk3MEshJTg35cBTUa0MizGiS+bgpYw/f8ohkg=", + "lastModified": 1773096132, + "narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=", "owner": "Mic92", "repo": "sops-nix", - "rev": "29b6519f3e0780452bca0ac0be4584f04ac16cc5", + "rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784", "type": "github" }, "original": { @@ -626,11 +626,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1773792048, - "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=", + "lastModified": 1772296853, + "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", "owner": "danth", "repo": "stylix", - "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1", + "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", "type": "github" }, "original": { @@ -794,11 +794,11 @@ ] }, "locked": { - "lastModified": 1773737882, - "narHash": "sha256-P6k0BtT1/idYveVRdcwAZk8By9UjZW8XOMhSoS6wTBY=", + "lastModified": 1773290887, + "narHash": "sha256-L1yMYmFffHfZNP+hKJGRBmrFKkn/VDhu7jEbVftBQuM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a7f1db35d74faf04e5189b3a32f890186ace5c28", + "rev": "9346698c4562819f61b4e5097151ec0b17729fab", "type": "github" }, "original": { diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index 8948fa6..5166155 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -16,6 +16,7 @@ in { with pkgs; [ nix-alien r2modman + lutris godot rustdesk-flutter motion @@ -80,7 +81,7 @@ in { }; }; }; - networking.firewall.allowedTCPPorts = [80]; + networking.firewall.allowedTCPPorts = [ 80 ]; virtualisation.virtualbox.host.enable = true; users.extraGroups.vboxusers.members = ["user-with-access-to-virtualbox"]; diff --git a/hosts/murk/home.nix b/hosts/murk/home.nix index 6276198..c10af30 100644 --- a/hosts/murk/home.nix +++ b/hosts/murk/home.nix @@ -8,7 +8,7 @@ }: let cfg = osConfig.mods; in { - imports = [inputs.impermanence.homeManagerModules.impermanence]; + # imports = [inputs.impermanence.homeManagerModules.impermanence]; # Modules mods.xdg.enable = true; @@ -25,8 +25,8 @@ in { mods.desktop.productivity.enable = false; mods.zen.enable = true; mods.obsidian.enable = true; + mods.theme.slideshow.enable = true; mods.octo.enable = true; - mods.theme.slideshow = true; home.packages = with pkgs; [ @@ -46,6 +46,7 @@ in { go rainfrog tealdeer + (callPackage ./packages/mender-cli.nix {}) ] # Non-free `modules/home/terminal/hr/mender-cli.nix` - -To add more Go packages, edit `pkgs/nvft/default.nix` and add entries to the `GO_PACKAGES` array. - -## How it Works - -For each Go package: -1. Compares old vs new source hash to detect updates -2. If source unchanged, keeps existing vendorHash (fast) -3. If source changed, creates a temporary build with `lib.fakeHash` -4. Attempts to build, which fails with the correct hash -5. Extracts the correct hash from the error message -6. Updates `vendorHash` directly in `_sources/generated.nix` alongside the source information - -## Package Usage - -Go packages read vendorHash from the sources: - -```nix -let - src = sources.mender-cli; -in -buildGoModule { - inherit (src) pname version src vendorHash; - # ... rest of package -} -``` - -The vendorHash is stored in `_sources/generated.nix` alongside the version and source hash, keeping all auto-generated values in one place. diff --git a/pkgs/nvft/default.nix b/pkgs/nvft/default.nix deleted file mode 100644 index 0767c39..0000000 --- a/pkgs/nvft/default.nix +++ /dev/null @@ -1,250 +0,0 @@ -{ - lib, - writeShellApplication, - nvfetcher, - nix, - gnused, - coreutils, -}: -writeShellApplication { - name = "nvft"; - - runtimeInputs = [ - nvfetcher - nix - gnused - coreutils - ]; - - text = '' - set -euo pipefail - - # Determine the config directory - if [[ -n "''${NVFETCHER_CONFIG_DIR:-}" ]]; then - CONFIG_DIR="$NVFETCHER_CONFIG_DIR" - elif [[ -f "nvfetcher.toml" ]]; then - CONFIG_DIR="$(pwd)" - else - CONFIG_DIR="''${HOME}/.config/home" - fi - - if [[ ! -f "$CONFIG_DIR/nvfetcher.toml" ]]; then - echo "❌ Error: nvfetcher.toml not found in $CONFIG_DIR" - exit 1 - fi - - echo "🚀 Updating sources in $CONFIG_DIR" - echo "" - - SOURCES_FILE="$CONFIG_DIR/_sources/generated.nix" - - # Read Go packages from nvfetcher.toml that need vendorHash updates - declare -A GO_PACKAGES - # For now, hardcode the known Go packages - # TODO: Could parse nvfetcher.toml to auto-detect these - GO_PACKAGES["mender-cli"]="modules/home/terminal/hr/mender-cli.nix" - - # Step 0: Save existing hashes before nvfetcher wipes them - echo "💾 Saving existing hashes..." - declare -A SAVED_VENDOR_HASHES - declare -A SAVED_SOURCE_HASHES - - if [[ -f "$SOURCES_FILE" ]]; then - for source_name in "''${!GO_PACKAGES[@]}"; do - # Save vendorHash - saved_vendor=$(grep -A20 "^ $source_name = " "$SOURCES_FILE" | grep -oP 'vendorHash = "\K[^"]+' || echo "") - if [[ -n "$saved_vendor" ]]; then - SAVED_VENDOR_HASHES["$source_name"]="$saved_vendor" - echo " Saved $source_name vendorHash: $saved_vendor" - fi - - # Save source sha256 to detect if source changed - saved_source=$(grep -A20 "^ $source_name = " "$SOURCES_FILE" | grep -oP 'sha256 = "\K[^"]+' || echo "") - if [[ -n "$saved_source" ]]; then - SAVED_SOURCE_HASHES["$source_name"]="$saved_source" - echo " Saved $source_name sourceHash: $saved_source" - fi - done - fi - echo "" - - # Step 1: Run nvfetcher - echo "đŸ“Ļ Step 1: Running nvfetcher..." - cd "$CONFIG_DIR" - if nvfetcher; then - echo "" - echo "✅ nvfetcher completed" - echo "" - else - echo "" - echo "⚠ī¸ nvfetcher had some errors, but continuing with vendor hash updates..." - echo "" - fi - - # Step 2: Restore saved vendorHash values - echo "đŸ“Ļ Step 2: Restoring saved vendorHash values..." - for source_name in "''${!SAVED_VENDOR_HASHES[@]}"; do - saved_hash="''${SAVED_VENDOR_HASHES[$source_name]}" - echo " Restoring $source_name: $saved_hash" - - # Add vendorHash back after version line using awk - awk -v source="$source_name" -v hash="$saved_hash" ' - /^ / && $0 ~ source" = " {in_block=1} - in_block && /version = / {print; print " vendorHash = \"" hash "\";"; next} - in_block && /^ };/ {in_block=0} - {print} - ' "$SOURCES_FILE" > "$SOURCES_FILE.tmp" && mv "$SOURCES_FILE.tmp" "$SOURCES_FILE" - done - echo "" - - # Step 3: Update Go vendor hashes - echo "đŸ“Ļ Step 3: Checking for Go packages that need vendor hash updates..." - - if [[ ! -f "$SOURCES_FILE" ]]; then - echo "❌ Error: Generated sources file not found at $SOURCES_FILE" - exit 1 - fi - - if [[ ''${#GO_PACKAGES[@]} -eq 0 ]]; then - echo "ℹī¸ No Go packages configured for vendor hash updates" - echo "" - echo "🎉 All updates complete!" - exit 0 - fi - - for source_name in "''${!GO_PACKAGES[@]}"; do - package_path="''${GO_PACKAGES[$source_name]}" - full_path="$CONFIG_DIR/$package_path" - - if [[ ! -f "$full_path" ]]; then - echo "⚠ī¸ Package file not found: $full_path" - continue - fi - - echo "" - echo "đŸ“Ļ Processing $source_name..." - - # Check if vendorHash already exists in generated.nix - current_vendor=$(grep -A20 "^ $source_name = " "$SOURCES_FILE" | grep -oP 'vendorHash = "\K[^"]+' || echo "") - - if [[ -n "$current_vendor" ]]; then - echo " Current vendorHash: $current_vendor" - else - echo " No vendorHash found" - fi - - # Check if source hash changed (indicates version/source update) - new_source_hash=$(grep -A20 "^ $source_name = " "$SOURCES_FILE" | grep -oP 'sha256 = "\K[^"]+' || echo "") - old_source_hash="''${SAVED_SOURCE_HASHES[$source_name]:-}" - - if [[ -n "$old_source_hash" ]] && [[ "$old_source_hash" == "$new_source_hash" ]]; then - echo " Source unchanged (hash: ''${new_source_hash:0:16}...)" - echo " ✨ Skipping vendorHash recalculation" - continue - elif [[ -n "$old_source_hash" ]]; then - echo " Source changed!" - echo " Old: ''${old_source_hash:0:16}..." - echo " New: ''${new_source_hash:0:16}..." - echo " → Need to recalculate vendorHash" - else - echo " New package, calculating vendorHash..." - fi - - # Get version from generated sources - new_version=$(nix-instantiate --eval --strict --expr " - let pkgs = import {}; - sources = pkgs.callPackage $SOURCES_FILE {}; - in sources.''${source_name}.version - " 2>/dev/null | tr -d '"' || echo "") - - if [[ -z "$new_version" ]]; then - echo "⚠ī¸ Could not determine version from generated sources" - continue - fi - - echo " Version: $new_version" - - # Create temporary build directory - temp_build=$(mktemp -d) - trap 'rm -rf "$temp_build"' EXIT - - # Copy necessary files - cp -r "$CONFIG_DIR/_sources" "$temp_build/" - cp "$full_path" "$temp_build/package.nix" - - # Create build expression - cat > "$temp_build/default.nix" << 'NIXEOF' - { pkgs ? import {} }: - let - sources = pkgs.callPackage ./_sources/generated.nix {}; - in - pkgs.callPackage ./package.nix { inherit sources; } - NIXEOF - - # Temporarily replace hash with fakeHash - # Replace both inherited vendorHash and explicit vendorHash assignments - sed -i 's|inherit (src) pname version src vendorHash|inherit (src) pname version src;\n vendorHash = lib.fakeHash|g' "$temp_build/package.nix" - sed -i 's|vendorHash = "[^"]*";|vendorHash = lib.fakeHash;|g' "$temp_build/package.nix" - - echo " Calculating correct vendor hash..." - - # Build and extract the correct hash from error message - vendor_hash=$(nix-build "$temp_build/default.nix" 2>&1 | \ - grep -oP 'got:\s+\K(sha256-[A-Za-z0-9+/=]+)' | \ - head -1 || echo "") - - if [[ -z "$vendor_hash" ]]; then - echo "⚠ī¸ Could not calculate vendor hash" - echo " The package may have built successfully (current hash is correct)" - echo " Or there may be a build error unrelated to vendorHash" - continue - fi - - echo " New hash: $vendor_hash" - - # Update the generated.nix file to include vendorHash - # Find the entry and add/update vendorHash after version - if grep -q "^ $source_name = " "$SOURCES_FILE"; then - # Check if vendorHash already exists - if grep -A20 "^ $source_name = " "$SOURCES_FILE" | grep -q "vendorHash"; then - # Update existing vendorHash using awk for better multiline handling - awk -v source="$source_name" -v hash="$vendor_hash" ' - /^ / && $0 ~ source" = " {in_block=1} - in_block && /vendorHash = / {sub(/vendorHash = "[^"]*"/, "vendorHash = \"" hash "\"")} - in_block && /^ };/ {in_block=0} - {print} - ' "$SOURCES_FILE" > "$SOURCES_FILE.tmp" && mv "$SOURCES_FILE.tmp" "$SOURCES_FILE" - echo "✅ Updated vendorHash in generated.nix" - else - # Add vendorHash after version line using awk - awk -v source="$source_name" -v hash="$vendor_hash" ' - /^ / && $0 ~ source" = " {in_block=1} - in_block && /version = / {print; print " vendorHash = \"" hash "\";"; next} - in_block && /^ };/ {in_block=0} - {print} - ' "$SOURCES_FILE" > "$SOURCES_FILE.tmp" && mv "$SOURCES_FILE.tmp" "$SOURCES_FILE" - echo "✅ Added vendorHash to generated.nix" - fi - else - echo "⚠ī¸ Could not find $source_name entry in generated.nix" - fi - done - - echo "" - echo "🎉 All updates complete!" - echo "" - echo "Summary:" - echo " - Source versions and hashes updated by nvfetcher" - echo " - Go vendor hashes recalculated and updated" - echo "" - echo "Next steps:" - echo " - Review changes: git diff" - echo " - Test build: home-manager switch or similar" - echo " - Commit if everything works" - ''; - - meta = { - description = "Update nvfetcher sources and Go vendor hashes"; - mainProgram = "nvft"; - }; -} diff --git a/shell.nix b/shell.nix index 1da75bc..ffc8955 100644 --- a/shell.nix +++ b/shell.nix @@ -1,8 +1,4 @@ -{pkgs ? import {}, ...}: -let - nvft = pkgs.callPackage ./pkgs/nvft {}; -in -{ +{pkgs ? import {}, ...}: { default = pkgs.mkShell { NIX_CONFIG = "extra-experimental-features = nix-command flakes ca-derivations"; nativeBuildInputs = with pkgs; [ @@ -12,7 +8,6 @@ in sops age nvfetcher - nvft ]; }; }