diff --git a/home-manager/common/desktops/xfce/default.nix b/home-manager/common/desktops/xfce/default.nix
index 816e02b5..c0f35df8 100644
--- a/home-manager/common/desktops/xfce/default.nix
+++ b/home-manager/common/desktops/xfce/default.nix
@@ -1,9 +1,67 @@
-{ pkgs, ... }: {
-    xdg.configFile."ranger-rc-conf" = {
+{ lib, ... }: {
+  xdg.configFile."displays" = {
     enable = true;
-    target = "./xfce4/test.conf";
-    text = ''
-    
-    '';
-    };
+    target = "xfce4/xfconf/xfce-perchannel-xml/displays.xml";
+    text = lib.readFile "xfce/xfconf/displays.xml";
+  };
+  xdg.configFile."thunar" = {
+    enable = true;
+    target = "xfce4/xfconf/xfce-perchannel-xml/thunar.xml";
+    text = lib.readFile "xfce/xfconf/thunar.xml";
+  };
+  xdg.configFile."xfce4-appfinder" = {
+    enable = true;
+    target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-appfinder.xml";
+    text = lib.readFile "xfce/xfconf/xfce4-appfinder.xml";
+  };
+  xdg.configFile."xfce4-desktop" = {
+    enable = true;
+    target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml";
+    text = lib.readFile "xfce/xfconf/xfce4-desktop.xml";
+  };
+  xdg.configFile."xfce4-keyboard-shortcuts" = {
+    enable = true;
+    target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml";
+    text = lib.readFile "xfce/xfconf/xfce4-keyboard-shortcuts.xml";
+  };
+  xdg.configFile."xfce4-notifyd" = {
+    enable = true;
+    target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml";
+    text = lib.readFile "xfce/xfconf/xfce4-notifyd.xml";
+  };
+  xdg.configFile."xfce4-panel" = {
+    enable = true;
+    target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml";
+    text = lib.readFile "xfce/xfconf/xfce4-panel.xml";
+  };
+  xdg.configFile."xfce4-power-manager" = {
+    enable = true;
+    target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml";
+    text = lib.readFile "xfce/xfconf/xfce4-power-manager.xml";
+  };
+  xdg.configFile."xfce4-screenshotter" = {
+    enable = true;
+    target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-screenshotter.xml";
+    text = lib.readFile "xfce/xfconf/xfce4-screenshotter.xml";
+  };
+  xdg.configFile."xfce4-settings-editor" = {
+    enable = true;
+    target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-settings-editor.xml";
+    text = lib.readFile "xfce/xfconf/xfce4-settings-editor.xml";
+  };
+  xdg.configFile."xfce4-terminal" = {
+    enable = true;
+    target = "xfce4/xfconf/xfce-perchannel-xml/xfce4-terminal.xml";
+    text = lib.readFile "xfce/xfconf/xfce4-terminal.xml";
+  };
+  xdg.configFile."xfwm4" = {
+    enable = true;
+    target = "xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml";
+    text = lib.readFile "xfce/xfconf/xfwm4.xml";
+  };
+  xdg.configFile."xsettings.xml" = {
+    enable = true;
+    target = "xfce4/xfconf/xfce-perchannel-xml/xsettings.xml.xml";
+    text = lib.readFile "xfce/xfconf/xsettings.xml.xml";
+  };
 }
diff --git a/home-manager/common/desktops/xfce/xfconf/displays.xml b/home-manager/common/desktops/xfce/xfconf/displays.xml
new file mode 100644
index 00000000..0dc41fc8
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/displays.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="displays" version="1.0">
+  <property name="ActiveProfile" type="string" value="Default"/>
+</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/thunar.xml b/home-manager/common/desktops/xfce/xfconf/thunar.xml
new file mode 100644
index 00000000..a46e5cd9
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/thunar.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="thunar" version="1.0">
+  <property name="last-view" type="string" value="ThunarIconView"/>
+  <property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_100_PERCENT"/>
+  <property name="last-menubar-visible" type="bool" value="false"/>
+  <property name="last-window-width" type="int" value="894"/>
+  <property name="last-window-height" type="int" value="686"/>
+  <property name="last-window-maximized" type="bool" value="false"/>
+  <property name="last-separator-position" type="int" value="170"/>
+</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-appfinder.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-appfinder.xml
new file mode 100644
index 00000000..7129a7a1
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-appfinder.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-appfinder" version="1.0">
+  <property name="last" type="empty">
+    <property name="window-height" type="int" value="422"/>
+    <property name="window-width" type="int" value="580"/>
+    <property name="pane-position" type="int" value="180"/>
+  </property>
+  <property name="actions" type="array">
+    <value type="int" value="5"/>
+    <value type="int" value="4"/>
+    <value type="int" value="3"/>
+    <value type="int" value="2"/>
+    <value type="int" value="1"/>
+    <property name="action-5" type="empty">
+      <property name="type" type="int" value="0"/>
+      <property name="pattern" type="string" value="/"/>
+      <property name="command" type="string" value="exo-open --launch FileManager %S"/>
+      <property name="save" type="bool" value="false"/>
+    </property>
+    <property name="action-4" type="empty">
+      <property name="type" type="int" value="0"/>
+      <property name="pattern" type="string" value="#"/>
+      <property name="command" type="string" value="exo-open --launch TerminalEmulator man %s"/>
+      <property name="save" type="bool" value="false"/>
+    </property>
+    <property name="action-3" type="empty">
+      <property name="type" type="int" value="0"/>
+      <property name="pattern" type="string" value="!w"/>
+      <property name="command" type="string" value="exo-open --launch WebBrowser http://en.wikipedia.org/wiki/%s"/>
+      <property name="save" type="bool" value="false"/>
+    </property>
+    <property name="action-2" type="empty">
+      <property name="type" type="int" value="0"/>
+      <property name="pattern" type="string" value="$"/>
+      <property name="command" type="string" value="exo-open --launch TerminalEmulator %s"/>
+      <property name="save" type="bool" value="true"/>
+    </property>
+    <property name="action-1" type="empty">
+      <property name="type" type="int" value="1"/>
+      <property name="pattern" type="string" value="^(file|http|https):\/\/(.*)$"/>
+      <property name="command" type="string" value="exo-open \0"/>
+      <property name="save" type="bool" value="false"/>
+    </property>
+  </property>
+</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-desktop.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-desktop.xml
new file mode 100644
index 00000000..94217366
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-desktop.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-desktop" version="1.0">
+  <property name="backdrop" type="empty">
+    <property name="screen0" type="empty">
+      <property name="monitorrdp0" type="empty">
+        <property name="workspace0" type="empty">
+          <property name="color-style" type="int" value="2"/>
+          <property name="image-style" type="int" value="1"/>
+          <property name="last-image" type="string" value="/config/Downloads/wallhaven-l8r9jp.jpg"/>
+          <property name="rgba1" type="array">
+            <value type="double" value="0"/>
+            <value type="double" value="0"/>
+            <value type="double" value="0"/>
+            <value type="double" value="1"/>
+          </property>
+        </property>
+        <property name="workspace1" type="empty">
+          <property name="color-style" type="int" value="0"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-shapes.svg"/>
+        </property>
+        <property name="workspace2" type="empty">
+          <property name="color-style" type="int" value="0"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-shapes.svg"/>
+        </property>
+        <property name="workspace3" type="empty">
+          <property name="color-style" type="int" value="0"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-shapes.svg"/>
+        </property>
+        <property name="workspace4" type="empty">
+          <property name="color-style" type="int" value="0"/>
+          <property name="image-style" type="int" value="5"/>
+          <property name="last-image" type="string" value="/usr/share/backgrounds/xfce/xfce-shapes.svg"/>
+        </property>
+      </property>
+      <property name="monitor0" type="empty">
+        <property name="image-path" type="string" value="/config/Downloads/wallhaven-l8r9jp.jpg"/>
+        <property name="image-show" type="bool" value="true"/>
+        <property name="image-style" type="int" value="5"/>
+      </property>
+    </property>
+  </property>
+  <property name="last" type="empty">
+    <property name="window-width" type="int" value="619"/>
+    <property name="window-height" type="int" value="522"/>
+  </property>
+  <property name="desktop-icons" type="empty">
+    <property name="file-icons" type="empty">
+      <property name="show-home" type="bool" value="false"/>
+      <property name="show-filesystem" type="bool" value="false"/>
+      <property name="show-trash" type="bool" value="false"/>
+      <property name="show-removable" type="bool" value="false"/>
+    </property>
+    <property name="show-tooltips" type="bool" value="false"/>
+    <property name="show-thumbnails" type="bool" value="false"/>
+  </property>
+</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-keyboard-shortcuts.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-keyboard-shortcuts.xml
new file mode 100644
index 00000000..2e09df45
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-keyboard-shortcuts.xml
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-keyboard-shortcuts" version="1.0">
+  <property name="commands" type="empty">
+    <property name="default" type="empty">
+      <property name="&lt;Alt&gt;F1" type="empty"/>
+      <property name="&lt;Alt&gt;F2" type="empty">
+        <property name="startup-notify" type="empty"/>
+      </property>
+      <property name="&lt;Alt&gt;F3" type="empty">
+        <property name="startup-notify" type="empty"/>
+      </property>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;t" type="empty"/>
+      <property name="XF86Display" type="empty"/>
+      <property name="&lt;Super&gt;p" type="empty"/>
+      <property name="&lt;Primary&gt;Escape" type="empty"/>
+      <property name="XF86WWW" type="empty"/>
+      <property name="HomePage" type="empty"/>
+      <property name="XF86Mail" type="empty"/>
+      <property name="Print" type="empty"/>
+      <property name="&lt;Alt&gt;Print" type="empty"/>
+      <property name="&lt;Shift&gt;Print" type="empty"/>
+      <property name="&lt;Super&gt;e" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;f" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Escape" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;Escape" type="empty"/>
+      <property name="&lt;Super&gt;r" type="empty">
+        <property name="startup-notify" type="empty"/>
+      </property>
+      <property name="&lt;Alt&gt;&lt;Super&gt;s" type="empty"/>
+    </property>
+    <property name="custom" type="empty">
+      <property name="&lt;Alt&gt;F2" type="string" value="xfce4-appfinder --collapsed">
+        <property name="startup-notify" type="bool" value="true"/>
+      </property>
+      <property name="&lt;Alt&gt;Print" type="string" value="xfce4-screenshooter -w"/>
+      <property name="&lt;Super&gt;r" type="string" value="xfce4-appfinder -c">
+        <property name="startup-notify" type="bool" value="true"/>
+      </property>
+      <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
+      <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
+      <property name="&lt;Alt&gt;F3" type="string" value="xfce4-appfinder">
+        <property name="startup-notify" type="bool" value="true"/>
+      </property>
+      <property name="Print" type="string" value="xfce4-screenshooter"/>
+      <property name="&lt;Primary&gt;Escape" type="string" value="xfdesktop --menu"/>
+      <property name="&lt;Shift&gt;Print" type="string" value="xfce4-screenshooter -r"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Delete" type="string" value="xfce4-session-logout"/>
+      <property name="&lt;Alt&gt;&lt;Super&gt;s" type="string" value="orca"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;t" type="string" value="exo-open --launch TerminalEmulator"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;f" type="string" value="thunar"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;l" type="string" value="xflock4"/>
+      <property name="&lt;Alt&gt;F1" type="string" value="xfce4-popup-applicationsmenu"/>
+      <property name="&lt;Super&gt;p" type="string" value="xfce4-display-settings --minimal"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;Escape" type="string" value="xfce4-taskmanager"/>
+      <property name="&lt;Super&gt;e" type="string" value="thunar"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Escape" type="string" value="xkill"/>
+      <property name="HomePage" type="string" value="exo-open --launch WebBrowser"/>
+      <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
+      <property name="override" type="bool" value="true"/>
+    </property>
+  </property>
+  <property name="xfwm4" type="empty">
+    <property name="default" type="empty">
+      <property name="&lt;Alt&gt;Insert" type="empty"/>
+      <property name="Escape" type="empty"/>
+      <property name="Left" type="empty"/>
+      <property name="Right" type="empty"/>
+      <property name="Up" type="empty"/>
+      <property name="Down" type="empty"/>
+      <property name="&lt;Alt&gt;Tab" type="empty"/>
+      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="empty"/>
+      <property name="&lt;Alt&gt;Delete" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Down" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Left" type="empty"/>
+      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="empty"/>
+      <property name="&lt;Alt&gt;F4" type="empty"/>
+      <property name="&lt;Alt&gt;F6" type="empty"/>
+      <property name="&lt;Alt&gt;F7" type="empty"/>
+      <property name="&lt;Alt&gt;F8" type="empty"/>
+      <property name="&lt;Alt&gt;F9" type="empty"/>
+      <property name="&lt;Alt&gt;F10" type="empty"/>
+      <property name="&lt;Alt&gt;F11" type="empty"/>
+      <property name="&lt;Alt&gt;F12" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;End" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Home" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_1" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_2" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_3" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_4" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_5" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_6" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_7" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_8" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_9" type="empty"/>
+      <property name="&lt;Alt&gt;space" type="empty"/>
+      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Right" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;d" type="empty"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Up" type="empty"/>
+      <property name="&lt;Super&gt;Tab" type="empty"/>
+      <property name="&lt;Primary&gt;F1" type="empty"/>
+      <property name="&lt;Primary&gt;F2" type="empty"/>
+      <property name="&lt;Primary&gt;F3" type="empty"/>
+      <property name="&lt;Primary&gt;F4" type="empty"/>
+      <property name="&lt;Primary&gt;F5" type="empty"/>
+      <property name="&lt;Primary&gt;F6" type="empty"/>
+      <property name="&lt;Primary&gt;F7" type="empty"/>
+      <property name="&lt;Primary&gt;F8" type="empty"/>
+      <property name="&lt;Primary&gt;F9" type="empty"/>
+      <property name="&lt;Primary&gt;F10" type="empty"/>
+      <property name="&lt;Primary&gt;F11" type="empty"/>
+      <property name="&lt;Primary&gt;F12" type="empty"/>
+      <property name="&lt;Super&gt;KP_Left" type="empty"/>
+      <property name="&lt;Super&gt;KP_Right" type="empty"/>
+      <property name="&lt;Super&gt;KP_Down" type="empty"/>
+      <property name="&lt;Super&gt;KP_Up" type="empty"/>
+      <property name="&lt;Super&gt;KP_Page_Up" type="empty"/>
+      <property name="&lt;Super&gt;KP_Home" type="empty"/>
+      <property name="&lt;Super&gt;KP_End" type="empty"/>
+      <property name="&lt;Super&gt;KP_Next" type="empty"/>
+    </property>
+    <property name="custom" type="empty">
+      <property name="&lt;Primary&gt;F12" type="string" value="workspace_12_key"/>
+      <property name="&lt;Super&gt;KP_Down" type="string" value="tile_down_key"/>
+      <property name="&lt;Alt&gt;F4" type="string" value="close_window_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_3" type="string" value="move_window_workspace_3_key"/>
+      <property name="&lt;Primary&gt;F2" type="string" value="workspace_2_key"/>
+      <property name="&lt;Primary&gt;F6" type="string" value="workspace_6_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Down" type="string" value="down_workspace_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_9" type="string" value="move_window_workspace_9_key"/>
+      <property name="&lt;Super&gt;KP_Up" type="string" value="tile_up_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;End" type="string" value="move_window_next_workspace_key"/>
+      <property name="&lt;Primary&gt;F8" type="string" value="workspace_8_key"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Left" type="string" value="move_window_left_key"/>
+      <property name="&lt;Super&gt;KP_Right" type="string" value="tile_right_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_4" type="string" value="move_window_workspace_4_key"/>
+      <property name="Right" type="string" value="right_key"/>
+      <property name="Down" type="string" value="down_key"/>
+      <property name="&lt;Primary&gt;F3" type="string" value="workspace_3_key"/>
+      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Down" type="string" value="lower_window_key"/>
+      <property name="&lt;Primary&gt;F9" type="string" value="workspace_9_key"/>
+      <property name="&lt;Alt&gt;Tab" type="string" value="cycle_windows_key"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Right" type="string" value="move_window_right_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Right" type="string" value="right_workspace_key"/>
+      <property name="&lt;Alt&gt;F6" type="string" value="stick_window_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_5" type="string" value="move_window_workspace_5_key"/>
+      <property name="&lt;Primary&gt;F11" type="string" value="workspace_11_key"/>
+      <property name="&lt;Alt&gt;F10" type="string" value="maximize_window_key"/>
+      <property name="&lt;Alt&gt;Delete" type="string" value="del_workspace_key"/>
+      <property name="&lt;Super&gt;Tab" type="string" value="switch_window_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;d" type="string" value="show_desktop_key"/>
+      <property name="&lt;Primary&gt;F4" type="string" value="workspace_4_key"/>
+      <property name="&lt;Super&gt;KP_Page_Up" type="string" value="tile_up_right_key"/>
+      <property name="&lt;Alt&gt;F7" type="string" value="move_window_key"/>
+      <property name="Up" type="string" value="up_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_6" type="string" value="move_window_workspace_6_key"/>
+      <property name="&lt;Alt&gt;F11" type="string" value="fullscreen_key"/>
+      <property name="&lt;Alt&gt;space" type="string" value="popup_menu_key"/>
+      <property name="&lt;Super&gt;KP_Home" type="string" value="tile_up_left_key"/>
+      <property name="Escape" type="string" value="cancel_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_1" type="string" value="move_window_workspace_1_key"/>
+      <property name="&lt;Super&gt;KP_Next" type="string" value="tile_down_right_key"/>
+      <property name="&lt;Super&gt;KP_Left" type="string" value="tile_left_key"/>
+      <property name="&lt;Shift&gt;&lt;Alt&gt;Page_Up" type="string" value="raise_window_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Home" type="string" value="move_window_prev_workspace_key"/>
+      <property name="&lt;Alt&gt;&lt;Shift&gt;Tab" type="string" value="cycle_reverse_windows_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Left" type="string" value="left_workspace_key"/>
+      <property name="&lt;Alt&gt;F12" type="string" value="above_key"/>
+      <property name="&lt;Primary&gt;&lt;Shift&gt;&lt;Alt&gt;Up" type="string" value="move_window_up_key"/>
+      <property name="&lt;Primary&gt;F5" type="string" value="workspace_5_key"/>
+      <property name="&lt;Alt&gt;F8" type="string" value="resize_window_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_7" type="string" value="move_window_workspace_7_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_2" type="string" value="move_window_workspace_2_key"/>
+      <property name="&lt;Super&gt;KP_End" type="string" value="tile_down_left_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;Up" type="string" value="up_workspace_key"/>
+      <property name="&lt;Alt&gt;F9" type="string" value="hide_window_key"/>
+      <property name="&lt;Primary&gt;F7" type="string" value="workspace_7_key"/>
+      <property name="&lt;Primary&gt;F10" type="string" value="workspace_10_key"/>
+      <property name="Left" type="string" value="left_key"/>
+      <property name="&lt;Primary&gt;&lt;Alt&gt;KP_8" type="string" value="move_window_workspace_8_key"/>
+      <property name="&lt;Alt&gt;Insert" type="string" value="add_workspace_key"/>
+      <property name="&lt;Primary&gt;F1" type="string" value="workspace_1_key"/>
+      <property name="override" type="bool" value="true"/>
+    </property>
+  </property>
+  <property name="providers" type="array">
+    <value type="string" value="xfwm4"/>
+    <value type="string" value="commands"/>
+  </property>
+</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-notifyd.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-notifyd.xml
new file mode 100644
index 00000000..70c80b62
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-notifyd.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-notifyd" version="1.0">
+  <property name="log-max-size-enabled" type="bool" value="true"/>
+  <property name="applications" type="empty">
+    <property name="known_applications" type="array">
+      <value type="string" value="Firefox"/>
+      <value type="string" value="Thunderbird"/>
+      <value type="string" value="Xfce4-notifyd settings"/>
+    </property>
+  </property>
+  <property name="do-not-disturb" type="bool" value="true"/>
+  <property name="date-time-custom-format" type="string" value="%a %H:%M:%S"/>
+  <property name="theme" type="string" value="Default"/>
+  <property name="notify-location" type="string" value="top-right"/>
+</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-panel.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-panel.xml
new file mode 100644
index 00000000..71656f1c
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-panel.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-panel" version="1.0">
+  <property name="configver" type="int" value="2"/>
+  <property name="panels" type="array">
+    <value type="int" value="1"/>
+    <property name="dark-mode" type="bool" value="false"/>
+    <property name="panel-1" type="empty">
+      <property name="position" type="string" value="p=6;x=1720;y=14"/>
+      <property name="length" type="double" value="100"/>
+      <property name="position-locked" type="bool" value="true"/>
+      <property name="icon-size" type="uint" value="0"/>
+      <property name="size" type="uint" value="26"/>
+      <property name="plugin-ids" type="array">
+        <value type="int" value="1"/>
+        <value type="int" value="17"/>
+        <value type="int" value="19"/>
+        <value type="int" value="2"/>
+        <value type="int" value="3"/>
+        <value type="int" value="4"/>
+        <value type="int" value="5"/>
+        <value type="int" value="6"/>
+        <value type="int" value="8"/>
+        <value type="int" value="10"/>
+        <value type="int" value="11"/>
+        <value type="int" value="12"/>
+      </property>
+      <property name="enable-struts" type="bool" value="true"/>
+      <property name="length-adjust" type="bool" value="true"/>
+      <property name="mode" type="uint" value="0"/>
+      <property name="background-style" type="uint" value="0"/>
+      <property name="enter-opacity" type="uint" value="100"/>
+      <property name="leave-opacity" type="uint" value="100"/>
+    </property>
+  </property>
+  <property name="plugins" type="empty">
+    <property name="plugin-1" type="string" value="applicationsmenu">
+      <property name="button-icon" type="string" value="archlinux-logo"/>
+      <property name="show-menu-icons" type="bool" value="true"/>
+      <property name="show-button-title" type="bool" value="false"/>
+      <property name="show-generic-names" type="bool" value="false"/>
+    </property>
+    <property name="plugin-2" type="string" value="tasklist">
+      <property name="grouping" type="bool" value="false"/>
+      <property name="show-handle" type="bool" value="false"/>
+      <property name="show-tooltips" type="bool" value="true"/>
+      <property name="show-labels" type="bool" value="true"/>
+      <property name="show-wireframes" type="bool" value="true"/>
+      <property name="sort-order" type="uint" value="0"/>
+      <property name="flat-buttons" type="bool" value="false"/>
+    </property>
+    <property name="plugin-3" type="string" value="separator">
+      <property name="expand" type="bool" value="true"/>
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-5" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-6" type="string" value="systray">
+      <property name="square-icons" type="bool" value="true"/>
+      <property name="known-items" type="array">
+        <value type="string" value="remmina-icon"/>
+      </property>
+    </property>
+    <property name="plugin-8" type="string" value="pulseaudio">
+      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
+      <property name="show-notifications" type="bool" value="true"/>
+      <property name="known-players" type="string" value="firefox"/>
+    </property>
+    <property name="plugin-10" type="string" value="notification-plugin"/>
+    <property name="plugin-11" type="string" value="separator">
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-12" type="string" value="clock">
+      <property name="timezone" type="string" value="Asia/Tokyo"/>
+      <property name="mode" type="uint" value="2"/>
+      <property name="digital-layout" type="uint" value="3"/>
+      <property name="digital-time-font" type="string" value="System-ui 14"/>
+    </property>
+    <property name="plugin-17" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="17022621551.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-19" type="string" value="separator">
+      <property name="style" type="uint" value="1"/>
+    </property>
+    <property name="plugin-4" type="string" value="pager">
+      <property name="rows" type="uint" value="1"/>
+      <property name="miniature-view" type="bool" value="false"/>
+      <property name="workspace-scrolling" type="bool" value="false"/>
+      <property name="numbering" type="bool" value="false"/>
+    </property>
+  </property>
+</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-power-manager.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-power-manager.xml
new file mode 100644
index 00000000..a4119d00
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-power-manager.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-power-manager" version="1.0">
+  <property name="xfce4-power-manager" type="empty">
+    <property name="brightness-switch-restore-on-exit" type="int" value="1"/>
+    <property name="brightness-switch" type="int" value="0"/>
+  </property>
+</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-screenshooter.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-screenshooter.xml
new file mode 100644
index 00000000..d8143665
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-screenshooter.xml
@@ -0,0 +1,12 @@
+<?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/home-manager/common/desktops/xfce/xfconf/xfce4-settings-editor.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-settings-editor.xml
new file mode 100644
index 00000000..a7c84531
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-settings-editor.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-settings-editor" version="1.0">
+  <property name="last" type="empty">
+    <property name="window-width" type="int" value="640"/>
+    <property name="window-height" type="int" value="500"/>
+    <property name="paned-position" type="int" value="180"/>
+  </property>
+</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfce4-terminal.xml b/home-manager/common/desktops/xfce/xfconf/xfce4-terminal.xml
new file mode 100644
index 00000000..e588d383
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfce4-terminal.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-terminal" version="1.0">
+  <property name="color-foreground" type="string" value="#dcdcdc"/>
+  <property name="color-background" type="string" value="#2c2c2c"/>
+  <property name="color-background-vary" type="bool" value="false"/>
+  <property name="color-cursor-foreground" type="string" value=""/>
+  <property name="color-cursor" type="string" value="#dcdcdc"/>
+  <property name="color-cursor-use-default" type="bool" value="true"/>
+  <property name="color-selection" type="string" value=""/>
+  <property name="color-selection-background" type="string" value=""/>
+  <property name="color-selection-use-default" type="bool" value="true"/>
+  <property name="color-bold" type="string" value=""/>
+  <property name="color-bold-use-default" type="bool" value="true"/>
+  <property name="color-palette" type="string" value="#3f3f3f;#705050;#60b48a;#dfaf8f;#9ab8d7;#dc8cc3;#8cd0d3;#dcdcdc;#709080;#dca3a3;#72d5a3;#f0dfaf;#94bff3;#ec93d3;#93e0e3;#ffffff"/>
+  <property name="color-bold-is-bright" type="bool" value="true"/>
+  <property name="color-use-theme" type="bool" value="false"/>
+  <property name="tab-activity-color" type="string" value="#aa0000"/>
+  <property name="misc-show-unsafe-paste-dialog" type="bool" value="false"/>
+  <property name="font-name" type="string" value="Hack Nerd Font 10"/>
+  <property name="font-use-system" type="bool" value="false"/>
+  <property name="word-chars" type="string" value=""/>
+  <property name="encoding" type="string" value="UTF-8"/>
+  <property name="misc-copy-on-select" type="bool" value="true"/>
+  <property name="font-allow-bold" type="bool" value="false"/>
+  <property name="text-blink-mode" type="string" value="TERMINAL_TEXT_BLINK_MODE_ALWAYS"/>
+  <property name="misc-menubar-default" type="bool" value="false"/>
+  <property name="misc-toolbar-default" type="bool" value="false"/>
+</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xfwm4.xml b/home-manager/common/desktops/xfce/xfconf/xfwm4.xml
new file mode 100644
index 00000000..5850fcee
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xfwm4.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfwm4" version="1.0">
+  <property name="general" type="empty">
+    <property name="activate_action" type="string" value="bring"/>
+    <property name="borderless_maximize" type="bool" value="true"/>
+    <property name="box_move" type="bool" value="false"/>
+    <property name="box_resize" type="bool" value="false"/>
+    <property name="button_layout" type="string" value="O|SHMC"/>
+    <property name="button_offset" type="int" value="0"/>
+    <property name="button_spacing" type="int" value="0"/>
+    <property name="click_to_focus" type="bool" value="true"/>
+    <property name="cycle_apps_only" type="bool" value="false"/>
+    <property name="cycle_draw_frame" type="bool" value="true"/>
+    <property name="cycle_raise" type="bool" value="false"/>
+    <property name="cycle_hidden" type="bool" value="true"/>
+    <property name="cycle_minimum" type="bool" value="true"/>
+    <property name="cycle_minimized" type="bool" value="false"/>
+    <property name="cycle_preview" type="bool" value="true"/>
+    <property name="cycle_tabwin_mode" type="int" value="0"/>
+    <property name="cycle_workspaces" type="bool" value="false"/>
+    <property name="double_click_action" type="string" value="maximize"/>
+    <property name="double_click_distance" type="int" value="5"/>
+    <property name="double_click_time" type="int" value="250"/>
+    <property name="easy_click" type="string" value="Alt"/>
+    <property name="focus_delay" type="int" value="250"/>
+    <property name="focus_hint" type="bool" value="true"/>
+    <property name="focus_new" type="bool" value="true"/>
+    <property name="frame_opacity" type="int" value="100"/>
+    <property name="frame_border_top" type="int" value="0"/>
+    <property name="full_width_title" type="bool" value="true"/>
+    <property name="horiz_scroll_opacity" type="bool" value="false"/>
+    <property name="inactive_opacity" type="int" value="100"/>
+    <property name="maximized_offset" type="int" value="0"/>
+    <property name="mousewheel_rollup" type="bool" value="true"/>
+    <property name="move_opacity" type="int" value="100"/>
+    <property name="placement_mode" type="string" value="center"/>
+    <property name="placement_ratio" type="int" value="20"/>
+    <property name="popup_opacity" type="int" value="100"/>
+    <property name="prevent_focus_stealing" type="bool" value="false"/>
+    <property name="raise_delay" type="int" value="250"/>
+    <property name="raise_on_click" type="bool" value="true"/>
+    <property name="raise_on_focus" type="bool" value="false"/>
+    <property name="raise_with_any_button" type="bool" value="true"/>
+    <property name="repeat_urgent_blink" type="bool" value="false"/>
+    <property name="resize_opacity" type="int" value="100"/>
+    <property name="scroll_workspaces" type="bool" value="true"/>
+    <property name="shadow_delta_height" type="int" value="0"/>
+    <property name="shadow_delta_width" type="int" value="0"/>
+    <property name="shadow_delta_x" type="int" value="0"/>
+    <property name="shadow_delta_y" type="int" value="-3"/>
+    <property name="shadow_opacity" type="int" value="50"/>
+    <property name="show_app_icon" type="bool" value="false"/>
+    <property name="show_dock_shadow" type="bool" value="true"/>
+    <property name="show_frame_shadow" type="bool" value="true"/>
+    <property name="show_popup_shadow" type="bool" value="false"/>
+    <property name="snap_resist" type="bool" value="false"/>
+    <property name="snap_to_border" type="bool" value="true"/>
+    <property name="snap_to_windows" type="bool" value="false"/>
+    <property name="snap_width" type="int" value="10"/>
+    <property name="vblank_mode" type="string" value="auto"/>
+    <property name="theme" type="string" value="Arc-Darker"/>
+    <property name="tile_on_move" type="bool" value="true"/>
+    <property name="title_alignment" type="string" value="center"/>
+    <property name="title_font" type="string" value="Sans Bold 9"/>
+    <property name="title_horizontal_offset" type="int" value="0"/>
+    <property name="titleless_maximize" type="bool" value="false"/>
+    <property name="title_shadow_active" type="string" value="false"/>
+    <property name="title_shadow_inactive" type="string" value="false"/>
+    <property name="title_vertical_offset_active" type="int" value="0"/>
+    <property name="title_vertical_offset_inactive" type="int" value="0"/>
+    <property name="toggle_workspaces" type="bool" value="false"/>
+    <property name="unredirect_overlays" type="bool" value="true"/>
+    <property name="urgent_blink" type="bool" value="false"/>
+    <property name="use_compositing" type="bool" value="true"/>
+    <property name="workspace_count" type="int" value="4"/>
+    <property name="wrap_cycle" type="bool" value="true"/>
+    <property name="wrap_layout" type="bool" value="true"/>
+    <property name="wrap_resistance" type="int" value="10"/>
+    <property name="wrap_windows" type="bool" value="true"/>
+    <property name="wrap_workspaces" type="bool" value="false"/>
+    <property name="zoom_desktop" type="bool" value="true"/>
+    <property name="zoom_pointer" type="bool" value="true"/>
+    <property name="workspace_names" type="array">
+      <value type="string" value="●"/>
+      <value type="string" value="●"/>
+      <value type="string" value="●"/>
+      <value type="string" value="●"/>
+      <value type="string" value="Workspace 5"/>
+    </property>
+    <property name="margin_left" type="int" value="0"/>
+    <property name="margin_right" type="int" value="0"/>
+  </property>
+</channel>
diff --git a/home-manager/common/desktops/xfce/xfconf/xsettings.xml b/home-manager/common/desktops/xfce/xfconf/xsettings.xml
new file mode 100644
index 00000000..26f49872
--- /dev/null
+++ b/home-manager/common/desktops/xfce/xfconf/xsettings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xsettings" version="1.0">
+  <property name="Net" type="empty">
+    <property name="ThemeName" type="string" value="Arc-Darker"/>
+    <property name="IconThemeName" type="string" value="Arc"/>
+    <property name="DoubleClickTime" type="empty"/>
+    <property name="DoubleClickDistance" type="empty"/>
+    <property name="DndDragThreshold" type="empty"/>
+    <property name="CursorBlink" type="empty"/>
+    <property name="CursorBlinkTime" type="empty"/>
+    <property name="SoundThemeName" type="empty"/>
+    <property name="EnableEventSounds" type="bool" value="true"/>
+    <property name="EnableInputFeedbackSounds" type="bool" value="true"/>
+  </property>
+  <property name="Xft" type="empty">
+    <property name="DPI" type="empty"/>
+    <property name="Antialias" type="empty"/>
+    <property name="Hinting" type="empty"/>
+    <property name="HintStyle" type="empty"/>
+    <property name="RGBA" type="empty"/>
+  </property>
+  <property name="Gtk" type="empty">
+    <property name="CanChangeAccels" type="bool" value="false"/>
+    <property name="ColorPalette" type="empty"/>
+    <property name="FontName" type="empty"/>
+    <property name="MonospaceFontName" type="empty"/>
+    <property name="IconSizes" type="empty"/>
+    <property name="KeyThemeName" type="empty"/>
+    <property name="ToolbarStyle" type="empty"/>
+    <property name="ToolbarIconSize" type="empty"/>
+    <property name="MenuImages" type="bool" value="true"/>
+    <property name="ButtonImages" type="bool" value="true"/>
+    <property name="MenuBarAccel" type="empty"/>
+    <property name="CursorThemeName" type="empty"/>
+    <property name="CursorThemeSize" type="empty"/>
+    <property name="DecorationLayout" type="empty"/>
+    <property name="DialogsUseHeader" type="bool" value="false"/>
+    <property name="TitlebarMiddleClick" type="empty"/>
+  </property>
+  <property name="Gdk" type="empty">
+    <property name="WindowScalingFactor" type="empty"/>
+  </property>
+  <property name="Xfce" type="empty">
+    <property name="SyncThemes" type="bool" value="true"/>
+  </property>
+</channel>
diff --git a/home-manager/hosts/rdesktop/desktops/xfce/default.nix b/home-manager/hosts/rdesktop/desktops/xfce/default.nix
index e69de29b..0db3279e 100644
--- a/home-manager/hosts/rdesktop/desktops/xfce/default.nix
+++ b/home-manager/hosts/rdesktop/desktops/xfce/default.nix
@@ -0,0 +1,3 @@
+{
+
+}
diff --git a/nixos/common/services/docker.nix b/nixos/common/services/docker.nix
index e9bf0439..1ccea644 100644
--- a/nixos/common/services/docker.nix
+++ b/nixos/common/services/docker.nix
@@ -15,7 +15,6 @@
     environment.systemPackages = with pkgs; [ 
       docker-compose 
       ctop
-      lazydocker
       inputs.compose2nix.packages.${system}.default
     ];
   
diff --git a/nixos/hosts/framework-server/firewall.nix b/nixos/hosts/framework-server/firewall.nix
index 6085d996..66242e68 100644
--- a/nixos/hosts/framework-server/firewall.nix
+++ b/nixos/hosts/framework-server/firewall.nix
@@ -15,9 +15,9 @@
         587  # Mailserver
         993  # Mailserver
         4190 # Mailserver
-        4443 # Jitsi
         5696 # dsm-kmip server
         3389 # RDP
+        4443 # Jitsi
       ];
       allowedUDPPorts = [
         53    # DNS (udp)
diff --git a/nixos/hosts/milan-linode-01/containers/derp.nix b/nixos/hosts/milan-linode-01/containers/derp.nix
index 8c1ec3e6..4d131726 100644
--- a/nixos/hosts/milan-linode-01/containers/derp.nix
+++ b/nixos/hosts/milan-linode-01/containers/derp.nix
@@ -8,7 +8,7 @@
     };
 
   # Containers
