Merge branch 'desktop-i3_xfce.testing' into desktop-i3_xfce

.config/discord/settings.json

@@ -2,12 +2,12 @@
   "BACKGROUND_COLOR": "#202225",
   "OPEN_ON_STARTUP": false,
   "MINIMIZE_TO_TRAY": false,
-  "IS_MAXIMIZED": true,
+  "IS_MAXIMIZED": false,
   "IS_MINIMIZED": false,
   "WINDOW_BOUNDS": {
-    "x": 2,
+    "x": 3841,
-    "y": 28,
+    "y": 1,
-    "width": 956,
+    "width": 1598,
-    "height": 1024
+    "height": 898
   }
 }

.config/i3/config

@@ -47,6 +47,8 @@ bindsym $mod+Shift+o		resize grow height 1 px or 1 ppt
 bindsym $mod+Shift+p		resize shrink width 1 px or 1 ppt
 bindsym $mod+Shift+r		exec --no-startup-id winresize
 bindsym $mod+f			fullscreen toggle
+bindsym $mod+t      workspace_layout tabbed
+bindsym $mod+Shift+t      workspace_layout tiling
 bindsym $mod+q [con_id="__focused__" instance="^(?!dropdown_).*$"] kill
 # bindsym $mod+o			split h;exec notify-send 'tile horizontally'
 # bindsym $mod+i			split v;exec notify-send 'tile vertically'
@@ -107,7 +109,7 @@ bindsym $mod+Shift+0	move container to workspace $ws10
 
 
 # KEYBOARD SHORTCUTS
-bindsym $mod+d			exec --no-startup-id dmenu_run
+bindsym $mod+d			exec --no-startup-id xfce4-popup-whiskermenu
 bindsym $mod+Return 		exec --no-startup-id $termEm
 bindsym $mod+w			exec --no-startup-id $BROWSER
 # Show selection:

.config/xfce4/panel/whiskermenu-8.rc

@@ -1,5 +1,5 @@
 favorites=xfce4-terminal-emulator.desktop,xfce4-file-manager.desktop,xfce4-web-browser.desktop,xfce4-mail-reader.desktop
-recent=xfce4-terminal-emulator.desktop,xfce-keyboard-settings.desktop,xfce-display-settings.desktop,firefox.desktop,bitwarden.desktop,org.manjaro.pamac.manager.desktop,thunar.desktop
+recent=telegramdesktop.desktop,vlc.desktop,jetbrains-idea.desktop,xfce-display-settings.desktop,org.manjaro.pamac.manager.desktop,thunar.desktop,joplin.desktop,bitwarden.desktop,discord.desktop,teamspeak3.desktop
 button-icon=/usr/share/icons/whiskermenu-manjaro.svg
 button-single-row=false
 show-button-title=false
@@ -23,8 +23,8 @@ position-categories-horizontal=false
 stay-on-focus-out=false
 profile-shape=0
 confirm-session-command=true
-menu-width=2560
+menu-width=510
-menu-height=1440
+menu-height=549
 menu-opacity=100
 command-settings=xfce4-settings-manager
 show-command-settings=true

.config/xfce4/terminal/terminalrc

@@ -0,0 +1,30 @@
+[Configuration]
+MiscAlwaysShowTabs=FALSE
+MiscBell=FALSE
+MiscBellUrgent=FALSE
+MiscBordersDefault=TRUE
+MiscCursorBlinks=FALSE
+MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK
+MiscDefaultGeometry=80x24
+MiscInheritGeometry=FALSE
+MiscMenubarDefault=TRUE
+MiscMouseAutohide=FALSE
+MiscMouseWheelZoom=TRUE
+MiscToolbarDefault=FALSE
+MiscConfirmClose=FALSE
+MiscCycleTabs=TRUE
+MiscTabCloseButtons=TRUE
+MiscTabCloseMiddleClick=TRUE
+MiscTabPosition=GTK_POS_TOP
+MiscHighlightUrls=TRUE
+MiscMiddleClickOpensUri=FALSE
+MiscCopyOnSelect=FALSE
+MiscShowRelaunchDialog=TRUE
+MiscRewrapOnResize=TRUE
+MiscUseShiftArrowsToScroll=FALSE
+MiscSlimTabs=FALSE
+MiscNewTabAdjacent=FALSE
+MiscSearchDialogOpacity=100
+MiscShowUnsafePasteDialog=TRUE
+MiscRightClickAction=TERMINAL_RIGHT_CLICK_ACTION_CONTEXT_MENU
+

