changes to xfce-customization

defaults/main.yaml

@@ -16,20 +16,3 @@ application_starters:
   - firefox-esr
   - chromium
   - xfce4-terminal
-  - xfce-display-settings
-
-application_default_favorites:
-  - exo-file-manager
-  - gnome-search-tool
-  - firefox-esr
-  - chromium
-  - thunderbird
-  - libreoffice-writer
-  - libreoffice-calc
-  - libreoffice-impress
-  - libreoffice-draw
-  - xfce-display-settings
-  - xfce4-screenshooter
-  - fotowall
-  - org.gnome.gThumb
-  - simple-scan

files/xfce-customization/xdg/xfce4/panel/datetime-10.rc

@@ -1,5 +1,5 @@
 layout=1
-date_font=Sans 16
-time_font=Sans Bold 28
+date_font=Sans 12
+time_font=Sans Bold 20
 date_format=%a, %d.%m.
 time_format=%H:%M

templates/xfce-customization/whiskermenu-1.rc.j2 → files/xfce-customization/xdg/xfce4/panel/whiskermenu-1.rc

@@ -1,6 +1,5 @@
-favorites={{ application_default_favorites | map('regex_replace', '(.*)', '\\1.desktop')  | join(',') }}
-recent=
-button-title=Anwendungen
+favorites=thunar.desktop,gnome-search-tool.desktop,firefox-esr.desktop,chromium.desktop,thunderbird.desktop,libreoffice-writer.desktop,libreoffice-calc.desktop,libreoffice-impress.desktop,libreoffice-draw.desktop,org.gnome.gThumb.desktop,simple-scan.desktop,xfce4-screenshooter.desktop,xfce-display-settings.desktop
+recent=xfce-wmtweaks-settings.desktop,groovyConsole.desktop,mousepad.desktop
 button-icon=applications-other
 button-single-row=false
 show-button-title=false
@@ -10,14 +9,18 @@ launcher-show-description=true
 launcher-show-tooltip=true
 item-icon-size=3
 hover-switch-category=false
+category-show-name=true
 category-icon-size=1
 load-hierarchy=false
+view-as-icons=false
+default-category=0
 recent-items-max=10
 favorites-in-recent=true
-display-recent-default=false
 position-search-alternate=false
 position-commands-alternate=false
 position-categories-alternate=false
+stay-on-focus-out=false
+confirm-session-command=true
 menu-width=600
 menu-height=800
 menu-opacity=90
@@ -25,8 +28,18 @@ command-settings=xfce4-settings-manager
 show-command-settings=true
 command-lockscreen=xflock4
 show-command-lockscreen=true
-command-switchuser=gdmflexiserver
-show-command-switchuser=false
+command-switchuser=dm-tool switch-to-greeter
+show-command-switchuser=true
+command-logoutuser=xfce4-session-logout --logout --fast
+show-command-logoutuser=false
+command-restart=xfce4-session-logout --reboot --fast
+show-command-restart=false
+command-shutdown=xfce4-session-logout --halt --fast
+show-command-shutdown=false
+command-suspend=xfce4-session-logout --suspend
+show-command-suspend=false
+command-hibernate=xfce4-session-logout --hibernate
+show-command-hibernate=false
 command-logout=xfce4-session-logout
 show-command-logout=true
 command-menueditor=menulibre

files/xfce-customization/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml

@@ -0,0 +1,9 @@
+<channel name="xfce4-power-manager" version="1.0">
+  <property name="xfce4-power-manager" type="empty">
+    <property name="power-button-action" type="empty"/>
+    <property name="brightness-switch-restore-on-exit" type="int" value="0"/>
+    <property name="brightness-switch" type="int" value="0"/>
+    <property name="show-tray-icon" type="bool" value="false"/>
+    <property name="show-panel-label" type="int" value="0"/>
+  </property>
+</channel>

tasks/xfce-customization.yaml

@@ -10,11 +10,6 @@
     src: xfce-customization/xfce4-panel.xml.j2
     dest: /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
 
-- name: whiskermenu config
-  template:
-    src: xfce-customization/whiskermenu-1.rc.j2
-    dest: /etc/xdg/xfce4/panel/whiskermenu-1.rc
-
 - name: xfwm4 config
   template:
     src: xfce-customization/xfwm4.xml.j2

templates/xfce-customization/xfce4-panel.xml.j2

@@ -7,10 +7,10 @@
   <property name="panels" type="array">
     <value type="int" value="1"/>
     <property name="panel-1" type="empty">
-      <property name="position" type="string" value="p=12;x=0;y=997"/>
+      <property name="position" type="string" value="p=6;x=0;y=0"/>
       <property name="length" type="uint" value="100"/>
       <property name="position-locked" type="bool" value="true"/>
-      <property name="size" type="uint" value="42"/>
+      <property name="size" type="uint" value="28"/>
       <property name="plugin-ids" type="array">
         <value type="int" value="1"/>
         <value type="int" value="12"/>
@@ -34,15 +34,7 @@
       </property>
       <property name="nrows" type="uint" value="2"/>
       <property name="disable-struts" type="empty"/>
-      <property name="background-style" type="uint" value="1"/>
-      <property name="background-alpha" type="uint" value="50"/>
-      <property name="background-color" type="array">
-        <value type="uint" value="58982"/>
-        <value type="uint" value="58982"/>
-        <value type="uint" value="58982"/>
-        <value type="uint" value="65535"/>
-      </property>
-
+      <property name="background-style" type="uint" value="0"/>
     </property>
   </property>
   <property name="plugins" type="empty">
@@ -119,9 +111,7 @@
       </property>
     </property>
 
-    <property name="plugin-8" type="string" value="pulseaudio">
-      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
-    </property>
+    <property name="plugin-8" type="empty"/>
     <property name="plugin-9" type="string" value="power-manager-plugin"/>
 
     <property name="plugin-10" type="string" value="datetime"/>

templates/xfce-customization/xfwm4.xml.j2

@@ -56,7 +56,7 @@
     <property name="snap_to_windows" type="bool" value="false"/>
     <property name="snap_width" type="int" value="10"/>
     <property name="sync_to_vblank" type="bool" value="false"/>
-    <property name="theme" type="string" value="Kokodi"/>
+    <property name="theme" type="string" value="Default"/>
     <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 12"/>