-  virtualisation.oci-containers.containers."headscale-derp" = {
+  virtualisation.oci-containers.containers."derp" = {
     image = "docker.io/fredliang/derper";
     environment = {
       DERP_ADDR = ":1443";
diff --git a/nixos/hosts/osaka-linode-01/containers/derp.nix b/nixos/hosts/osaka-linode-01/containers/derp.nix
index 0854c8a9..d98bdcd3 100644
--- a/nixos/hosts/osaka-linode-01/containers/derp.nix
+++ b/nixos/hosts/osaka-linode-01/containers/derp.nix
@@ -8,7 +8,7 @@
     };
 
   # Containers
-  virtualisation.oci-containers.containers."headscale-derp" = {
+  virtualisation.oci-containers.containers."derp" = {
     image = "docker.io/fredliang/derper";
     environment = {
       DERP_ADDR = ":1443";
diff --git a/nixos/hosts/osaka-linode-01/wireguard.nix b/nixos/hosts/osaka-linode-01/wireguard.nix
index 63592528..8dc7e3a8 100644
--- a/nixos/hosts/osaka-linode-01/wireguard.nix
+++ b/nixos/hosts/osaka-linode-01/wireguard.nix
@@ -59,4 +59,4 @@
       };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/nixos/hosts/piaware-rpi4/default.nix b/nixos/hosts/piaware-rpi4/default.nix
index 5c2cdc97..1a0afd2a 100644
--- a/nixos/hosts/piaware-rpi4/default.nix
+++ b/nixos/hosts/piaware-rpi4/default.nix
@@ -4,7 +4,7 @@
     (modulesPath + "/installer/scan/not-detected.nix")
     ../../common/services/tailscale-autoconnect.nix
     ../../common/services/podman.nix
-    ./podman/piaware.nix
+    ./containers/piaware.nix
   ];
   # Enable distributed Builds
   nix.distributedBuilds = true;
diff --git a/nixos/hosts/piaware-rpi4/podman/piaware.nix b/nixos/hosts/piaware-rpi4/podman/piaware.nix
deleted file mode 100644
index 457fc2c9..00000000
--- a/nixos/hosts/piaware-rpi4/podman/piaware.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-# Auto-generated using compose2nix v0.1.6.
-{ pkgs, lib, ... }: {
-  # Containers
-  virtualisation.oci-containers.containers."piaware" = {
-    image = "ghcr.io/sdr-enthusiasts/docker-piaware:latest";
-    environment = {
-      FEEDER_ID = "cdca89ee-6612-4707-b0bb-ffb78d156c47";
-      LAT = "35.6837777585358";
-      LONG = "135.02715404216545";
-      RECEIVER_TYPE = "rtlsdr";
-      TZ = "Asia/Tokyo";
-    };
-    ports = [ "8080:80/tcp" ];
-    log-driver = "journald";
-    extraOptions = [
-      "--device=/dev/bus/usb:/dev/bus/usb"
-      "--network-alias=piaware"
-      "--network=piaware-default"
-    ];
-  };
-  systemd.services."podman-piaware" = {
-    serviceConfig = {
-      Restart = lib.mkOverride 500 "always";
-    };
-    after    = [ "podman-network-piaware-default.service" ];
-    requires = [ "podman-network-piaware-default.service" ];
-    partOf   = [ "podman-compose-piaware-root.target" ];
-    wantedBy = [ "podman-compose-piaware-root.target" ];
-  };
-
-  # Networks
-  systemd.services."podman-network-piaware-default" = {
-    path = [ pkgs.podman ];
-    serviceConfig = {
-      Type = "oneshot";
-      RemainAfterExit = true;
-      ExecStop = "${pkgs.podman}/bin/podman network rm -f piaware-default";
-    };
-    script = ''
-      podman network inspect piaware-default || podman network create piaware-default --opt isolate=true
-    '';
-    partOf   = [ "podman-compose-piaware-root.target" ];
-    wantedBy = [ "podman-compose-piaware-root.target" ];
-  };
-
-  # Root service
-  # When started, this will automatically create all resources and start
-  # the containers. When stopped, this will teardown all resources.
-  systemd.targets."podman-compose-piaware-root" = {
-    unitConfig = {
-      Description = "Root target generated by compose2nix.";
-    };
-    wantedBy = [ "multi-user.target" ];
-  };
-}