bullets

5 files changed, 52 insertions, 23 deletions

diff --git a/modules/services/nixos/copyparty.nix b/modules/services/nixos/copyparty.nix
index cb83cf0..23363a7 100644
--- a/modules/services/nixos/copyparty.nix
+++ b/modules/services/nixos/copyparty.nix
@@ -26,6 +26,7 @@ in {
         rproxy = "1";
         tls = false;
 
+        name = "files@ganymede";
         usernames = true;
         no-robots = true;
         chmod-d = "775";
diff --git a/modules/services/nixos/default.nix b/modules/services/nixos/default.nix
index 2883629..44d0d7f 100644
--- a/modules/services/nixos/default.nix
+++ b/modules/services/nixos/default.nix
@@ -1,14 +1,15 @@
 {
   imports = [
-    ./mopidy.nix
+    # ./mopidy.nix
     ./forgejo.nix
     ./cgit
     ./openssh.nix
     # ./jellyfin.nix
+    ./polaris.nix
     ./caddy.nix
     ./goaccess.nix
 
     ./copyparty.nix
-    ./ngircd.nix
+    # ./ngircd.nix
   ];
 }
diff --git a/modules/services/nixos/polaris.nix b/modules/services/nixos/polaris.nix
new file mode 100644
index 0000000..89f5ef3
--- /dev/null
+++ b/modules/services/nixos/polaris.nix
@@ -0,0 +1,26 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.collinux.services.polaris;
+in {
+  imports = [
+    (import ./mkCaddyCfg.nix cfg)
+  ];
+
+  config = lib.mkIf cfg.enable {
+    services.polaris = {
+      enable = true;
+      port = cfg.port;
+      settings = {
+        mount_dirs = [
+          {
+            name = "Ganymede Library";
+            source = "/media/library/music";
+          }
+        ];
+      };
+    };
+  };
+}
diff --git a/modules/services/options.nix b/modules/services/options.nix
index aacdee9..0e250ed 100644
--- a/modules/services/options.nix
+++ b/modules/services/options.nix
@@ -74,13 +74,18 @@ in {
 
       cgit.enable = mkEnableOption "cgit web git frontend";
 
-      mopidy = {
-        enable = mkEnableOption "Mopidy MPD server";
-        port = mkOption {
-          description = "port to run the service on";
-          type = lib.types.port;
-          default = 6600;
-        };
+      # mopidy = {
+      #   enable = mkEnableOption "Mopidy MPD server";
+      #   port = mkOption {
+      #     description = "port to run the service on";
+      #     type = lib.types.port;
+      #     default = 6600;
+      #   };
+      # };
+
+      polaris = selfhostOptions {
+        service_name = "polaris";
+        default_port = 8079;
       };
 
       copyparty =
diff --git a/modules/system/nixos/networking/networkd.nix b/modules/system/nixos/networking/networkd.nix
index 37b0908..d0e9eed 100644
--- a/modules/system/nixos/networking/networkd.nix
+++ b/modules/system/nixos/networking/networkd.nix
@@ -38,20 +38,16 @@ in
       networks."11-lan" = {
         name = "wl*";
 
-        networkConfig =
-          (
-            if dhcp_enabled
-            then {DHCP = "yes";}
-            else {
-              Address = cfg.static.ip;
-              Gateway = cfg.static.gateway;
-              DHCP = "no";
-              # DNS is managed by systemd-resolved (not specified here)
-            }
-          )
-          // {
-            LinkLocalAddressing = "no";
-          };
+        networkConfig = (
+          if dhcp_enabled
+          then {DHCP = "yes";}
+          else {
+            Address = cfg.static.ip;
+            Gateway = cfg.static.gateway;
+            DHCP = "no";
+            # DNS is managed by systemd-resolved (not specified here)
+          }
+        );
 
         dhcpV4Config.UseDNS = "no";
         dhcpV6Config.UseDNS = "no";