chore: merge remote-tracking branch 'refs/remotes/origin/master'

modules/core/default.nix

@@ -4,6 +4,8 @@
        [(import ./bootloader.nix)]
     ++ [(import ./docker.nix)]
     ++ [(import ./hardware.nix)]
+    ++ [(import ./displaylink.nix)]
+    # ++ [(import ./printing.nix)]
     # ++ [(import ./openrgb.nix)]
     ++ [(import ./xserver.nix)]
     ++ [(import ./network.nix)]

modules/core/printing.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }: {
+  services.avahi = {
+    enable = true;
+    nssmdns4 = true;
+    openFirewall = true;
+  };
+  environment.systemPackages = with pkgs; [
+    hplip
+    hplipWithPlugin
+  ];
+}

modules/core/system.nix

@@ -36,7 +36,19 @@
 
   # powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
-  time.timeZone = "Europe/Amsterdam";
   i18n.defaultLocale = "en_US.UTF-8";
+  i18n.supportedLocales = [
+    "en_US.UTF-8/UTF-8"
+    "ja_JP.UTF-8/UTF-8"
+  ];
+  
+  # Font packages
+  environment.systemPackages = with pkgs; [
+    noto-fonts-cjk-sans
+    noto-fonts-cjk-serif
+    ipaexfont
+  ];
+
+  time.timeZone = "Europe/Amsterdam";
   system.stateVersion = "24.05";
 }

modules/home/nfs.nix

@@ -1,7 +1,12 @@
 { ... }:
 {
-  fileSystems."/nfs" = {
+  fileSystems."/mnt" = {
     device = "harbour:/mnt/main/main_big";
     fsType = "nfs";
+    options = [
+      "rw"
+      # "uid=1000"
+      # "gid=100"
+    ];
   };
 }

modules/services/forgejo.nix

@@ -0,0 +1,55 @@
+{ lib, pkgs, config, ... }:
+let
+  cfg = config.services.forgejo;
+  srv = cfg.settings.server;
+in
+{
+  services.forgejo = {
+    enable = true;
+    # database.type = "postgres";
+    # Enable support for Git Large File Storage
+    lfs.enable = true;
+    settings = {
+      server = {
+        DOMAIN = "code.liv.town";
+        # You need to specify this to remove the port from URLs in the web UI.
+        ROOT_URL = "https://${srv.DOMAIN}/"; 
+        HTTP_PORT = 3050;
+      };
+      # You can temporarily allow registration to create an admin user.
+      service.DISABLE_REGISTRATION = true; 
+      # Add support for actions, based on act: https://github.com/nektos/act
+      actions = {
+        ENABLED = true;
+        DEFAULT_ACTIONS_URL = "github";
+      };
+      # Sending emails is completely optional
+      # You can send a test email from the web UI at:
+      # Profile Picture > Site Administration > Configuration >  Mailer Configuration 
+      # mailer = {
+      #   ENABLED = true;
+      #   SMTP_ADDR = "mail.example.com";
+      #   FROM = "noreply@${srv.DOMAIN}";
+      #   USER = "noreply@${srv.DOMAIN}";
+      # };
+    };
+    # mailerPasswordFile = config.age.secrets.forgejo-mailer-password.path;
+  };
+  services = {
+    nginx.virtualHosts."code.liv.town" = {
+      forceSSL = true;
+      sslCertificate = "/var/lib/acme/liv.town/cert.pem";
+      sslCertificateKey = "/var/lib/acme/liv.town/key.pem";
+      locations."/" = {
+        proxyPass = "http://localhost:3050";
+        proxyWebsockets = true;
+      };
+    };
+  };
+ # systemd.services.forgejo.preStart = let 
+ #   adminCmd = "${lib.getExe cfg.package} admin user";
+ #   user = "liv";
+ # in ''
+ #   ${adminCmd} create --admin --email "liv@liv.town" --username ${user} --password "boopbeepboop123123123" || true
+ # '';
+}

modules/services/jitsi-meet.nix

@@ -1,17 +1,27 @@
 { ... }:
 {
-  services.jitsi-meet = {
-    enable = true;
-    hostName = "meet.liv.town";
-    config = {
-      prejoinPageEnabled = true;
-      disableModeratorIndicator = true;
+  services = {
+    jitsi-meet = {
+      enable = true;
+      hostName = "meet.liv.town";
+      prosody.lockdown = true;
+      config = {
+        enableWelcomePage = false;
+        prejoinPageEnabled = true;
+      };
+      interfaceConfig = {
+        SHOW_JITSI_WATERMARK = false;
+        SHOW_WATERMARK_FOR_GUESTS = false;
+      };
     };
-    interfaceConfig = {
-      SHOW_JITSI_WATERMARK = false;
+    nginx.virtualHosts."meet.liv.town" = {
+      forceSSL = true;
+      sslCertificate = "/var/lib/acme/liv.town/cert.pem";
+      sslCertificateKey = "/var/lib/acme/liv.town/key.pem";
+      locations."/" = {
+        proxyPass = "http://localhost:8080";
+        proxyWebsockets = true;
+      };
     };
-    jibri.enable = false;
   };
-
-  services.jitsi-videobridge.openFirewall = true;
 }

modules/services/ntfy.nix

@@ -10,6 +10,9 @@ in {
         base-url = url;
         listen-http = "127.0.0.1:${toString port}";
         behind-proxy = true;
+        visitor-attachment-daily-bandwidth-limit = "10M";
+        visitor-request-limit-burst = 5;
+        visitor-request-limit-replenish = "15s";
       };
     };
     nginx.virtualHosts.${hostname} = {

modules/services/violet.nix

@@ -18,7 +18,6 @@
     ++ [(import ./lidarr.nix)]
     # ++ [(import ./scrutiny.nix)]
     # ++ [(import ./jitsi-meet.nix)]
-    # ++ [(import ./nextcloud.nix)]
+    ++ [(import ./forgejo.nix)]
     ++ [(import ./matrix/default.nix)];
-    # ++ [(import ./tmux.nix)];
 }