From fe19b5ba4bde91287be93f873c4254252df21207 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Sun, 7 Jun 2020 18:02:19 +0200 Subject: [PATCH 1/6] change branch --- community/lxqt/Packages-Desktop | 53 ++++++++----------- community/lxqt/profile.conf | 2 +- .../desktop-overlay/etc/lxdm/lxdm.conf | 6 ++- dev-null | 1 + shared/Packages-Mhwd | 4 +- 5 files changed, 30 insertions(+), 36 deletions(-) create mode 100644 dev-null diff --git a/community/lxqt/Packages-Desktop b/community/lxqt/Packages-Desktop index cc7c5549..4c3a2068 100644 --- a/community/lxqt/Packages-Desktop +++ b/community/lxqt/Packages-Desktop @@ -4,9 +4,7 @@ ## Connect Packages >extra android-tools >extra android-udev ->extra gvfs-afc >extra gvfs-gphoto2 ->extra gvfs-mtp ## Extra Fonts >extra noto-fonts @@ -33,11 +31,6 @@ >extra gst-plugins-good >extra gst-plugins-ugly >extra libdvdcss ->extra pulseaudio-bluetooth ->extra pulseaudio-ctl ->extra pulseaudio-zeroconf ->extra manjaro-pulse ->extra manjaro-alsa >extra vlc ## Printer @@ -55,26 +48,6 @@ >extra system-config-printer >extra simple-scan -## AUR Support/Development ->extra autoconf ->extra automake ->extra binutils ->extra bison ->extra fakeroot ->extra flex ->extra gcc ->extra git ->extra libtool ->extra m4 ->extra make ->extra patch ->extra patchutils ->extra pkg-config ->extra subversion - -## Office -#>extra libreoffice-still - ## Graphics >extra pinta @@ -85,8 +58,8 @@ >extra juffed-qt5 ## Disc utilities -#>extra gparted -#>extra imagewriter +>extra gparted +>extra mintstick ## File management >extra p7zip @@ -99,9 +72,24 @@ ## webbrowser firefox -## basic audio support +## bluetooth device management +blueman +pulseaudio-bluetooth + +## text edit and notes +featherpad +feathernotes + +## audio support alsa-firmware alsa-utils +paprefs +pasystray +pavucontrol-qt +pulseaudio +pulseaudio-ctl +pulseaudio-zeroconf + ## edition theming and settings kvantum-theme-matcha @@ -133,6 +121,8 @@ ttf-roboto ## filemanager ark gvfs +gvfs-afc +gvfs-mtp gvfs-nfs gvfs-smb pcmanfm-qt @@ -140,7 +130,7 @@ udiskie udisks2 ## Terminal -qterminal +termite ## package manager pamac-gtk @@ -162,6 +152,7 @@ networkmanager-qt openresolv networkmanager-openvpn openssh +blueman ## core lxqt-about diff --git a/community/lxqt/profile.conf b/community/lxqt/profile.conf index 630a2110..8bffb959 100644 --- a/community/lxqt/profile.conf +++ b/community/lxqt/profile.conf @@ -36,7 +36,7 @@ geoip='true' # unset defaults to given values # names must match systemd service names -enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'systemd-timesyncd' 'tlp' 'tlp-sleep' 'ufw') +enable_systemd=('avahi-daemon' 'bluetooth' 'NetworkManager' 'org.cups.cupsd' 'systemd-timesyncd' 'tlp' 'tlp-sleep') disable_systemd=('pacman-init' 'systemd-rfkill.service' 'systemd-rfkill.socket') # the same workgroup name if samba is used diff --git a/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf b/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf index b608829f..e11522a8 100644 --- a/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf +++ b/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf @@ -37,7 +37,10 @@ theme=PacBang gtk_theme=PacBang ## background of the greeter -bg=/usr/share/backgrounds/PacBang/lunix/PacBang_3840x2160(by_Lunix).png +bg=/usr/share/backgrounds/PacBang/lunix/PacBang_1920x1080(by_Lunix).png + +## background color +#bg=#2e2e34343636 ## if hide time hide_time=0 @@ -71,4 +74,3 @@ white= ## blacklist user black= - diff --git a/dev-null b/dev-null new file mode 100644 index 00000000..36f12c39 --- /dev/null +++ b/dev-null @@ -0,0 +1 @@ +Cloning into '/tmp/profiles'... diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd index 395c571d..fcc782d1 100644 --- a/shared/Packages-Mhwd +++ b/shared/Packages-Mhwd @@ -1,6 +1,6 @@ ## The following is only temp for 18.1-rc7 ->extra libreoffice-still ->extra freeoffice +>office libreoffice-still +>office freeoffice ## Normal MHWD package list From e5b46ba15d78452bc5b9fa87db635e1f2679b593 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Sun, 7 Jun 2020 18:03:54 +0200 Subject: [PATCH 2/6] [architect] add xdg-user-dirs --- manjaro/architect/Packages-Live | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manjaro/architect/Packages-Live b/manjaro/architect/Packages-Live index 13ca4c5e..a66e6dc5 100644 --- a/manjaro/architect/Packages-Live +++ b/manjaro/architect/Packages-Live @@ -13,11 +13,10 @@ manjaro-live-systemd networkmanager terminus-font virtualbox-guest-utils +xdg-user-dirs xf86-input-elographics xf86-input-evdev -#xf86-input-keyboard # deprecated xf86-input-libinput -#xf86-input-mouse # deprecated xf86-input-vmmouse xf86-input-void grub-theme-live-manjaro-dev From 1c66783967e4f02f7a5ee06968bf0a650a586ff1 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Sun, 7 Jun 2020 18:32:30 +0200 Subject: [PATCH 3/6] [lxqt] remove qt5ct - see note in Packages-Desktop --- community/lxqt/Packages-Desktop | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/community/lxqt/Packages-Desktop b/community/lxqt/Packages-Desktop index 4c3a2068..90b35326 100644 --- a/community/lxqt/Packages-Desktop +++ b/community/lxqt/Packages-Desktop @@ -177,7 +177,9 @@ manjaro-documentation-en manjaro-hello manjaro-settings-manager obconf-qt -qt5ct +# https://github.com/lxqt/lxqt/issues/1368#issuecomment-340221833 +# https://forum.manjaro.org/t/lxqt-error-with-qt5ct/145431 +# qt5ct ## system icons adwaita-icon-theme From 9de917fc90fa0cec78415be63a82162eac364397 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Sun, 7 Jun 2020 18:02:19 +0200 Subject: [PATCH 4/6] change branch --- community/lxqt/Packages-Desktop | 53 ++++++++----------- community/lxqt/profile.conf | 2 +- .../desktop-overlay/etc/lxdm/lxdm.conf | 6 ++- dev-null | 1 + shared/Packages-Mhwd | 3 ++ 5 files changed, 31 insertions(+), 34 deletions(-) create mode 100644 dev-null diff --git a/community/lxqt/Packages-Desktop b/community/lxqt/Packages-Desktop index cc7c5549..4c3a2068 100644 --- a/community/lxqt/Packages-Desktop +++ b/community/lxqt/Packages-Desktop @@ -4,9 +4,7 @@ ## Connect Packages >extra android-tools >extra android-udev ->extra gvfs-afc >extra gvfs-gphoto2 ->extra gvfs-mtp ## Extra Fonts >extra noto-fonts @@ -33,11 +31,6 @@ >extra gst-plugins-good >extra gst-plugins-ugly >extra libdvdcss ->extra pulseaudio-bluetooth ->extra pulseaudio-ctl ->extra pulseaudio-zeroconf ->extra manjaro-pulse ->extra manjaro-alsa >extra vlc ## Printer @@ -55,26 +48,6 @@ >extra system-config-printer >extra simple-scan -## AUR Support/Development ->extra autoconf ->extra automake ->extra binutils ->extra bison ->extra fakeroot ->extra flex ->extra gcc ->extra git ->extra libtool ->extra m4 ->extra make ->extra patch ->extra patchutils ->extra pkg-config ->extra subversion - -## Office -#>extra libreoffice-still - ## Graphics >extra pinta @@ -85,8 +58,8 @@ >extra juffed-qt5 ## Disc utilities -#>extra gparted -#>extra imagewriter +>extra gparted +>extra mintstick ## File management >extra p7zip @@ -99,9 +72,24 @@ ## webbrowser firefox -## basic audio support +## bluetooth device management +blueman +pulseaudio-bluetooth + +## text edit and notes +featherpad +feathernotes + +## audio support alsa-firmware alsa-utils +paprefs +pasystray +pavucontrol-qt +pulseaudio +pulseaudio-ctl +pulseaudio-zeroconf + ## edition theming and settings kvantum-theme-matcha @@ -133,6 +121,8 @@ ttf-roboto ## filemanager ark gvfs +gvfs-afc +gvfs-mtp gvfs-nfs gvfs-smb pcmanfm-qt @@ -140,7 +130,7 @@ udiskie udisks2 ## Terminal -qterminal +termite ## package manager pamac-gtk @@ -162,6 +152,7 @@ networkmanager-qt openresolv networkmanager-openvpn openssh +blueman ## core lxqt-about diff --git a/community/lxqt/profile.conf b/community/lxqt/profile.conf index 630a2110..8bffb959 100644 --- a/community/lxqt/profile.conf +++ b/community/lxqt/profile.conf @@ -36,7 +36,7 @@ geoip='true' # unset defaults to given values # names must match systemd service names -enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'systemd-timesyncd' 'tlp' 'tlp-sleep' 'ufw') +enable_systemd=('avahi-daemon' 'bluetooth' 'NetworkManager' 'org.cups.cupsd' 'systemd-timesyncd' 'tlp' 'tlp-sleep') disable_systemd=('pacman-init' 'systemd-rfkill.service' 'systemd-rfkill.socket') # the same workgroup name if samba is used diff --git a/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf b/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf index b608829f..e11522a8 100644 --- a/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf +++ b/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf @@ -37,7 +37,10 @@ theme=PacBang gtk_theme=PacBang ## background of the greeter -bg=/usr/share/backgrounds/PacBang/lunix/PacBang_3840x2160(by_Lunix).png +bg=/usr/share/backgrounds/PacBang/lunix/PacBang_1920x1080(by_Lunix).png + +## background color +#bg=#2e2e34343636 ## if hide time hide_time=0 @@ -71,4 +74,3 @@ white= ## blacklist user black= - diff --git a/dev-null b/dev-null new file mode 100644 index 00000000..36f12c39 --- /dev/null +++ b/dev-null @@ -0,0 +1 @@ +Cloning into '/tmp/profiles'... diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd index a94f7fa5..29bdf930 100644 --- a/shared/Packages-Mhwd +++ b/shared/Packages-Mhwd @@ -7,9 +7,12 @@ KERNEL-bbswitch KERNEL-broadcom-wl #KERNEL-r8168 +KERNEL-zfs +zfs-utils #KERNEL-rt3562sta KERNEL-virtualbox-guest-modules KERNEL-headers +zfs-dkms libva-intel-driver libva-mesa-driver libva-vdpau-driver From 24255ada93ea9f64d441c44d3f477513765bebe6 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Sun, 7 Jun 2020 18:32:30 +0200 Subject: [PATCH 5/6] [lxqt] remove qt5ct - see note in Packages-Desktop --- community/lxqt/Packages-Desktop | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/community/lxqt/Packages-Desktop b/community/lxqt/Packages-Desktop index 4c3a2068..90b35326 100644 --- a/community/lxqt/Packages-Desktop +++ b/community/lxqt/Packages-Desktop @@ -177,7 +177,9 @@ manjaro-documentation-en manjaro-hello manjaro-settings-manager obconf-qt -qt5ct +# https://github.com/lxqt/lxqt/issues/1368#issuecomment-340221833 +# https://forum.manjaro.org/t/lxqt-error-with-qt5ct/145431 +# qt5ct ## system icons adwaita-icon-theme From a55404ee8da3e3b0303a2cb11c1f28ce6e40fa54 Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Sun, 7 Jun 2020 18:03:54 +0200 Subject: [PATCH 6/6] [architect] add xdg-user-dirs --- manjaro/architect/Packages-Live | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manjaro/architect/Packages-Live b/manjaro/architect/Packages-Live index 13ca4c5e..a66e6dc5 100644 --- a/manjaro/architect/Packages-Live +++ b/manjaro/architect/Packages-Live @@ -13,11 +13,10 @@ manjaro-live-systemd networkmanager terminus-font virtualbox-guest-utils +xdg-user-dirs xf86-input-elographics xf86-input-evdev -#xf86-input-keyboard # deprecated xf86-input-libinput -#xf86-input-mouse # deprecated xf86-input-vmmouse xf86-input-void grub-theme-live-manjaro-dev