From 6567be0c68fd7ac356606ee8076787f7b575264d Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Fri, 31 May 2019 08:18:05 +0200 Subject: [PATCH] [blackbox] --- blackbox/abook-v142-kde/Packages-Desktop | 2 +- blackbox/blackbox/Packages-Desktop | 86 ++++++++++------------ blackbox/blackbox/Packages-Live | 11 ++- blackbox/blackbox/Packages-Mhwd | 1 - blackbox/blackbox/Packages-Root | 93 +++++++++++++++++++++++- blackbox/blackbox/profile.conf | 6 +- 6 files changed, 146 insertions(+), 53 deletions(-) mode change 120000 => 100644 blackbox/blackbox/Packages-Live delete mode 120000 blackbox/blackbox/Packages-Mhwd mode change 120000 => 100644 blackbox/blackbox/Packages-Root diff --git a/blackbox/abook-v142-kde/Packages-Desktop b/blackbox/abook-v142-kde/Packages-Desktop index ccb8173..208b065 100644 --- a/blackbox/abook-v142-kde/Packages-Desktop +++ b/blackbox/abook-v142-kde/Packages-Desktop @@ -141,7 +141,7 @@ illyria-wallpaper >extra manjaro-wallpapers-18.0 ## Better systray/notifications support ->extra sni-qt # A Qt plugin that enables tray icons in qt4 applications +#>extra sni-qt # A Qt plugin that enables tray icons in qt4 applications ## KDE Applications ark diff --git a/blackbox/blackbox/Packages-Desktop b/blackbox/blackbox/Packages-Desktop index e7aea1a..088d7e7 100644 --- a/blackbox/blackbox/Packages-Desktop +++ b/blackbox/blackbox/Packages-Desktop @@ -36,36 +36,17 @@ #---------=> office ## metapackage manjaro-printer ->extra cups ->extra cups-pdf ->extra cups-pk-helper ->extra ghostscript ->extra gsfonts ->extra gutenprint ->extra hplip ->extra python-gobject ->extra python-pyqt5 ->extra splix ->extra system-config-printer - -#---------=> build support ->extra autoconf ->extra automake ->extra binutils ->extra bison ->extra flex ->extra gc ->extra gcc ->extra git ->extra guile ->extra libatomic_ops ->extra libmpc ->extra m4 ->extra make ->extra package-query ->extra patch ->extra pkg-config ->extra yajl +#>extra cups +#>extra cups-pdf +#>extra cups-pk-helper +#>extra ghostscript +#>extra gsfonts +#>extra gutenprint +#>extra hplip +#>extra python-gobject +#>extra python-pyqt5 +#>extra splix +#>extra system-config-printer #---------=> file utilities >extra catfish @@ -75,9 +56,9 @@ >extra poppler-data >extra poppler-glib >extra p7zip ->extra thunar-archive-plugin-gtk3 +>extra thunar-archive-plugin >extra thunar-media-tags-plugin ->extra thunar-volman-gtk3 +>extra thunar-volman >extra tumbler >extra unace >extra unarchiver @@ -95,13 +76,33 @@ #---------=> basic utilities >extra galculator +>extra speedcrunch #---------=> package manager -pamac-gtk +>extra pamac-gtk #------------------------------------------------- ##### EDITION BASE PACKAGES +#---------=> build support +autoconf +automake +binutils +bison +flex +gc +gcc +git +guile +libatomic_ops +libmpc +m4 +make +package-query +patch +pkg-config +yajl + #---------=> package manager pamac-cli pacui @@ -144,8 +145,7 @@ mc ranger #---------=> GUI file manager -#thunar-gtk3 -pcmanfm-gtk3 +thunar #---------=> disk utilities clonezilla @@ -165,7 +165,6 @@ jp2a mesa-demos neofetch ps_mem -speedcrunch tlp-rdw tlpui tree @@ -186,11 +185,11 @@ lightdm-settings lightdm-slick-greeter #---------=> settings manager -lxappearance-gtk3 -#lxappearance-obconf-gtk3 +lxappearance +lxappearance-obconf manjaro-settings-manager -xfce4-settings-gtk3 -#xfce4-power-manager-gtk3 +xfce4-settings +xfce4-power-manager #---------=> desktop settings and config manjaro-openbox-config @@ -200,12 +199,8 @@ manjaro-openbox-desktop-settings manjaro-grub-theme-glassfield manjaro-openbox-scripts manjaro-openbox-maia -manjaro-openbox-wallpapers manjaro-slick-greeter-theme-glassfield manjaro-wallpapers-18.0 -manjaro-wallpapers-by-lunix-cool-logo -manjaro-wallpapers-by-lunix-manjaro -manjaro-wallpapers-by-lunix-openbox manjaro-zsh-config matcha-gtk-theme papirus-maia-icon-theme @@ -233,7 +228,7 @@ arandr compton conky dunst -exo-gtk3 +exo fakeroot i3lock imagemagick @@ -257,7 +252,6 @@ synapse termite termite-terminfo tint2 -wireless_tools wmctrl xcape xcb-util-cursor diff --git a/blackbox/blackbox/Packages-Live b/blackbox/blackbox/Packages-Live deleted file mode 120000 index 5e66e00..0000000 --- a/blackbox/blackbox/Packages-Live +++ /dev/null @@ -1 +0,0 @@ -../../shared/Packages-Live \ No newline at end of file diff --git a/blackbox/blackbox/Packages-Live b/blackbox/blackbox/Packages-Live new file mode 100644 index 0000000..aae61d0 --- /dev/null +++ b/blackbox/blackbox/Packages-Live @@ -0,0 +1,10 @@ +calamares +>manjaro grub-theme-live-manjaro +gsmartcontrol +manjaro-architect +manjaro-live-skel +manjaro-live-systemd +mkinitcpio-nfs-utils +nbd +squashfs-tools +clonezilla diff --git a/blackbox/blackbox/Packages-Mhwd b/blackbox/blackbox/Packages-Mhwd deleted file mode 120000 index 9df3d5e..0000000 --- a/blackbox/blackbox/Packages-Mhwd +++ /dev/null @@ -1 +0,0 @@ -../../shared/Packages-Mhwd \ No newline at end of file diff --git a/blackbox/blackbox/Packages-Root b/blackbox/blackbox/Packages-Root deleted file mode 120000 index 60cc7bd..0000000 --- a/blackbox/blackbox/Packages-Root +++ /dev/null @@ -1 +0,0 @@ -../../shared/Packages-Root \ No newline at end of file diff --git a/blackbox/blackbox/Packages-Root b/blackbox/blackbox/Packages-Root new file mode 100644 index 0000000..b7cc3f2 --- /dev/null +++ b/blackbox/blackbox/Packages-Root @@ -0,0 +1,92 @@ +>i686 archlinux32-keyring +>manjaro manjaro-release +>multilib gcc-libs-multilib +acpi +acpid +amd-ucode +b43-fwcutter +bash +btrfs-progs +bzip2 +coreutils +cpupower +crda +cronie +cryptsetup +device-mapper +dhclient +dhcpcd +diffutils +dmraid +dnsmasq +dosfstools +e2fsprogs +ecryptfs-utils +efibootmgr +exfat-utils +f2fs-tools +file +filesystem +findutils +gawk +gcc-libs +gettext +glibc +grep +grub +gzip +haveged +inetutils +intel-ucode +iproute2 +iptables +iputils +ipw2100-fw +ipw2200-fw +jfsutils +KERNEL +less +licenses +linux-firmware +logrotate +lsb-release +lvm2 +man-db +man-pages +manjaro-firmware +manjaro-system +mdadm +memtest86+ +mhwd +mhwd-db +mkinitcpio-openswap +nano +nfs-utils +ntfs-3g +os-prober +pacman +pciutils +perl +procps-ng +psmisc +reiserfsprogs +rsync +s-nail +sed +shadow +spectre-meltdown-checker +sudo +sysfsutils +systemd-fsck-silent +systemd-sysvcompat +tar +texinfo +tlp +usbutils +util-linux +vi +wget +which +wpa_supplicant +xfsprogs +zsh diff --git a/blackbox/blackbox/profile.conf b/blackbox/blackbox/profile.conf index 4f44584..6b3f287 100644 --- a/blackbox/blackbox/profile.conf +++ b/blackbox/blackbox/profile.conf @@ -12,7 +12,7 @@ displaymanager="lightdm" autologin="true" # nonfree mhwd drivers -nonfree_mhwd="true" +nonfree_mhwd="false" # use extra packages as defined in pkglist to activate a full profile # extra="false" @@ -36,7 +36,7 @@ geoip="true" # unset defaults to given values # names must match systemd service names -enable_systemd=('avahi-daemon' 'bluetooth' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'systemd-timesyncd' 'tlp' 'tlp-sleep' 'ufw') +enable_systemd=('avahi-daemon' 'NetworkManager' 'systemd-timesyncd') disable_systemd=('pacman-init') # the same workgroup name if samba is used @@ -51,7 +51,7 @@ user_shell="/bin/zsh" ################# livecd ################# # unset defaults to given value -hostname="manjaro-openbox" +hostname="blackbox" # unset defaults to given value # username="manjaro"