From 1e6fa71a53a0d561eef71ffd2c4060f85fb43e31 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Sun, 17 Nov 2024 00:17:25 -0500
Subject: [PATCH] update

---
 configuration.nix      | 14 --------------
 flake.lock             | 18 +++++++++---------
 services/jellyfin.nix  |  5 ++---
 services/minecraft.nix |  5 +++++
 services/soulseek.nix  | 14 --------------
 5 files changed, 16 insertions(+), 40 deletions(-)
 delete mode 100644 services/soulseek.nix

diff --git a/configuration.nix b/configuration.nix
index 2a93976..2b9c310 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -13,11 +13,9 @@
     ./hardware.nix
     ./services/jellyfin.nix
     ./services/caddy.nix
-    # ./services/quadlet.nix
     ./services/immich.nix
     ./services/gitea.nix
     ./services/minecraft.nix
-    # ./services/soulseek.nix
     ./services/wg.nix
     ./services/qbittorrent.nix
     ./services/bitmagnet.nix
@@ -236,24 +234,12 @@
     };
   };
 
-  virtualisation = {
-    containers.enable = true;
-    podman = {
-      enable = true;
-
-      # Required for containers under podman-compose to be able to talk to each other.
-      defaultNetwork.settings.dns_enabled = true;
-    };
-  };
-
   users.users.${username} = {
     isNormalUser = true;
     extraGroups = [
       "wheel"
       "video"
       "render"
-
-      "minecraft"
     ];
     hashedPasswordFile = "/etc/nixos/secrets/hashedPass";
 
diff --git a/flake.lock b/flake.lock
index 2b0c2b4..7e31cf5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731548755,
-        "narHash": "sha256-kFg3S67OaYWI1SQ0tcmsPIC4PXtq7Av8AJcyf21ZxDE=",
+        "lastModified": 1731808593,
+        "narHash": "sha256-dyMU//DLz1Zs1bl7jAZA6d68bXCRzTYim4JyrLFfqME=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "e6f7090175ae5183d84adb6192f115d8f859beaa",
+        "rev": "ada86c417801a44c32b59374b1e0b3141826291a",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1731403644,
-        "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
+        "lastModified": 1731797098,
+        "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "f6581f1c3b137086e42a08a906bdada63045f991",
+        "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
         "type": "github"
       },
       "original": {
@@ -74,11 +74,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731682847,
-        "narHash": "sha256-6O0APLMLj/Zp2iDQVUVDiVTMWC1XC3TcVHuufzZ0dS0=",
+        "lastModified": 1731816655,
+        "narHash": "sha256-55e1JMAuYvHZs9EICprWgJ4RmaWwDuSjzJ5K7S7zb6w=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a8eb04832bed6c5cee8cd2d148a77644c5a4197f",
+        "rev": "0a14706530dcb90acecb81ce0da219d88baaae75",
         "type": "github"
       },
       "original": {
diff --git a/services/jellyfin.nix b/services/jellyfin.nix
index 0139add..485f900 100644
--- a/services/jellyfin.nix
+++ b/services/jellyfin.nix
@@ -2,7 +2,6 @@
   pkgs,
   config,
   service_configs,
-  inputs,
   username,
   ...
 }:
@@ -13,13 +12,13 @@
     jellyfin-ffmpeg
   ];
 
-  services.jellyfin = {
+  services.jellyfin = rec {
     enable = true;
     # used for local streaming
     openFirewall = true;
 
     dataDir = service_configs.jellyfin.dir;
-    cacheDir = config.services.jellyfin.dataDir + "_cache";
+    cacheDir = dataDir + "_cache";
   };
 
   users.users.${config.services.jellyfin.user}.extraGroups = [
diff --git a/services/minecraft.nix b/services/minecraft.nix
index f18952d..557d225 100644
--- a/services/minecraft.nix
+++ b/services/minecraft.nix
@@ -2,6 +2,7 @@
   pkgs,
   service_configs,
   lib,
+  username,
   ...
 }:
 let
@@ -104,4 +105,8 @@ in
       };
     };
   };
+
+  users.users.${username}.extraGroups = [
+    "minecraft"
+  ];
 }
diff --git a/services/soulseek.nix b/services/soulseek.nix
deleted file mode 100644
index e3a4934..0000000
--- a/services/soulseek.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-{
-  services.slskd = {
-    enable = true;
-    openFirewall = true;
-    domain = "www.gardling.com";
-
-    settings = {
-      shares = {
-        directories = [ "/tank/music" ];
-      };
-    };
-  };
-}