fix: wireguard status for waybar

system/dev/dn-pre7780/boot.nix

@@ -1,10 +1,8 @@
 {
   pkgs,
-  settings,
   config,
   ...
 }:
-
 {
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
@@ -25,36 +23,31 @@
     ];
   };
 
-  users.groups.windows = {
-    gid = 1200;
-    members = [ settings.personal.username ];
-  };
-
   fileSystems."/mnt/windows" = {
     enable = true;
     device = "/dev/disk/by-uuid/460237D00237C429";
     fsType = "ntfs-3g";
     options = [
+      "uid=1000"
+      "gid=100"
+      "umask=000"
       "nofail"
       "users"
-      "uid=992"
-      "gid=${builtins.toString config.users.groups.windows.gid}"
-      "dmask=007"
-      "fmask=007"
+      "exec"
     ];
   };
 
-  fileSystems."/mnt/nextcloud" = {
-    enable = true;
-    depends = [ "/mnt/windows" ];
-    device = "/mnt/windows/Linux/nextcloud";
-
-    fsType = "none";
-    options = [
-      "nofail"
-      "bind"
-    ];
-  };
+  # fileSystems."/mnt/nextcloud" = {
+  #   enable = true;
+  #   depends = [ "/mnt/windows" ];
+  #   device = "/mnt/windows/Linux/nextcloud";
+  #
+  #   fsType = "none";
+  #   options = [
+  #     "nofail"
+  #     "bind"
+  #   ];
+  # };
 
   boot.supportedFilesystems = [ "ntfs" ];
   boot.loader.systemd-boot.enable = true;

system/dev/dn-pre7780/default.nix

@@ -13,17 +13,19 @@
     ./hardware-configuration.nix
     ./boot.nix
     ./sops-conf.nix
-    ./nginx.nix
+    # ./nginx.nix
     ../../modules/presets/basic.nix
     ../../modules/gaming.nix
     ../../modules/secure-boot.nix
     ../../modules/virtualization.nix
     ../../modules/wine.nix
     ../../modules/wireguard.nix
-    (import ../../modules/nextcloud.nix {
-      hostname = "pre-nextcloud.net.dn";
-      datadir = "/mnt/nextcloud";
-    })
+    (import ../../modules/rustdesk-server.nix { relayHosts = [ "10.0.0.0/24" ]; })
+    # (import ../../modules/nextcloud.nix {
+    #   hostname = "192.168.0.3";
+    #   datadir = "/mnt/nextcloud";
+    #   https = false;
+    # })
   ];
 
   home-manager = {
@@ -38,19 +40,16 @@
     };
   };
 
-  # Disable integrated bluetooth adapter
-  services.udev.extraRules = ''
-    SUBSYSTEM=="usb", ATTRS{idVendor}=="8087", ATTRS{idProduct}=="0033", ATTR{authorized}="0"
-  '';
-
   environment.systemPackages = with pkgs; [
     prismlauncher
+    heroic
   ];
 
   users.users = {
     "${settings.personal.username}".openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJFQA42R3fZmjb9QnUgzzOTIXQBC+D2ravE/ZLvdjoOQ danny@lap.dn"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILSHkPa6vmr5WBPXAazY16+Ph1Mqv9E24uLIf32oC2oH danny@phone.dn"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMj/LeB3i/vca3YwGNpAjf922FgiY2svro48fUSQAjOv Shortcuts on :D"
     ];
   };
 }

system/modules/nextcloud.nix

@@ -3,6 +3,7 @@
   datadir ? null,
   dataBackupPath ? null,
   dbBackupPath ? null,
+  https ? true,
 }:
 {
   config,
@@ -42,7 +43,7 @@
     package = pkgs.nextcloud31;
     configureRedis = true;
     hostName = hostname;
-    https = true;
+    https = if https then true else false;
     datadir = lib.mkIf (datadir != null) datadir;
     phpExtraExtensions =
       all: with all; [

system/modules/packages.nix

@@ -8,6 +8,10 @@
     [
       file
 
+      man-pages
+      man-pages-posix
+      stdmanpages
+
       # Binary cache platform
       cachix
 

system/modules/rustdesk-server.nix

@@ -0,0 +1,15 @@
+{
+  relayHosts ? [ ],
+}:
+{
+  lib,
+  ...
+}:
+{
+  services.rustdesk-server = {
+    enable = lib.mkDefault true;
+    openFirewall = lib.mkDefault true;
+    relay.enable = lib.mkDefault false;
+    signal.relayHosts = relayHosts;
+  };
+}