world: replace xfce4-mixer with pnmixer

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

10 files changed, 55 insertions, 18 deletions

diff --git a/core/etc/grs/world.conf b/core/etc/grs/world.conf
index b751fcd..72b6786 100644
--- a/core/etc/grs/world.conf
+++ b/core/etc/grs/world.conf
@@ -1269,6 +1269,9 @@ package.use : media-sound/lame:0 -cpu_flags_x86_mmx -debug -mp3rtp -sndfile -sta
 [media-sound/mpg123:0]
 package.use : media-sound/mpg123:0 -alsa -coreaudio -cpu_flags_x86_3dnow -cpu_flags_x86_3dnowext -cpu_flags_x86_mmx -int-quality -jack -nas -oss -portaudio -pulseaudio -sdl cpu_flags_x86_sse ipv6
 
+[media-sound/pnmixer:0]
+package.use : media-sound/pnmixer:0 -doc -libnotify nls
+
 [media-sound/twolame:0]
 package.use : media-sound/twolame:0 -static-libs -test sndfile
 
diff --git a/core/etc/skel/.config/autostart/Sound Mixer.desktop b/core/etc/skel/.config/autostart/Sound Mixer.desktop
new file mode 100644
index 0000000..151e8a6
--- /dev/null
+++ b/core/etc/skel/.config/autostart/Sound Mixer.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.9.4
+Type=Application
+Name=Sound Mixer
+Comment=pnmixer
+Exec=/usr/bin/pnmixer
+OnlyShowIn=XFCE;
+RunHook=0
+StartupNotify=false
+Terminal=false
+Hidden=false
+
diff --git a/core/etc/skel/.config/xfce4/desktop/icons.screen.latest.rc b/core/etc/skel/.config/xfce4/desktop/icons.screen.latest.rc
new file mode 120000
index 0000000..8dfd0cd
--- /dev/null
+++ b/core/etc/skel/.config/xfce4/desktop/icons.screen.latest.rc
@@ -0,0 +1 @@
+/home/gentoo/.config/xfce4/desktop/icons.screen0-784x522.rc
\ No newline at end of file
diff --git a/core/etc/skel/.config/xfce4/desktop/icons.screen0-784x522.rc b/core/etc/skel/.config/xfce4/desktop/icons.screen0-784x522.rc
new file mode 100644
index 0000000..4f83913
--- /dev/null
+++ b/core/etc/skel/.config/xfce4/desktop/icons.screen0-784x522.rc
@@ -0,0 +1,7 @@
+[xfdesktop-version-4.10.3+-rcfile_format]
+4.10.3+=true
+
+[2022-05-28-11-54-05-00]
+row=0
+col=0
+
diff --git a/core/etc/skel/.config/xfce4/panel/launcher-12/13698963011.desktop b/core/etc/skel/.config/xfce4/panel/launcher-12/13698963011.desktop
deleted file mode 100644
index 29e4c72..0000000
--- a/core/etc/skel/.config/xfce4/panel/launcher-12/13698963011.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Audio Mixer
-Comment=Adjust volume levels
-Icon=multimedia-volume-control
-Exec=xfce4-mixer
-Type=Application
-StartupNotify=true
-Terminal=false
-Categories=X-XFCE;Audio;Mixer;AudioVideo;
-X-XFCE-Source=file:///usr/share/applications/xfce4-mixer.desktop
diff --git a/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml b/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
index c3ea5fa..85f3b23 100644
--- a/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+++ b/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
@@ -52,6 +52,28 @@
           <property name="last-image" type="string" value="/usr/share/slim/themes/default/background.jpg"/>
         </property>
       </property>
+      <property name="monitorVGA-1" type="empty">
+        <property name="workspace0" 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/slim/themes/default/background.jpg"/>
+        </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/slim/themes/default/background.jpg"/>
+        </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/slim/themes/default/background.jpg"/>
+        </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/slim/themes/default/background.jpg"/>
+        </property>
+      </property>
     </property>
   </property>
   <property name="desktop-icons" type="empty">
diff --git a/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
index 5efa56c..5119fe9 100644
--- a/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
+++ b/core/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -15,7 +15,6 @@
         <value type="int" value="3"/>
         <value type="int" value="15"/>
         <value type="int" value="4"/>
-        <value type="int" value="12"/>
         <value type="int" value="5"/>
         <value type="int" value="6"/>
         <value type="int" value="2"/>
@@ -65,7 +64,12 @@
     </property>
     <property name="plugin-4" type="string" value="pager"/>
     <property name="plugin-5" type="string" value="clock"/>
-    <property name="plugin-6" type="string" value="systray"/>
+    <property name="plugin-6" type="string" value="systray">
+      <property name="known-legacy-items" type="array">
+        <value type="string" value="pnmixer"/>
+        <value type="string" value="notification-daemon"/>
+      </property>
+    </property>
     <property name="plugin-7" type="string" value="showdesktop"/>
     <property name="plugin-8" type="string" value="separator">
       <property name="style" type="uint" value="1"/>
@@ -117,10 +121,5 @@
       </property>
     </property>
     <property name="plugin-23" type="string" value="thunar-tpa"/>
-    <property name="plugin-12" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="13698963011.desktop"/>
-      </property>
-    </property>
   </property>
 </channel>
diff --git a/core/var/lib/portage/world.CYCLE.2 b/core/var/lib/portage/world.CYCLE.2
index f0c06aa..40257e3 100644
--- a/core/var/lib/portage/world.CYCLE.2
+++ b/core/var/lib/portage/world.CYCLE.2
@@ -19,6 +19,7 @@ mail-mta/postfix
 media-gfx/eog
 media-gfx/gimp
 media-sound/alsa-utils
+media-sound/pnmixer
 media-video/smplayer
 net-analyzer/tcpdump
 net-dns/avahi
diff --git a/core/var/lib/portage/world.CYCLE.3 b/core/var/lib/portage/world.CYCLE.3
index 86eb829..ae18f9b 100644
--- a/core/var/lib/portage/world.CYCLE.3
+++ b/core/var/lib/portage/world.CYCLE.3
@@ -20,6 +20,7 @@ mail-mta/postfix
 media-gfx/eog
 media-gfx/gimp
 media-sound/alsa-utils
+media-sound/pnmixer
 media-video/smplayer
 net-analyzer/tcpdump
 net-dns/avahi
diff --git a/core/var/lib/portage/world.CYCLE.4 b/core/var/lib/portage/world.CYCLE.4
index f9e0e3c..5d22826 100644
--- a/core/var/lib/portage/world.CYCLE.4
+++ b/core/var/lib/portage/world.CYCLE.4
@@ -20,6 +20,7 @@ mail-mta/postfix
 media-gfx/eog
 media-gfx/gimp
 media-sound/alsa-utils
+media-sound/pnmixer
 media-video/smplayer
 net-analyzer/tcpdump
 net-dns/avahi