diff options
| author | Linnea Gräf <nea@nea.moe> | 2025-07-10 21:17:53 +0200 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2025-07-10 21:17:53 +0200 |
| commit | e6ca40c5c01332667ef051b44c87ef2c2844ce6d (patch) | |
| tree | f50ff0ce964fd8788f71cce55734526250c15864 | |
| parent | 438f2474ca8da0316bf633bb097681f2f6c51672 (diff) | |
| download | nix-infra-e6ca40c5c01332667ef051b44c87ef2c2844ce6d.tar.gz nix-infra-e6ca40c5c01332667ef051b44c87ef2c2844ce6d.tar.bz2 nix-infra-e6ca40c5c01332667ef051b44c87ef2c2844ce6d.zip | |
snapshot: Do 10. Jul 21:17:53 CEST 2025
| -rw-r--r-- | srv/hadante/configuration.nix | 10 | ||||
| -rw-r--r-- | srv/hadante/fjordlauncher.nix | 20 |
2 files changed, 23 insertions, 7 deletions
diff --git a/srv/hadante/configuration.nix b/srv/hadante/configuration.nix index f016851..630e501 100644 --- a/srv/hadante/configuration.nix +++ b/srv/hadante/configuration.nix @@ -33,10 +33,9 @@ in }; }; config = { - - nixpkgs.overlays = [ - inputs.fjordlauncher.overlays.default - ]; + nixpkgs = { + config.allowUnfree = true; + }; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -147,8 +146,6 @@ in ]; }; users.defaultUserShell = pkgs.zsh; - - nixpkgs.config.allowUnfree = true; services.xserver.exportConfiguration = true; programs = { nh = { @@ -293,7 +290,6 @@ in reuse - fjordlauncher jdk8 jdk17 jdk21 diff --git a/srv/hadante/fjordlauncher.nix b/srv/hadante/fjordlauncher.nix new file mode 100644 index 0000000..912ccc5 --- /dev/null +++ b/srv/hadante/fjordlauncher.nix @@ -0,0 +1,20 @@ +{ inputs, pkgs, ... }: +{ + config = { + nix.settings = { + trusted-substituters = [ "https://unmojang.cachix.org" ]; + + trusted-public-keys = [ + "unmojang.cachix.org-1:OfHnbBNduZ6Smx9oNbLFbYyvOWSoxb2uPcnXPj4EDQY=" + ]; + }; + nixpkgs = { + overlays = [ + inputs.fjordlauncher.overlays.default + ]; + }; + environment.systemPackages = [ + pkgs.fjordlauncher + ]; + }; +} |