.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <channel name="displays" version="1.0">
-  <property name="ActiveProfile" type="string" value="f66c01e28187a10aaf92e14d049783bc98954348"/>
+  <property name="ActiveProfile" type="string" value="Default"/>
   <property name="Default" type="empty">
     <property name="eDP-1" type="string" value="Laptop">
       <property name="Active" type="bool" value="true"/>
@@ -20,14 +20,48 @@
         <property name="Y" type="int" value="0"/>
       </property>
     </property>
-    <property name="HDMI-2" type="string" value="Dell Inc. 27&quot;">
+    <property name="HDMI-2" type="string" value="Hitachi Ltd 74&quot;">
       <property name="Active" type="bool" value="true"/>
-      <property name="EDID" type="string" value="8e85084eac2a6fde3e963b461d47fe6654a8eca3"/>
+      <property name="EDID" type="string" value="a43a7508431c69883628ce9ec2d8b3307c769e5e"/>
       <property name="Resolution" type="string" value="2560x1440"/>
       <property name="RefreshRate" type="double" value="59.950550"/>
       <property name="Rotation" type="int" value="0"/>
       <property name="Reflection" type="string" value="0"/>
-      <property name="Primary" type="bool" value="true"/>
+      <property name="Primary" type="bool" value="false"/>
+      <property name="Scale" type="empty">
+        <property name="X" type="double" value="1.000000"/>
+        <property name="Y" type="double" value="1.000000"/>
+      </property>
+      <property name="Position" type="empty">
+        <property name="X" type="int" value="0"/>
+        <property name="Y" type="int" value="0"/>
+      </property>
+    </property>
+    <property name="DP-1" type="string" value="Acer Technologies 20&quot;">
+      <property name="Active" type="bool" value="true"/>
+      <property name="EDID" type="string" value="83c46d528bd3ae63202b3a95940b788aae98da3d"/>
+      <property name="Resolution" type="string" value="1600x900"/>
+      <property name="RefreshRate" type="double" value="59.946021"/>
+      <property name="Rotation" type="int" value="0"/>
+      <property name="Reflection" type="string" value="0"/>
+      <property name="Primary" type="bool" value="false"/>
+      <property name="Scale" type="empty">
+        <property name="X" type="double" value="1.000000"/>
+        <property name="Y" type="double" value="1.000000"/>
+      </property>
+      <property name="Position" type="empty">
+        <property name="X" type="int" value="3840"/>
+        <property name="Y" type="int" value="180"/>
+      </property>
+    </property>
+    <property name="DP-2-3" type="string" value="Fujitsu Siemens Computers GmbH 24&quot;">
+      <property name="Active" type="bool" value="true"/>
+      <property name="EDID" type="string" value="3ac067f469266177b5b402de9b36f341716166c4"/>
+      <property name="Resolution" type="string" value="1920x1080"/>
+      <property name="RefreshRate" type="double" value="60.000000"/>
+      <property name="Rotation" type="int" value="0"/>
+      <property name="Reflection" type="string" value="0"/>
+      <property name="Primary" type="bool" value="false"/>
       <property name="Scale" type="empty">
         <property name="X" type="double" value="1.000000"/>
         <property name="Y" type="double" value="1.000000"/>
@@ -56,14 +90,48 @@
         <property name="Y" type="int" value="0"/>
       </property>
     </property>
-    <property name="HDMI-2" type="string" value="Dell Inc. 27&quot;">
+    <property name="HDMI-2" type="string" value="Hitachi Ltd 74&quot;">
       <property name="Active" type="bool" value="true"/>
-      <property name="EDID" type="string" value="8e85084eac2a6fde3e963b461d47fe6654a8eca3"/>
+      <property name="EDID" type="string" value="a43a7508431c69883628ce9ec2d8b3307c769e5e"/>
       <property name="Resolution" type="string" value="2560x1440"/>
       <property name="RefreshRate" type="double" value="59.950550"/>
       <property name="Rotation" type="int" value="0"/>
       <property name="Reflection" type="string" value="0"/>
