merge changes from main

10 files changed, 44 insertions, 7 deletions

diff --git a/modules/services/system/audio.nix b/modules/services/nixos/audio.nix
index 93f8289..273f1a4 100644
--- a/modules/services/system/audio.nix
+++ b/modules/services/nixos/audio.nix
@@ -7,7 +7,7 @@
   cfg = config.collinux.services.audio;
 in
   lib.mkIf cfg.enable {
-    security.rtkit.enable = true;
+    security.rtkit.enable = false;
     services.pipewire = {
       enable = true;
       wireplumber.enable = true;
diff --git a/modules/services/system/bluetooth.nix b/modules/services/nixos/bluetooth.nix
index a86b5b3..a86b5b3 100644
--- a/modules/services/system/bluetooth.nix
+++ b/modules/services/nixos/bluetooth.nix
diff --git a/modules/services/system/default.nix b/modules/services/nixos/default.nix
index b9ae4c7..d177b88 100644
--- a/modules/services/system/default.nix
+++ b/modules/services/nixos/default.nix
@@ -4,5 +4,6 @@
     ./audio.nix
     ./bluetooth.nix
     ./tailscale.nix
+    ./selfhost
   ];
 }
diff --git a/modules/services/system/networking/default.nix b/modules/services/nixos/networking/default.nix
index 68c794c..68c794c 100644
--- a/modules/services/system/networking/default.nix
+++ b/modules/services/nixos/networking/default.nix
diff --git a/modules/services/system/networking/iwd.nix b/modules/services/nixos/networking/iwd.nix
index d081792..441498d 100644
--- a/modules/services/system/networking/iwd.nix
+++ b/modules/services/nixos/networking/iwd.nix
@@ -23,4 +23,5 @@ in
       useDHCP = false;
       networkmanager.enable = false;
     };
+    systemd.network.enable = lib.mkForce false;
   }
diff --git a/modules/services/system/networking/networkmanager.nix b/modules/services/nixos/networking/networkmanager.nix
index f22f922..f22f922 100644
--- a/modules/services/system/networking/networkmanager.nix
+++ b/modules/services/nixos/networking/networkmanager.nix
diff --git a/modules/services/nixos/selfhost/default.nix b/modules/services/nixos/selfhost/default.nix
new file mode 100644
index 0000000..d3b884a
--- /dev/null
+++ b/modules/services/nixos/selfhost/default.nix
@@ -0,0 +1,11 @@
+{
+  lib,
+  config,
+  ...
+}: {
+  imports = [
+    ./navidrome.nix
+  ];
+
+  qt.style = lib.optionalAttrs (config.collinux.theme == "adwaita") {name = "adwaita-dark";};
+}
diff --git a/modules/services/nixos/selfhost/navidrome.nix b/modules/services/nixos/selfhost/navidrome.nix
new file mode 100644
index 0000000..5250b85
--- /dev/null
+++ b/modules/services/nixos/selfhost/navidrome.nix
@@ -0,0 +1,19 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  cfg = config.collinux.services.selfhost.navidrome;
+in
+  lib.mkIf cfg.enable {
+    services.navidrome = {
+      enable = true;
+      inherit (cfg) user;
+      settings = {
+        Port = 4533;
+        Address = "0.0.0.0";
+        EnableInsightsCollector = false;
+        MusicFolder = "/home/${cfg.user}/Music";
+      };
+    };
+  }
diff --git a/modules/services/system/tailscale.nix b/modules/services/nixos/tailscale.nix
index 3fbd691..3fbd691 100644
--- a/modules/services/system/tailscale.nix
+++ b/modules/services/nixos/tailscale.nix
diff --git a/modules/services/options.nix b/modules/services/options.nix
index ddf6f58..b887395 100644
--- a/modules/services/options.nix
+++ b/modules/services/options.nix
@@ -11,12 +11,7 @@ in {
         enable = mkEnableOption "wifi";
         iwd.enable = mkEnableOption "lightweight wifi daemon";
         networkmanager.enable = mkEnableOption "heavier wifi daemon";
-        tailscale = {
-          enable = mkEnableOption "tailscale";
-          authKeyFile = mkOption {
-            type = "path";
-          };
-        };
+        tailscale.enable = mkEnableOption "tailscale";
       };
       audio = {
         enable = mkEnableOption "pipewire + wireplumber";
@@ -28,6 +23,16 @@ in {
         blueman.enable = mkEnableOption "graphical bluetooth manager";
         bluetuith.enable = mkEnableOption "terminal bluetooth manager";
       };
+
+      selfhost = {
+        navidrome = {
+          enable = mkEnableOption "navidrome music server";
+          user = mkOption {
+            description = "user to run the service as";
+            default = config.collinux.user.name;
+          };
+        };
+      };
     };
   };