diff --git a/configuration.nix b/configuration.nix index d2aee0c..52cf27a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -37,9 +37,6 @@ "nix-command" "flakes" ]; - - substituters = lib.mkForce [ ]; - trusted-public-keys = lib.mkForce [ ]; }; }; diff --git a/flake.lock b/flake.lock index cac869c..e991846 100644 --- a/flake.lock +++ b/flake.lock @@ -34,6 +34,22 @@ "type": "github" } }, + "jellyfin": { + "locked": { + "lastModified": 1730145036, + "narHash": "sha256-amYxkGRsSbDe8YNgJ9x0lxDAgDvi3xxO3pRjImdy5DQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bf8b641d2d58a80650ac486525d7ec5a306b69da", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "pull/351966/head", + "repo": "nixpkgs", + "type": "github" + } + }, "nix-minecraft": { "inputs": { "flake-compat": "flake-compat", @@ -43,11 +59,11 @@ ] }, "locked": { - "lastModified": 1729647959, - "narHash": "sha256-3effNhs4C9+45qkMDR0cIbp5YAbhdosUFxf5jBetRXk=", + "lastModified": 1730426071, + "narHash": "sha256-2BkSiHqyWikpz9HSgTBk5kikaQ5m0Rs60C9KA2kf53o=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "7372dca0c43e1a9829ea7b86fd93bb17ab3b2e41", + "rev": "4b371c3d119493051d081ff5b6cff689a97ad1a1", "type": "github" }, "original": { @@ -58,11 +74,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729690929, - "narHash": "sha256-cTSekmupaDfrhlpLhBUBrU9mUzBaD6mYsMveTX0bKDg=", + "lastModified": 1730368399, + "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "64d900abe40057393148bc0283d35c2254dd4f57", + "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", "type": "github" }, "original": { @@ -74,16 +90,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729732943, - "narHash": "sha256-MVVup9A+42n+Ch3mh44pXfGuhVzdZD/iItcuc9+xXbY=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "37ac2e71f555dc8ad41744d4c16f9d2e1c541a7b", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { "owner": "NixOS", - "ref": "master", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -110,6 +126,7 @@ }, "root": { "inputs": { + "jellyfin": "jellyfin", "nix-minecraft": "nix-minecraft", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 3e74686..8ea7960 100644 --- a/flake.nix +++ b/flake.nix @@ -2,13 +2,14 @@ description = "Flake for server muffin"; inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:NixOS/nixpkgs/master"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; quadlet-nix.url = "github:SEIAROTg/quadlet-nix"; quadlet-nix.inputs.nixpkgs.follows = "nixpkgs"; + jellyfin.url = "github:NixOS/nixpkgs/pull/351966/head"; nix-minecraft.url = "github:Infinidoge/nix-minecraft"; nix-minecraft.inputs.nixpkgs.follows = "nixpkgs"; @@ -99,10 +100,12 @@ nixos-hardware.nixosModules.common-pc-ssd nixos-hardware.nixosModules.common-gpu-intel ( - { pkgs, ... }: + { pkgs, lib, ... }: { imports = [ nix-minecraft.nixosModules.minecraft-servers ]; - nixpkgs.overlays = [ nix-minecraft.overlay ]; + nixpkgs.overlays = [ + nix-minecraft.overlay + ]; } ) ]; diff --git a/services/jellyfin.nix b/services/jellyfin.nix index a98574f..ec071ee 100644 --- a/services/jellyfin.nix +++ b/services/jellyfin.nix @@ -2,6 +2,7 @@ pkgs, config, service_configs, + inputs, ... }: { @@ -16,6 +17,9 @@ # used for local streaming openFirewall = true; + # https://github.com/NixOS/nixpkgs/pull/351966 + # package = inputs.jellyfin.legacyPackages.${pkgs.system}.jellyfin; + dataDir = service_configs.jellyfin.dir; cacheDir = config.services.jellyfin.dataDir + "_cache"; }; diff --git a/services/minecraft.nix b/services/minecraft.nix index d65f917..c9dc551 100644 --- a/services/minecraft.nix +++ b/services/minecraft.nix @@ -41,13 +41,14 @@ in "mods" = pkgs.linkFarmFromDrvs "mods" ( builtins.attrValues { FabricApi = pkgs.fetchurl { - url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/WTaAx4ah/fabric-api-0.105.0%2B1.21.1.jar"; - sha512 = "6e1ffcf7f5af9589c16ccec1f9bb5ef8dede5ebe52ae09d94affa8050603f6ecd71d130a793c2bdb4bd42b2a70905425e55141d39369dfa9840569eef4dace16"; + url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/thGkUOxt/fabric-api-0.107.0%2B1.21.1.jar"; + sha512 = "04cf3f205c83882c7c741da392d10cbf9ab471fb44836d753f9673b7b37ddb9b2842cc8e72d6d7f36c48d121715f9f9dae8d20e597f2c0de3bb8abd37037baaa"; }; + # https://github.com/malte0811/FerriteCore/issues/164 # FerriteCore = pkgs.fetchurl { - # url = "https://cdn.modrinth.com/data/uXXizFIs/versions/wmIZ4wP4/ferritecore-7.0.0-fabric.jar"; - # sha512 = "0f2f9b5aebd71ef3064fc94df964296ac6ee8ea12221098b9df037bdcaaca7bccd473c981795f4d57ff3d49da3ef81f13a42566880b9f11dc64645e9c8ad5d4f"; + # url = "https://cdn.modrinth.com/data/uXXizFIs/versions/bwKMSBhn/ferritecore-7.0.2-hotfix-fabric.jar"; + # sha512 = "ca975bd3708cd96d30cf1447ac8883572113562eb2dd697e60c1cf382d6b70d0b1a511fcbfd042c51b2cf5d5ffc718b847f845e4c8a3e421e8c9ee741119a421"; # }; Lithium = pkgs.fetchurl { @@ -56,8 +57,8 @@ in }; NoChatReports = pkgs.fetchurl { - url = "https://cdn.modrinth.com/data/qQyHxfxd/versions/riMhCAII/NoChatReports-FABRIC-1.21-v2.8.0.jar"; - sha512 = "092837afc0fcb5208561062f8e4cd69971efa94c0180ae377e318d35d8f278abbf1552e4a577be882dc7e870f884779bc36caf808c8bc90bb05490f1e034ddb8"; + url = "https://cdn.modrinth.com/data/qQyHxfxd/versions/sOHvPS0X/NoChatReports-FABRIC-1.21.1-v2.9.0.jar"; + sha512 = "3326d278e57cc2d7bdb4348570c3876ed096af872e166241209ef5ac7c823829596a81570db029ac751e5a11b7686046f72119f259365350ca2eba10037f6d24"; }; krypton = pkgs.fetchurl { @@ -76,14 +77,19 @@ in }; moonrise = pkgs.fetchurl { - url = "https://cdn.modrinth.com/data/KOHu7RCS/versions/cYZu5wqk/Moonrise-Fabric-0.1.0-beta.4%2Be244c60.jar"; - sha512 = "e54f1072a7a037f75f990abfb8d34282a9c70c36e7eea2ecb6d1e0e5f127aa46c8f40345d661df49357e9adbe3850816b732b515d5821f49f114b06ddac91c07"; + url = "https://cdn.modrinth.com/data/KOHu7RCS/versions/1ZrRaRbq/Moonrise-Fabric-0.1.0-beta.8%2B68ea18b.jar"; + sha512 = "7510ce6a908d384031b8134c719a6e4f959f35cc9f7889a12f5fc2188937c61f84c916eff8639786fa2c3411141316802437b1cbc105e00dee0f6a8cc6d96b92"; }; mixintrace = pkgs.fetchurl { url = "https://cdn.modrinth.com/data/sGmHWmeL/versions/1.1.1%2B1.17/mixintrace-1.1.1%2B1.17.jar"; sha512 = "ea9034b60bc1c64629a9bcad2e619907692fe6e7464026236c55cc5a4892a20d21dd6318ad0380ab2ec245f7077939b6717d2ed58e00708c17470be14f5e0b5f"; }; + + better-fabric-console = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/Y8o1j1Sf/versions/6FB2l9zd/better-fabric-console-mc1.21.1-1.2.0.jar"; + sha512 = "3120f168a201a0d7eee55dc34788f0b1134754895d86ceca082f72b16902a00fc70ca05c73712b1d45bae8b74176af30a1821e636ba528f2abd60d94b1f35297"; + }; } ); };