-      <property name="Primary" type="bool" value="true"/>
+      <property name="Primary" type="bool" value="false"/>
+      <property name="Scale" type="empty">
+        <property name="X" type="double" value="1.000000"/>
+        <property name="Y" type="double" value="1.000000"/>
+      </property>
+      <property name="Position" type="empty">
+        <property name="X" type="int" value="0"/>
+        <property name="Y" type="int" value="0"/>
+      </property>
+    </property>
+    <property name="DP-1" type="string" value="Acer Technologies 20&quot;">
+      <property name="Active" type="bool" value="true"/>
+      <property name="EDID" type="string" value="83c46d528bd3ae63202b3a95940b788aae98da3d"/>
+      <property name="Resolution" type="string" value="1600x900"/>
+      <property name="RefreshRate" type="double" value="59.946021"/>
+      <property name="Rotation" type="int" value="0"/>
+      <property name="Reflection" type="string" value="0"/>
+      <property name="Primary" type="bool" value="false"/>
+      <property name="Scale" type="empty">
+        <property name="X" type="double" value="1.000000"/>
+        <property name="Y" type="double" value="1.000000"/>
+      </property>
+      <property name="Position" type="empty">
+        <property name="X" type="int" value="3840"/>
+        <property name="Y" type="int" value="180"/>
+      </property>
+    </property>
+    <property name="DP-2-3" type="string" value="Fujitsu Siemens Computers GmbH 24&quot;">
+      <property name="Active" type="bool" value="true"/>
+      <property name="EDID" type="string" value="3ac067f469266177b5b402de9b36f341716166c4"/>
+      <property name="Resolution" type="string" value="1920x1080"/>
+      <property name="RefreshRate" type="double" value="60.000000"/>
+      <property name="Rotation" type="int" value="0"/>
+      <property name="Reflection" type="string" value="0"/>
+      <property name="Primary" type="bool" value="false"/>
       <property name="Scale" type="empty">
         <property name="X" type="double" value="1.000000"/>
         <property name="Y" type="double" value="1.000000"/>

.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml

@@ -8,9 +8,12 @@
   <property name="theme" type="string" value="Default"/>
   <property name="applications" type="empty">
     <property name="known_applications" type="array">
+      <value type="string" value="discord"/>
       <value type="string" value="Firefox"/>
       <value type="string" value="MSM Notifier"/>
       <value type="string" value="nm-applet"/>
+      <value type="string" value="org.manjaro.pamac.manager"/>
+      <value type="string" value="org.manjaro.pamac.tray"/>
       <value type="string" value="Package Manager"/>
       <value type="string" value="Xfce volume control"/>
       <value type="string" value="Xfce4-notifyd settings"/>

.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml

@@ -7,11 +7,13 @@
       <property name="length" type="uint" value="100"/>
       <property name="position-locked" type="bool" value="true"/>
       <property name="plugin-ids" type="array">
+        <value type="int" value="1"/>
         <value type="int" value="7"/>
         <value type="int" value="4"/>
-        <value type="int" value="6"/>
         <value type="int" value="9"/>
+        <value type="int" value="6"/>
         <value type="int" value="5"/>
+        <value type="int" value="3"/>
         <value type="int" value="8"/>
       </property>
       <property name="role" type="string" value="xfce4-panel-12965750720"/>
