Compare commits

Author SHA1 Message Date
wymiller b79299847a mod: added nix-minecraft
re-exported for others to use
2026-10-26 13:16:13 -04:00
gitea-actions[bot] 96f8e9162b chore: update flake lock 2026-10-25 07:05:43 +00:00
2 changed files with 107 additions and 33 deletions

No files matched your search

Generated
+83 -29
View File
@@ -9,11 +9,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1791702392, "lastModified": 1792911802,
"narHash": "sha256-8uWZP3UiJBtYzBzazI18WvlshKYHxPb+8aqm02OxL5M=", "narHash": "sha256-GdMiAfj8hRDCqrE2AvQJ3atf0y2XVGFx9/Ptr6qiju0=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "ee2a27ad749d6d774e26c2be5de5f3a5ecd4a93f", "rev": "a355f99a17b9dc38fc626b80340646a94ae7f1c9",
"revCount": 28, "revCount": 30,
"type": "git", "type": "git",
"url": "https://scm.wyattjmiller.com/wymiller/caitsith.git" "url": "https://scm.wyattjmiller.com/wymiller/caitsith.git"
}, },
@@ -29,11 +29,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1786845137, "lastModified": 1792737899,
"narHash": "sha256-oQFip+v0luP8NIxJzmiW4Wu8bILsbFWom5l0zonl8hQ=", "narHash": "sha256-P0/GhewcEQmAbzq3QunNWY2jLJaYH9F6c/5dEM/jQ4M=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "4cff07de74b50e64bdd68cd4e722ab5b6b35ee48", "rev": "bb0b90dbd54e207100de72b5dcbe3188c98a4b69",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -58,6 +58,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-schemas": { "flake-schemas": {
"locked": { "locked": {
"lastModified": 1780327564, "lastModified": 1780327564,
@@ -135,11 +151,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1792166485, "lastModified": 1792644631,
"narHash": "sha256-TL2RJ56FbBQNi6vsCXAn7QhZECh5DPbvzfiX6v+4r1A=", "narHash": "sha256-3aILZu5bQ+6khPvGCdIbC7wBFZOgPbpP0TBSL9tf89E=",
"owner": "purpleclay", "owner": "purpleclay",
"repo": "go-overlay", "repo": "go-overlay",
"rev": "5971ffb6c5de960d37f3b85c53cb5a30387cd05a", "rev": "ff2b494b477eb4349dd40f0564cedab552f9804d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -157,11 +173,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1791702441, "lastModified": 1792911744,
"narHash": "sha256-qHf8tVIYu6OE1PKcthmpBgblg27u3bU7v4TVqy0B3jg=", "narHash": "sha256-iXH6FL8HYaZg0+p9lUv5bEc4k1YpvwKFYtMYbY1phTA=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "2c2e99f6347e9be744a72f7df6043015989d6cd7", "rev": "01ff244467f011033d98286e8f4171a890e9060a",
"revCount": 17, "revCount": 19,
"type": "git", "type": "git",
"url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git" "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
}, },
@@ -177,11 +193,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1792098797, "lastModified": 1792896866,
"narHash": "sha256-u4DIIZgznEGzByxXrxWCXK19VcMtTBmi/M9gZ7Jk9bM=", "narHash": "sha256-/0tELNnhdSnP+bHSdWiEe6KpfSwi6WrTnT9cm/jNkjA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "640725978b99076e18e069f6e7d2959124584f8f", "rev": "c216bf5a1f173b0481bd5c8c489ebe5595ecc68c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -190,13 +206,35 @@
"type": "github" "type": "github"
} }
}, },
"nix-minecraft": {
"inputs": {
"flake-compat": "flake-compat_2",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_2"
},
"locked": {
"lastModified": 1792988509,
"narHash": "sha256-1Li/v57ePpV9t6E57w/XTu760H6hYHztwm1RSd6RA8k=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "931d87d3811cabc0277be27b94392d19291bd344",
"type": "github"
},
"original": {
"owner": "Infinidoge",
"repo": "nix-minecraft",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1792030654, "lastModified": 1792615934,
"narHash": "sha256-OaQwAtPMTjQiY2sT/2/62UbSPhzP/0aDnWzMm/NCiUw=", "narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "26f4107e47e3ad0ffd0db220469ba83b6f6d96e8", "rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -213,6 +251,7 @@
"go-overlay": "go-overlay", "go-overlay": "go-overlay",
"hildibrand": "hildibrand", "hildibrand": "hildibrand",
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-minecraft": "nix-minecraft",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
} }
@@ -225,11 +264,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1791620365, "lastModified": 1792825530,
"narHash": "sha256-CVZXIDNw7HEwyD8X6q9Ln370Sc0ZqRlTzDRwOZ1hJMY=", "narHash": "sha256-aphXA2IFNd3q48++TKmfuuvDDjkrgGdJDnDIhij9684=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "e90fafa71b440fabcd52dd7fb017ab2da81c781a", "rev": "5b9f1198b59bcb31c5c3250b332e7d77590e6306",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -246,11 +285,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1791620365, "lastModified": 1792825530,
"narHash": "sha256-CVZXIDNw7HEwyD8X6q9Ln370Sc0ZqRlTzDRwOZ1hJMY=", "narHash": "sha256-aphXA2IFNd3q48++TKmfuuvDDjkrgGdJDnDIhij9684=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "e90fafa71b440fabcd52dd7fb017ab2da81c781a", "rev": "5b9f1198b59bcb31c5c3250b332e7d77590e6306",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -266,11 +305,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1792219666, "lastModified": 1792825530,
"narHash": "sha256-RMO08tKD+hFIL5ryWi85VY4aHE5oIpdV1h4kVFctOkw=", "narHash": "sha256-aphXA2IFNd3q48++TKmfuuvDDjkrgGdJDnDIhij9684=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "a110337465cfb76e3806b81b9db3094c3e6e770a", "rev": "5b9f1198b59bcb31c5c3250b332e7d77590e6306",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -293,6 +332,21 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"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", "root": "root",
+24 -4
View File
@@ -15,6 +15,10 @@
url = "github:purpleclay/go-overlay"; url = "github:purpleclay/go-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-minecraft = {
url = "github:Infinidoge/nix-minecraft";
inputs.nixpkgs.follows = "nixpkgs";
};
hildibrand.url = "git+https://scm.wyattjmiller.com/wymiller/hildibrand.git"; hildibrand.url = "git+https://scm.wyattjmiller.com/wymiller/hildibrand.git";
hildibrand.inputs.nixpkgs.follows = "nixpkgs"; hildibrand.inputs.nixpkgs.follows = "nixpkgs";
@@ -22,7 +26,16 @@
caitsith.inputs.nixpkgs.follows = "nixpkgs"; caitsith.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs@{ self, nixpkgs, home-manager, darwin, rust-overlay, go-overlay, ... }: outputs =
inputs@{
self,
nixpkgs,
home-manager,
darwin,
rust-overlay,
go-overlay,
...
}:
let let
supportedSystems = [ supportedSystems = [
"x86_64-linux" "x86_64-linux"
@@ -40,15 +53,18 @@
overlays = [ self.overlays.default ]; overlays = [ self.overlays.default ];
}; };
in in
import ./pkgs { inputs.nix-minecraft.packages.${system}
// (import ./pkgs {
inherit pkgs; inherit pkgs;
# packages that are already built with Nix go here # packages that are already built with Nix go here
hildibrand = inputs.hildibrand.packages.${system}.default; hildibrand = inputs.hildibrand.packages.${system}.default;
caitsith = inputs.caitsith.packages.${system}.default; caitsith = inputs.caitsith.packages.${system}.default;
} })
); );
legacyPackages = forAllSystems (system: inputs.nix-minecraft.legacyPackages.${system});
devShells = forAllSystems ( devShells = forAllSystems (
system: system:
let let
@@ -63,13 +79,17 @@
} }
); );
overlays.minecraft = inputs.nix-minecraft.overlays.default;
overlays.default = nixpkgs.lib.composeManyExtensions [ overlays.default = nixpkgs.lib.composeManyExtensions [
rust-overlay.overlays.default rust-overlay.overlays.default
go-overlay.overlays.default go-overlay.overlays.default
self.overlays.minecraft
(import ./overlays) (import ./overlays)
]; ];
homeManagerModules = import ./modules/home-manager self; homeManagerModules = import ./modules/home-manager self;
nixosModules.default = import ./modules/nixos; nixosModules = inputs.nix-minecraft.nixosModules // {
default = import ./modules/nixos;
};
darwinModules.default = import ./modules/darwin; darwinModules.default = import ./modules/darwin;
}; };
} }