From 3cd13d1441d55f4a1943c0bc10c6493b7b034b93 Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Fri, 5 Apr 2024 19:08:07 +0900
Subject: [PATCH] Update rdesktop mounts;

---
 home-manager/common/desktops/xfce/default.nix | 28 +++++++++----------
 .../xfce/xfconf/xfce4-screenshooter.xml       | 12 --------
 nixos/containers/rdesktop/mounts.nix          |  8 ++++++
 3 files changed, 22 insertions(+), 26 deletions(-)
 delete mode 100644 home-manager/common/desktops/xfce/xfconf/xfce4-screenshooter.xml

diff --git a/home-manager/common/desktops/xfce/default.nix b/home-manager/common/desktops/xfce/default.nix
index 607e0eaa..6d700199 100644
--- a/home-manager/common/desktops/xfce/default.nix
+++ b/home-manager/common/desktops/xfce/default.nix
@@ -2,66 +2,66 @@
   xdg.configFile."displays" = {
     enable = true;
     target = "xfce4/xfconf/xfce-perchannel-xml/displays.xml";
-    text = builtins.readFile ./xfconf/displays.xml;
+    text   = builtins.readFile ./xfconf/displays.xml;
   };
   xdg.configFile."thunar" = {
     enable = true;
     target = "xfce4/xfconf/xfce-perchannel-xml/thunar.xml";
-    text = builtins.readFile ./xfconf/thunar.xml;
+    text   = builtins.readFile ./xfconf/thunar.xml;
   };
   xdg.configFile."xfce4-appfinder" = {
     enable = true;
     target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml";
-    text = builtins.readFile ./xfconf/xfce4-appfinder.xml;
+    text   = builtins.readFile ./xfconf/xfce4-appfinder.xml;
   };
   xdg.configFile."xfce4-desktop" = {
     enable = true;
     target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml";
-    text = builtins.readFile ./xfconf/xfce4-desktop.xml;
+    text   = builtins.readFile ./xfconf/xfce4-desktop.xml;
   };
   xdg.configFile."xfce4-keyboard-shortcuts" = {
     enable = true;
     target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml";
-    text = builtins.readFile ./xfconf/xfce4-keyboard-shortcuts.xml;
+    text   = builtins.readFile ./xfconf/xfce4-keyboard-shortcuts.xml;
   };
   xdg.configFile."xfce4-notifyd" = {
     enable = true;
     target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml";
-    text = builtins.readFile ./xfconf/xfce4-notifyd.xml;
+    text   = builtins.readFile ./xfconf/xfce4-notifyd.xml;
   };
   xdg.configFile."xfce4-panel" = {
     enable = true;
     target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml";
-    text = builtins.readFile ./xfconf/xfce4-panel.xml;
+    text   = builtins.readFile ./xfconf/xfce4-panel.xml;
   };
   xdg.configFile."xfce4-power-manager" = {
     enable = true;
     target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml";
-    text = builtins.readFile ./xfconf/xfce4-power-manager.xml;
+    text   = builtins.readFile ./xfconf/xfce4-power-manager.xml;
   };
   xdg.configFile."xfce4-screenshotter" = {
     enable = true;
     target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-screenshotter.xml";
-    text = builtins.readFile ./xfconf/xfce4-screenshooter.xml;
+    text   = builtins.readFile ./xfconf/xfce4-screenshotter.xml;
   };
   xdg.configFile."xfce4-settings-editor" = {
     enable = true;
     target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml";
-    text = builtins.readFile ./xfconf/xfce4-settings-editor.xml;
+    text   = builtins.readFile ./xfconf/xfce4-settings-editor.xml;
   };
   xdg.configFile."xfce4-terminal" = {
     enable = true;
     target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-terminal.xml";
-    text = builtins.readFile ./xfconf/xfce4-terminal.xml;
+    text   = builtins.readFile ./xfconf/xfce4-terminal.xml;
   };
   xdg.configFile."xfwm4" = {
     enable = true;
     target = "xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml";
-    text = builtins.readFile ./xfconf/xfwm4.xml;
+    text   = builtins.readFile ./xfconf/xfwm4.xml;
   };
-  xdg.configFile."xsettings.xml" = {
+  xdg.configFile."xsettings" = {
     enable = true;
     target = "xfce4/xfconf/xfce-perchannel-xml/xsettings.xml";
-    text = builtins.readFile ./xfconf/xsettings.xml;
+    text   = builtins.readFile ./xfconf/xsettings.xml;
   };
 }
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-screenshooter.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-screenshooter.xml
deleted file mode 100644
index d8143665..00000000
--- a/home-manager/common/desktops/xfce/xfconf/xfce4-screenshooter.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-screenshooter" version="1.0">
-  <property name="imgur-custom-action-added" type="bool" value="true"/>
-  <property name="actions" type="empty">
-    <property name="action-0" type="empty">
-      <property name="name" type="string" value="Host on Imgur™"/>
-      <property name="command" type="string" value="/usr/lib/xfce4/screenshooter/scripts/imgur-upload.sh %f %imgur_client_id"/>
-    </property>
-    <property name="actions" type="int" value="1"/>
-  </property>
-</channel>
diff --git a/nixos/containers/rdesktop/mounts.nix b/nixos/containers/rdesktop/mounts.nix
index f6040fa0..5cd1c7af 100644
--- a/nixos/containers/rdesktop/mounts.nix
+++ b/nixos/containers/rdesktop/mounts.nix
@@ -4,4 +4,12 @@
     mountPoint = "/etc/nixos/git";
     isReadOnly = false;
   };
+  "/home/albert/.ssh/id_ed25519" = {
+    mountPoint = "/home/albert/.ssh/id_ed25519";
+    isReadOnly = true;
+  };
+  "/home/albert/.ssh/id_ed25519.pub"  = {
+    mountPoint = "/home/albert/.ssh/id_ed25519.pub";
+    isReadOnly = true;
+  };
 }