From 762035ab3e17f2294f99652b3c6a5e6301b58544 Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Fri, 22 Mar 2024 11:37:18 +0900
Subject: [PATCH] Update

---
 flake.nix                                          |  2 +-
 home-manager/common/desktops/xfce/default.nix      |  9 +++++++++
 .../hosts/rdesktop/desktops/xfce/default.nix       |  0
 nixos/common/desktops/plasma6/default.nix          |  2 ++
 nixos/common/desktops/xfce/default.nix             |  7 ++++++-
 nixos/containers/rdesktop/mounts.nix               |  2 +-
 nixos/hosts/framework-server/containers.nix        |  2 +-
 nixos/hosts/framework-server/firewall.nix          |  3 +++
 nixos/hosts/nuc-server/mounts.nix                  | 14 +++-----------
 9 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 home-manager/common/desktops/xfce/default.nix
 create mode 100644 home-manager/hosts/rdesktop/desktops/xfce/default.nix

diff --git a/flake.nix b/flake.nix
index d5d0a9eb..18dc292a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -76,7 +76,7 @@
       "albert@piaware-rpi4"     = libx.mkHome { hostname = "piaware-rpi4"; system = "aarch64-linux"; type = "small"; };
       "albert@quitman-rpi4"     = libx.mkHome { hostname = "quitman-rpi4"; system = "aarch64-linux"; type = "small"; };
       # Containers 
-      "albert@rdesktop"   = libx.mkHome { hostname = "rdesktop"; };
+      "albert@rdesktop"   = libx.mkHome { hostname = "rdesktop"; desktop = "xfce"; };
     };
     deploy.nodes = {
       osaka-linode-01  = libx.deploy { hostname = "osaka-linode-01"; };
diff --git a/home-manager/common/desktops/xfce/default.nix b/home-manager/common/desktops/xfce/default.nix
new file mode 100644
index 00000000..816e02b5
--- /dev/null
+++ b/home-manager/common/desktops/xfce/default.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+    xdg.configFile."ranger-rc-conf" = {
+    enable = true;
+    target = "./xfce4/test.conf";
+    text = ''
+    
+    '';
+    };
+}
diff --git a/home-manager/hosts/rdesktop/desktops/xfce/default.nix b/home-manager/hosts/rdesktop/desktops/xfce/default.nix
new file mode 100644
index 00000000..e69de29b
diff --git a/nixos/common/desktops/plasma6/default.nix b/nixos/common/desktops/plasma6/default.nix
index 58e90d5f..166349de 100644
--- a/nixos/common/desktops/plasma6/default.nix
+++ b/nixos/common/desktops/plasma6/default.nix
@@ -27,6 +27,8 @@
     tailscale-systray
   ];
 
+  services.xrdp.defaultWindowManager = "startplasma-x11";
+
   systemd.user.services = {
     "get-theme-times" = {
       enable = true;
diff --git a/nixos/common/desktops/xfce/default.nix b/nixos/common/desktops/xfce/default.nix
index 6446a122..57d1b083 100644
--- a/nixos/common/desktops/xfce/default.nix
+++ b/nixos/common/desktops/xfce/default.nix
@@ -21,5 +21,10 @@
   
   services.xrdp.defaultWindowManager = "xfce4-session";
 
-  # environment.systemPackages = with pkgs; [  ];
+  environment.systemPackages = with pkgs; [
+    papirus-folders
+    papirus-nord
+    xfce.xfwm4-themes
+    xfce4-docklike-plugin
+  ];
 }
diff --git a/nixos/containers/rdesktop/mounts.nix b/nixos/containers/rdesktop/mounts.nix
index 38bc157d..929b3e8a 100644
--- a/nixos/containers/rdesktop/mounts.nix
+++ b/nixos/containers/rdesktop/mounts.nix
@@ -1,6 +1,6 @@
 {
   "/etc/nixos/git" = {
     hostPath = "/etc/nixos/git";
-    isReadOnly = true;
+    isReadOnly = false;
   };
 }
diff --git a/nixos/hosts/framework-server/containers.nix b/nixos/hosts/framework-server/containers.nix
index cb837877..09cf0cde 100644
--- a/nixos/hosts/framework-server/containers.nix
+++ b/nixos/hosts/framework-server/containers.nix
@@ -6,6 +6,6 @@ in {
 
   # Set up the bridge network:
   containers = {
-    rdesktop = libx.mkContainer { hostname = "rdesktop"; desktop = "xfce"; unfree = true; };
+    rdesktop = libx.mkContainer { hostname = "rdesktop"; desktop = "plasma6"; unfree = true; };
   };
 } 
diff --git a/nixos/hosts/framework-server/firewall.nix b/nixos/hosts/framework-server/firewall.nix
index e4ebf630..50798331 100644
--- a/nixos/hosts/framework-server/firewall.nix
+++ b/nixos/hosts/framework-server/firewall.nix
@@ -3,6 +3,7 @@
     firewall = {
       enable = true;
       allowedTCPPorts = [
+        53   # DNS
         80    # HTTP
         443   # HTTPS
         42420 # Vintage Story
@@ -16,8 +17,10 @@
         4190 # Mailserver
         4443 # Jitsi
         5696 # dsm-kmip server
+        3389 # RDP
       ];
       allowedUDPPorts = [
+        53    # DNS (udp)
         3478  # Headscale DERP (udp)
         10000 # Jitsi Meet (udp)
       ];
diff --git a/nixos/hosts/nuc-server/mounts.nix b/nixos/hosts/nuc-server/mounts.nix
index 02274b9d..5d5ab90f 100644
--- a/nixos/hosts/nuc-server/mounts.nix
+++ b/nixos/hosts/nuc-server/mounts.nix
@@ -1,14 +1,6 @@
 {
-    fileSystems."/Storage/Data" = {
-        device  = "192.168.1.13:/Data";
+    fileSystems."/Storage" = {
+        device  = "192.168.1.100:/volume1/Storage";
         fsType = "nfs";
     };
-    fileSystems."/Storage/Video" = {
-        device  = "192.168.1.13:/Video";
-        fsType = "nfs";
-    };
-    fileSystems."/Storage/Backups" = {
-        device  = "192.168.1.13:/Backups";
-        fsType = "nfs";
-    };
-}
\ No newline at end of file
+}