options/custom/containers/oryx.nix

@@ -1,42 +0,0 @@
-{
-  config,
-  inputs,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.custom.containers.oryx;
-in {
-  options.custom.containers.oryx.enable = mkOption {default = false;};
-
-  config = mkIf cfg.enable {
-    age.secrets = let
-      secret = filename: {
-        file = "${inputs.self}/secrets/${filename}";
-      };
-    in {
-      "${config.custom.profile}/oryx/.env" = secret "${config.custom.profile}/oryx/.env";
-    };
-
-    #?? arion-oryx pull
-    environment.shellAliases.arion-oryx = "sudo arion --prebuilt-file ${config.virtualisation.arion.projects.oryx.settings.out.dockerComposeYaml}";
-
-    virtualisation.arion.projects.oryx.settings.services = {
-      oryx.service = {
-        container_name = "oryx";
-        env_file = [config.age.secrets."${config.custom.profile}/oryx/.env".path];
-        image = "ossrs/oryx:5";
-
-        ports = [
-          "127.0.0.1:2022:2022" # HTTP
-          "1935:1935" # RTMP
-          "8000:8000/udp" # WebRTC
-          "10080:10080/udp" # SRT
-        ];
-
-        restart = "unless-stopped";
-        volumes = ["${config.custom.containers.directory}/oryx/data:/data"];
-      };
-    };
-  };
-}

options/custom/desktops/niri/misc.nix

@@ -14,8 +14,6 @@ with lib; let
   rm = "${pkgs.coreutils}/bin/rm";
   sway-audio-idle-inhibit = "${pkgs.sway-audio-idle-inhibit}/bin/sway-audio-idle-inhibit";
   wallpaper = "${config.home-manager.users.${config.custom.username}.home.file.".local/bin/wallpaper".source}";
-  wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
-  xclip = "${pkgs.xclip}/bin/xclip";
 in {
   options.custom.desktops.niri.misc = {
     enable = mkOption {default = false;};
@@ -61,9 +59,6 @@ in {
             ]
             ++ optionals config.custom.wallpaper [
               {command = [wallpaper];}
-            ]
-            ++ optionals config.custom.desktops.niri.xwayland [
-              {command = [wl-paste "--watch" xclip "-selection" "clipboard"];} # Sync (X)wayland clipboard
             ];
 
           # https://github.com/sodiboo/niri-flake/blob/main/docs.md#programsnirisettingsswitch-eventslid-close

options/custom/programs/fish.nix

@@ -192,22 +192,13 @@ in {
           s = "ssh";
           si = "ssh -o KexAlgorithms=+diffie-hellman-group1-sha1 -o HostkeyAlgorithms=+ssh-rsa -o Ciphers=aes256-cbc";
 
-          t = "tailscale";
-          td = "sudo tailscale down";
-          te = "sudo tailscale exit-node";
-          ti = "tailscale ip --4";
-          tl = "sudo tailscale login";
-          tp = "tailscale ping";
-          ts = "tailscale status";
-          tss = "tailscale ssh";
-          tt = "sudo tailscale set";
-          tu = "sudo tailscale up";
-          tw = "sudo tailscale switch";
+          ta = "tmux attach";
+          td = "tmux detach";
+          tk = "tmux kill-session";
+          tl = "tmux list-sessions";
 
-          txa = "tmux attach";
-          txd = "tmux detach";
-          txk = "tmux kill-session";
-          txl = "tmux list-sessions";
+          ts = "tailscale";
+          tsip = "tailscale ip --4";
 
           w = "waydroid";
           wa = "waydroid app";

options/custom/services/caddy.nix

@@ -67,8 +67,6 @@ in {
       allowedUDPPorts = [
         3478 # TURN
         5349 # TURN
-        8000 # WebRTC
-        10080 # SRT
       ];
 
       allowedUDPPortRanges = [

profiles/server/default.nix

@@ -19,8 +19,7 @@
       mastodon.enable = true;
       netbox.enable = true;
       #// nextcloud.enable = true;
-      oryx.enable = true;
-      #// owncast.enable = true;
+      owncast.enable = true;
       #// redlib.enable = true;
       #// searxng.enable = true;
     };

secrets/secrets.nix

@@ -83,7 +83,6 @@ in {
   "server/netdata/parent.conf".publicKeys = server;
   "server/nextcloud/.env".publicKeys = server;
   "server/nextcloud/db.env".publicKeys = server;
-  "server/oryx/.env".publicKeys = server;
   "server/searxng/.env".publicKeys = server;
   "server/users/myned.pass".publicKeys = server;
   "server/users/root.pass".publicKeys = server;