diff --git a/configs/mcpkg.nix b/configs/mcpkg.nix new file mode 100644 index 0000000..94b5c2d --- /dev/null +++ b/configs/mcpkg.nix @@ -0,0 +1,9 @@ +{ inputs, ... }: + +{ + environment.systemPackages = [ + inputs.mcias.packages.x86_64-linux.default + inputs.mcr.packages.x86_64-linux.default + inputs.mc-proxy.packages.x86_64-linux.default + ]; +} diff --git a/flake.lock b/flake.lock index 10d2d63..3590d44 100644 --- a/flake.lock +++ b/flake.lock @@ -157,6 +157,64 @@ "type": "github" } }, + "mc-proxy": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774497689, + "narHash": "sha256-Hx/6f11vAa/1cveDGg/FqS40MmUDsAaak700NQJxUuo=", + "ref": "refs/heads/master", + "rev": "c13c868e7789884424e0dc4b8be4ea4914169e93", + "revCount": 22, + "type": "git", + "url": "ssh://git@git.wntrmute.dev/kyle/mc-proxy" + }, + "original": { + "type": "git", + "url": "ssh://git@git.wntrmute.dev/kyle/mc-proxy" + } + }, + "mcias": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1774497681, + "narHash": "sha256-ahO15F0ATI6VhBylXzZx8K7PcyLruXD0irM7hKpLHEY=", + "ref": "refs/heads/master", + "rev": "115f23a3ea56b787294bfa87e3a23f75b8d27cba", + "revCount": 94, + "type": "git", + "url": "ssh://git@git.wntrmute.dev/kyle/mcias.git" + }, + "original": { + "type": "git", + "url": "ssh://git@git.wntrmute.dev/kyle/mcias.git" + } + }, + "mcr": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774497688, + "narHash": "sha256-NI2A1SjemIXCImuR0PMihuqaNDscuElces/gfk0CUG0=", + "ref": "refs/heads/master", + "rev": "75c8b110dacf1aa16797c6ad6a10f1a9f5a2d6d6", + "revCount": 12, + "type": "git", + "url": "ssh://git@git.wntrmute.dev/kyle/mcr" + }, + "original": { + "type": "git", + "url": "ssh://git@git.wntrmute.dev/kyle/mcr" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -195,17 +253,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773814637, - "narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=", + "lastModified": 1774273680, + "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96", + "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-25.11", - "type": "indirect" + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-unstable": { @@ -223,6 +282,21 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1773814637, + "narHash": "sha256-GNU+ooRmrHLfjlMsKdn0prEKVa0faVanm0jrgu1J/gY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fea3b367d61c1a6592bc47c72f40a9f3e6a53e96", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-25.11", + "type": "indirect" + } + }, "root": { "inputs": { "arca": "arca", @@ -231,9 +305,12 @@ "ke": "ke", "kte": "kte", "lector": "lector", + "mc-proxy": "mc-proxy", + "mcias": "mcias", + "mcr": "mcr", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "sgard": "sgard" } diff --git a/flake.nix b/flake.nix index 1f6f7ac..f26d257 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,14 @@ cert.url = "github:kisom/cert"; cert.inputs.nixpkgs.follows = "nixpkgs"; + mcias.url = "git+ssh://git@git.wntrmute.dev/kyle/mcias.git"; + + mcr.url = "git+ssh://git@git.wntrmute.dev/kyle/mcr"; + mcr.inputs.nixpkgs.follows = "nixpkgs"; + + mc-proxy.url = "git+ssh://git@git.wntrmute.dev/kyle/mc-proxy"; + mc-proxy.inputs.nixpkgs.follows = "nixpkgs"; + # exo.url = "git+https://git.wntrmute.dev/kyle/exo"; # exo.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hw/orion/default.nix b/hw/orion/default.nix index 2794864..811c162 100644 --- a/hw/orion/default.nix +++ b/hw/orion/default.nix @@ -4,5 +4,6 @@ ./hardware-configuration.nix ../../configs/desktop.nix ../../configs/qemu.nix + ../../configs/mcpkg.nix ]; } diff --git a/hw/rift/default.nix b/hw/rift/default.nix index 9a77372..ae11886 100644 --- a/hw/rift/default.nix +++ b/hw/rift/default.nix @@ -4,6 +4,7 @@ imports = [ ./hardware-configuration.nix ./disk-config.nix + ../../configs/mcpkg.nix ]; config = { diff --git a/hw/vade/default.nix b/hw/vade/default.nix index cc9f0da..b988ad5 100644 --- a/hw/vade/default.nix +++ b/hw/vade/default.nix @@ -6,6 +6,7 @@ ./hardware-configuration.nix ../../configs/desktop-light.nix ../../configs/qemu.nix + ../../configs/mcpkg.nix ]; # Power optimization for Framework 12 laptop