idk conduit und ricing und caddyfile

flake.nix

@@ -94,7 +94,7 @@
             lib,
             ...
           }: {
-            services.proxmox-ve.enable = true;
+            services.proxmox-ve.enable = false;
             nixpkgs.overlays = [
               proxmox-nixos.overlays.${system}
             ];

home/config-files/hyprland.conf

@@ -19,10 +19,10 @@ exec-once = waybar & swww init & mako & kwalletd6 & nextcloud
 
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
-    kb_layout = us 
+    kb_layout = us,de 
     kb_variant =
     kb_model =
-    kb_options =
+    kb_options = grp:win_space_toggle
     kb_rules =
 
     follow_mouse = 1

home/modules/foot.nix

@@ -12,15 +12,15 @@
       };
 
       cursor = {
-	blink = "yes";
+        blink = "yes";
       };
 
       mouse = {
-	hide-when-typing = "yes";
+        hide-when-typing = "yes";
       };
 
       colors = {
-	alpha = 0.8;
+        alpha = 0.8;
         foreground = "cdd6f4";
         background = "1e1e2e";
 

home/modules/wm.nix

@@ -15,60 +15,64 @@
     extraConfig = builtins.readFile ../config-files/hyprland.conf;
   };
 
-  programs.waybar = /* lib.mkIf (pkgs.system == "x86_64-linux") */ {
+  programs.waybar =
-    enable = true;
+    /*
-    settings = {
+    lib.mkIf (pkgs.system == "x86_64-linux")
-      mainBar = {
+    */
-        layer = "top";
+    {
-        position = "top";
+      enable = true;
-        height = 30;
+      settings = {
-        # modules-left = ["wlr/workspaces"];
+        mainBar = {
-        #modules-center = [ "hyprland/window" ];
+          layer = "top";
-        modules-center = ["hyprland/workspaces" "tray" "network" "battery" "battery#bat2" "battery#bat3" "clock"];
+          position = "top";
-        "tray" = {"icon-size" = 21;};
+          height = 30;
-        "network" = {
+          # modules-left = ["wlr/workspaces"];
-          "format-wifi" = "NET: {essid} ({signalStrength}%) ";
+          #modules-center = [ "hyprland/window" ];
-          "format-ethernet" = "{ifname} ";
+          modules-center = ["hyprland/workspaces" "tray" "network" "battery" "battery#bat2" "battery#bat3" "clock"];
-          "format-disconnected" = "";
+          "tray" = {"icon-size" = 21;};
-          "max-length" = 50;
+          "network" = {
-        };
+            "format-wifi" = "NET: {essid} ({signalStrength}%) ";
-        "battery" = {
+            "format-ethernet" = "{ifname} ";
-          "bat" = "BAT0";
+            "format-disconnected" = "";
-          "interval" = 10;
+            "max-length" = 50;
-          "states" = {
-            "warning" = 30;
-            "critical" = 15;
           };
-          "format" = " BAT IN: {capacity}%";
+          "battery" = {
-          #"format-icons" = ''["", "", "", "", ""]'';
+            "bat" = "BAT0";
-          "max-length" = 25;
+            "interval" = 10;
-        };
+            "states" = {
-        "battery#bat2" = {
+              "warning" = 30;
-          "bat" = "BAT1";
+              "critical" = 15;
-          "interval" = 10;
+            };
-          "states" = {
+            "format" = " BAT IN: {capacity}%";
-            "warning" = 30;
+            #"format-icons" = ''["", "", "", "", ""]'';
-            "critical" = 15;
+            "max-length" = 25;
           };
-          "format" = " BAT EX: {capacity}%";
+          "battery#bat2" = {
-          #"format-icons" = ''["", "", "", "", ""]'';
+            "bat" = "BAT1";
-          "max-length" = 25;
+            "interval" = 10;
-        };
+            "states" = {
-        "battery#bat3" = {
+              "warning" = 30;
-          "bat" = "macsmc-battery";
+              "critical" = 15;
-          "interval" = 10;
+            };
-          "states" = {
+            "format" = " BAT EX: {capacity}%";
-            "warning" = 30;
+            #"format-icons" = ''["", "", "", "", ""]'';
-            "critical" = 15;
+            "max-length" = 25;
+          };
+          "battery#bat3" = {
+            "bat" = "macsmc-battery";
+            "interval" = 10;
+            "states" = {
+              "warning" = 30;
+              "critical" = 15;
+            };
+            "format" = " BAT: {capacity}%";
+            #"format-icons" = ''["", "", "", "", ""]'';
+            "max-length" = 25;
           };
-          "format" = " BAT: {capacity}%";
-          #"format-icons" = ''["", "", "", "", ""]'';
-          "max-length" = 25;
         };
       };
+      style = builtins.readFile ../config-files/waybar-mocha.css;
     };
-    style = builtins.readFile ../config-files/waybar-mocha.css;
-  };
 
   services.mako = {
     enable = true;

hosts/x86_64-linux/beleth/conduit.nix

@@ -0,0 +1,26 @@
+{
+  config,
+  lib,
+  inputs,
+  ...
+}: {
+  services.matrix-conduit = {
+    enable = true;
+    settings = {
+      global = {
+        server_name = "matrix.heroin.trade";
+        allow_federation = true;
+        allow_encryption = true;
+        allow_registration = false;
+        max_request_size = 20000000;
+        port = 6167;
+        database_backend = "sqlite";
+      };
+      extraEnvironment = {
+        CONDUIT_MAX_CONCURRENT_REQUESTS = "100";
+      };
+    };
+  };
+
+  networking.firewall.allowedTCPPorts = [config.services.matrix-conduit.settings.global.port];
+}

hosts/x86_64-linux/beleth/default.nix

@@ -15,6 +15,7 @@ with lib; {
     ./fail2ban.nix
     ./lanrarari.nix
     # ./hydra.nix
+    ./conduit.nix
     ./uptime.nix
     ./networking.nix
     ./git.nix
@@ -44,6 +45,11 @@ with lib; {
                file_server
         '';
       };
+      "matrix.heroin.trade" = {
+        extraConfig = ''
+          reverse_proxy /_matrix/* 127.0.0.1:${builtins.toString config.services.matrix-conduit.settings.global.port}
+        '';
+      };
       "hydra.heroin.trade" = {
         extraConfig = ''
           reverse_proxy http://localhost:${builtins.toString config.services.hydra.port}
@@ -123,6 +129,12 @@ with lib; {
           reverse_proxy http://127.0.0.1:8085
         '';
       };
+      "marie.software" = {
+	extraConfig = ''
+	  root * /var/www/marie-website/
+	  file_server
+	'';
+      };
       "servers" = {
         extraConfig = ''
           metrics
@@ -169,6 +181,18 @@ with lib; {
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJYa+LoHGGvu12iBufUcr3GD8tsq4LuJdwLjaDkTr0SL xqtc@lilith"
     ];
   };
+
+  users.users.marie = {
+    isNormalUser = true;
+    packages = with pkgs; [
+      git
+      wget
+    ];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN0mGd4YS4f3Wy+a4PBXbie42C5Qo4H0uWsN7joaK27h marie@titania"
+    ];
+  };
+
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJTLJqIVwnqFO64rnc66d234TFOdFXpDS9fJUA4/f4in xqtc@alastor"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7UkcmSVo+SeB5Obevz3mf3UHruYxn0UHUzoOs2gDBy xqtc@asmodeus"

hosts/x86_64-linux/beleth/networking.nix

@@ -11,16 +11,16 @@
   # networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
   networking = {
- #    bridges = {
+    #    bridges = {
- #      vmbr0 = {
+    #      vmbr0 = {
-	# interfaces = [ "enp0s31f6" ];
+    # interfaces = [ "enp0s31f6" ];
- #      };
+    #      };
- #    };
+    #    };
     # useDhCP = lib.mkDefault true;
     interfaces = {
- #      vmbr0 = {
+      #      vmbr0 = {
-	# useDHCP = lib.mkDefault true;
+      # useDHCP = lib.mkDefault true;
- #      };
+      #      };
       enp0s31f6 = {
         ipv4 = {
           addresses = [