From 9faff5e0bee5718a5825cef2604a4e81ddcbd0e0 Mon Sep 17 00:00:00 2001 From: azahi Date: Mon, 6 Jan 2025 23:21:56 +0300 Subject: 2025-01-06 --- configurations/eonwe/default.nix | 23 ++++++++++++++++-- configurations/eonwe/vidya.nix | 44 ++++++++++++++++----------------- configurations/yavanna/default.nix | 50 ++++++++++++++++++++++++++++++++------ 3 files changed, 84 insertions(+), 33 deletions(-) (limited to 'configurations') diff --git a/configurations/eonwe/default.nix b/configurations/eonwe/default.nix index 875f737..68cfac4 100644 --- a/configurations/eonwe/default.nix +++ b/configurations/eonwe/default.nix @@ -277,6 +277,17 @@ with lib; # [1]: https://github.com/nix-community/impermanence/issues/22 # [1]: https://github.com/NixOS/nixpkgs/pull/86967#pullrequestreview-667929259 "/home/${my.username}".neededForBoot = true; + + "/mnt/ydata/music" = { + device = "yavanna.shire.net:/export/music"; + fsType = "nfs"; + options = [ + "ro" + "noauto" + "x-systemd.automount" + "x-systemd.idle-timeout=${5 * 60 |> toString}" + ]; + }; }; zramSwap = { @@ -284,7 +295,10 @@ with lib; memoryPercent = 50; }; - my.extraGroups = [ "corectrl" ]; + my.extraGroups = [ + "corectrl" + config.nixfiles.modules.piracy.group + ]; users = { users.builder = { @@ -295,7 +309,12 @@ with lib; ]; useDefaultShell = true; }; - groups.builder = { }; + groups = { + builder = { }; + piracy = { + inherit (config.nixfiles.modules.piracy) gid; + }; + }; }; nix.settings.trusted-users = [ "builder" ]; diff --git a/configurations/eonwe/vidya.nix b/configurations/eonwe/vidya.nix index a40daa9..0cde57a 100644 --- a/configurations/eonwe/vidya.nix +++ b/configurations/eonwe/vidya.nix @@ -10,34 +10,32 @@ games = { lutris.enable = true; - steam.enable = true; - steam-run.quirks = { - blackIsleStudios = true; - cryptOfTheNecrodancer = true; - mountAndBladeWarband = false; - }; - - minecraft.client.enable = true; + # steam-run.quirks = { + # blackIsleStudios = true; + # cryptOfTheNecrodancer = true; + # mountAndBladeWarband = false; + # }; + # minecraft.client.enable = true; }; }; hm.home.packages = with pkgs; [ - (crawl.override { tileMode = true; }) - (dwarf-fortress-packages.dwarf-fortress-full.override { - dfVersion = "50.13"; - theme = "cla"; - enableIntro = false; - enableFPS = true; - }) - fallout-ce - fallout2-ce - gzdoom - openmw - openttd - qzdl - r2modman + # (crawl.override { tileMode = true; }) + # (dwarf-fortress-packages.dwarf-fortress-full.override { + # dfVersion = "50.13"; + # theme = "cla"; + # enableIntro = false; + # enableFPS = true; + # }) + # fallout-ce + # fallout2-ce + # gzdoom + # openmw + # openttd + # qzdl + # r2modman + # xonotic vcmi - xonotic ]; } diff --git a/configurations/yavanna/default.nix b/configurations/yavanna/default.nix index b9de05e..b827dd9 100644 --- a/configurations/yavanna/default.nix +++ b/configurations/yavanna/default.nix @@ -1,4 +1,9 @@ -_: { +{ + config, + lib, + ... +}: +{ nixfiles.modules = { wireguard.client.enable = true; @@ -6,9 +11,31 @@ _: { acme.enable = true; - rtorrent.enable = true; - lidarr.enable = true; - jackett.enable = true; + piracy = { + enable = true; + lidarr.enable = true; + radarr.enable = false; + sonarr.enable = false; + }; + }; + + services.nfs.server = { + enable = true; + exports = + lib.concatMapStringsSep "\n" + ( + dir: + let + target = s: "${s}(insecure,ro,no_subtree_check)"; + v4 = target config.nixfiles.modules.wireguard.ipv4.subnet; + v6 = target config.nixfiles.modules.wireguard.ipv6.subnet; + in + "${dir} ${v4} ${v6}" + ) + [ + "/export/rtorrent" + "/export/music" + ]; }; boot.loader.grub = { @@ -17,10 +44,17 @@ _: { configurationLimit = 5; }; - fileSystems."/" = { - device = "/dev/sda2"; - fsType = "ext4"; - options = [ "noatime" ]; + fileSystems = { + "/" = { + device = "/dev/sda2"; + fsType = "ext4"; + options = [ "noatime" ]; + }; + + "/export/music" = { + device = "/var/lib/lidarr/root"; + options = [ "bind" ]; + }; }; swapDevices = [ { device = "/dev/sda3"; } ]; -- cgit 1.4.1