@@ -48,6 +50,20 @@
       </property>
       <property name="show-frame" type="bool" value="false"/>
       <property name="known-legacy-items" type="array">
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (61%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (58%)"/>
+        <value type="string" value="wi-fi network connection “jojo” active: jojo (61%)"/>
+        <value type="string" value="wi-fi network connection “jojo” active: jojo (56%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (67%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (68%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (59%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (72%)"/>
+        <value type="string" value="wi-fi network connection “jojo” active: jojo (51%)"/>
+        <value type="string" value="no network connection"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (63%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (62%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (69%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (65%)"/>
         <value type="string" value="ethernet network connection “wired connection 1” active"/>
         <value type="string" value="bluetooth disabled"/>
         <value type="string" value="thunar"/>
@@ -57,15 +73,36 @@
         <value type="string" value="pamac-tray"/>
       </property>
       <property name="known-items" type="array">
+        <value type="string" value="TelegramDesktop"/>
+        <value type="string" value="discord1"/>
         <value type="string" value="MSM Notifier"/>
         <value type="string" value="blueman"/>
       </property>
       <property name="hide-new-items" type="bool" value="true"/>
       <property name="hidden-legacy-items" type="array">
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (61%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (69%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (72%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (67%)"/>
+        <value type="string" value="no network connection"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (58%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (65%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (63%)"/>
+        <value type="string" value="wi-fi network connection “jojo” active: jojo (51%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (68%)"/>
+        <value type="string" value="wi-fi network connection “jojo” active: jojo (61%)"/>
+        <value type="string" value="wi-fi network connection “jojo” active: jojo (56%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (62%)"/>
+        <value type="string" value="wi-fi network connection “eduroam” active: eduroam (59%)"/>
       </property>
       <property name="single-row" type="bool" value="false"/>
       <property name="symbolic-icons" type="bool" value="false"/>
       <property name="menu-is-primary" type="bool" value="false"/>
+      <property name="icon-size" type="int" value="22"/>
+      <property name="hidden-items" type="array">
+        <value type="string" value="TelegramDesktop"/>
+        <value type="string" value="discord1"/>
+      </property>
     </property>
     <property name="plugin-7" type="string" value="separator">
       <property name="expand" type="bool" value="true"/>
@@ -73,9 +110,20 @@
     </property>
     <property name="plugin-9" type="string" value="pulseaudio">
       <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
+      <property name="mpris-players" type="string" value="firefox.instance1205;firefox.instance1213;firefox.instance1233;firefox.instance1304;firefox.instance1314;firefox.instance1618;firefox.instance1640;firefox.instance2190;vlc"/>
     </property>
     <property name="plugin-8" type="string" value="whiskermenu"/>
     <property name="plugin-5" type="string" value="clock"/>
+    <property name="plugin-1" type="string" value="appmenu">
+      <property name="plugins" type="empty">
+        <property name="plugin-1" type="empty">
+          <property name="compact-mode" type="bool" value="true"/>
+          <property name="bold-application-name" type="bool" value="true"/>
+          <property name="expand" type="bool" value="true"/>
+        </property>
+      </property>
+    </property>
+    <property name="plugin-3" type="string" value="power-manager-plugin"/>
   </property>
   <property name="configver" type="int" value="2"/>
 </channel>

.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml

@@ -6,5 +6,7 @@
     <property name="show-tray-icon" type="bool" value="false"/>
     <property name="brightness-switch-restore-on-exit" type="int" value="1"/>
     <property name="brightness-switch" type="int" value="0"/>
+    <property name="show-panel-label" type="int" value="1"/>
+    <property name="show-presentation-indicator" type="bool" value="false"/>
   </property>
 </channel>

.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml

@@ -72,9 +72,9 @@
     <property name="wrap_windows" type="bool" value="true"/>
     <property name="wrap_workspaces" type="bool" value="false"/>
     <property name="workspace_names" type="array">
+      <value type="string" value="layout tiling"/>
+      <value type="string" value="layout tabbed"/>
       <value type="string" value="1"/>
-      <value type="string" value="2"/>
-      <value type="string" value="3"/>
       <value type="string" value="4"/>
       <value type="string" value="5"/>
       <value type="string" value="6"/>

.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml

@@ -2,7 +2,7 @@
 
 <channel name="xsettings" version="1.0">
   <property name="Net" type="empty">
-    <property name="ThemeName" type="string" value="Matcha-sea"/>
+    <property name="ThemeName" type="string" value="Matcha-dark-sea"/>
     <property name="IconThemeName" type="string" value="Papirus-Maia"/>
     <property name="DoubleClickTime" type="int" value="532"/>
     <property name="DoubleClickDistance" type="int" value="8"/>
@@ -40,6 +40,8 @@
     <property name="IMPreeditStyle" type="string" value=""/>
     <property name="IMStatusStyle" type="string" value=""/>
     <property name="IMModule" type="string" value=""/>
+    <property name="ShellShowsMenubar" type="bool" value="true"/>
+    <property name="ShellShowsAppmenu" type="bool" value="true"/>
   </property>
   <property name="Gdk" type="empty">
     <property name="WindowScalingFactor" type="empty"/>