Merge branch 'main' of ssh://mizuki.guru/imnyang/nix-flakes

hosts/machine/ena/configuration.nix

@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   inputs,
   ...
 }:
@@ -26,16 +27,14 @@
     "${inputs.self}/modules/mizukios/features/remote/ssh.nix"
   ];
 
+  catppuccin.flavor = lib.mkForce "mocha";
+
   networking = {
     hostName = "ena";
     networkmanager.enable = true;
     firewall.enable = false;
   };
 
-  networking.networkmanager.plugins = [
-    pkgs.networkmanager-ssh
-  ];
-
   services.printing.enable = true;
   services.power-profiles-daemon.enable = true;
   services.asusd.enable = true;

hosts/machine/ena/home/config/plasma.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ inputs, lib, ... }:
 let
   assets = "${inputs.self}/assets";
 in
@@ -9,6 +9,8 @@ in
     theme = "pjsk-cursor-n25-ena-ani";
   };
 
+  programs.plasma.workspace.colorScheme = lib.mkForce "KawaDark";
+
   programs.plasma.workspace.wallpaper = "${assets}/wallpaper/wallpaper1.jpg";
 
   programs.plasma.kscreenlocker.appearance.wallpaper = "${assets}/wallpaper/wallpaper3.png";

hosts/machine/ena/home/default.nix

@@ -20,17 +20,6 @@
 
   xdg.configFile."fontconfig/conf.d/10-hm-fonts.conf".force = true;
 
-  programs.vicinae = {
-    enable = true;
-    systemd = {
-      enable = true;
-      autoStart = true;
-      environment = {
-        USE_LAYER_SHELL = 1;
-      };
-    };
-  };
-
   imports = [
     "${inputs.self}/modules/home/devtool/git.nix"
     "${inputs.self}/modules/home/devtool/neovim.nix"
@@ -40,6 +29,9 @@
     "${inputs.self}/modules/home/discord/linux.nix"
     "${inputs.self}/modules/home/devtool/vscode.nix"
     "${inputs.self}/modules/home/devtool/ciscopackettracer.nix"
+    "${inputs.self}/modules/home/ssh.nix"
+    "${inputs.self}/modules/home/vicinae.nix"
+
     ./config/shell.nix
     ./config/plasma.nix
   ];

hosts/machine/mafuyu/configuration.nix

@@ -23,6 +23,19 @@
 
   services.caddy = {
     enable = true;
+    virtualHosts."broadcast.epc.mizuki.guru".extraConfig = ''
+      @authApi path /api/auth /api/auth/*
+      handle @authApi {
+        reverse_proxy 127.0.0.1:1234
+      }
+
+      @backendApi path /api /api/*
+      handle @backendApi {
+        reverse_proxy 127.0.0.1:1108
+      }
+
+      reverse_proxy 127.0.0.1:1234
+    '';
     virtualHosts."http://broadcast.epc.mizuki.arpa".extraConfig = ''
       @preflight method OPTIONS
 
@@ -36,6 +49,19 @@
 
       reverse_proxy 127.0.0.1:6769
     '';
+    virtualHosts."https://broadcast.epc.mizuki.guru:30427".extraConfig = ''
+      @preflight method OPTIONS
+
+      header {
+        Access-Control-Allow-Origin *
+        Access-Control-Allow-Methods "GET, POST, PUT, PATCH, DELETE, OPTIONS"
+        Access-Control-Allow-Headers *
+      }
+
+      respond @preflight "" 204
+
+      reverse_proxy 127.0.0.1:6769
+    '';
     virtualHosts."http://broadcast.epc.mizuki.arpa:8027".extraConfig = ''
       @preflight method OPTIONS
 

hosts/machine/mizuki/home/default.nix

@@ -18,30 +18,6 @@
     VISUAL = "nvim";
   };
 
-  programs.ssh = {
-    enable = true;
-    matchBlocks = {
-      "*" = {
-        forwardAgent = false;
-        identityAgent = "~/.1password/agent.sock";
-        setEnv = {
-          TERM = "xterm-256color";
-        };
-        extraOptions = {
-          ServerAliveInterval = "0";
-          ServerAliveCountMax = "3";
-          Compression = "no";
-          AddKeysToAgent = "no";
-          HashKnownHosts = "no";
-          UserKnownHostsFile = "~/.ssh/known_hosts";
-          ControlMaster = "no";
-          ControlPath = "~/.ssh/master-%r@%n:%p";
-          ControlPersist = "no";
-        };
-      };
-    };
-  };
-
   xdg.configFile."fontconfig/conf.d/10-hm-fonts.conf".force = true;
 
   imports = [
@@ -58,5 +34,6 @@
     "${inputs.self}/modules/home/obs-studio.nix"
     "${inputs.self}/modules/home/devtool/vscode.nix"
     "${inputs.self}/modules/home/devtool/ciscopackettracer.nix"
+    "${inputs.self}/modules/home/ssh.nix"
   ];
 }