From 64e557a8b97c4975c25cf5bd12fa3bb51fb38756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 28 Dec 2016 16:37:18 +0100 Subject: Rewrite arch packages little bit List of expected packages is now generated using m4 language. --- archlinux.pkgs | 198 ++++++----------------------------------- archlinux.pkgs.d/cynerd-laptop | 17 ++++ archlinux.pkgs.d/cynerd-pc | 17 ++++ archlinux.pkgs.d/desktop | 104 ++++++++++++++++++++++ archlinux.pkgs.d/devel | 41 +++++++++ archlinux.pkgs.d/laptop | 30 +++++++ archlinux.pkgs.d/openrc | 9 ++ archlinux.pkgs.d/steam | 4 + archlinux.pkgs.d/wine | 6 ++ install | 12 +-- utils/arch | 5 +- utils/install_pacaur | 2 + 12 files changed, 269 insertions(+), 176 deletions(-) create mode 100644 archlinux.pkgs.d/cynerd-laptop create mode 100644 archlinux.pkgs.d/cynerd-pc create mode 100644 archlinux.pkgs.d/desktop create mode 100644 archlinux.pkgs.d/devel create mode 100644 archlinux.pkgs.d/laptop create mode 100644 archlinux.pkgs.d/openrc create mode 100644 archlinux.pkgs.d/steam create mode 100644 archlinux.pkgs.d/wine diff --git a/archlinux.pkgs b/archlinux.pkgs index 57b3a2a..64e3838 100644 --- a/archlinux.pkgs +++ b/archlinux.pkgs @@ -1,190 +1,50 @@ -# Various essential to me programs console +dnl vim:ft=m4 +dnl File containing names of explicitly installed packages on system +esyscmd(`echo define\(HOSTNAME,$(hostname)\)') +sinclude(HOSTNAME) + +dnl Various essential console programs pacaur -gvim +pkgfile +ifdef(`DESKTOP',gvim,vim) vim-spell-cs vim-spell-en htop mc -pass -lynx -abook openssh -unzip ncdu -pkgfile -syncthing-openrc rsync rdiff-backup wget sshfs -wireless_tools +zsh zsh-completions -nmap - -# Various graphic programs -gimp -inkscape -vlc -conkeror -surf-webkit2gtk-git -feh -kdegraphics-okular -steam -steam-native-runtime -sc-controller -graphviz - -# Pidgin -purple-facebook -purple-hangouts-hg -pidgin-encryption -pidgin-gpg-git -pidgin-hotkeys -pidgin-latex -pidgin-libnotify -pidgin-window_merge - -# Stardict -stardict-cz -stardict-en-cz - -# Chromium -chromium-widevine -pepper-flash - -# Music player daemon -mpc -mpd -ncmpcpp +bash-completion +bc +pv +sysstat -# Mail -neomutt -msmtp -offlineimap -python2-daemon - -# My desktop -i3-wm -i3blocks -dunst -xzoom -xorg-server-nosystemd -xorg-server-utils -xorg-xinit -xorg-xev -urxvt-perls -urxvt-resize-font-git -urxvt-vtwheel -numlockx -xdotool -inotify-tools -pulsemixer -qt5-styleplugins -numix-frost-themes - -# Fonts -terminus-font -font-mathematica -ttf-hack -ttf-symbola -noto-fonts-emoji -powertop -emojione-color-font -twemoji-color-font -texlive-fontsextra - -# Codecs -x264 - -# Matlab fix -ncurses5-compat-libs - -# System stuff -linux -syslinux -acpid-openrc -alsa-utils-openrc -cpupower-openrc -cronie-openrc -cryptsetup +dnl System stuff dhcpcd-openrc -wpa_supplicant-openrc -rfkill fuse-openrc -syslog-ng-openrc -gpm-openrc -ifplugd -iproute2 -iputils ntp-openrc -bluez-openrc -bluez-utils -powertop -lm_sensors-openrc -openvpn-openrc -# FS +sudo +lsof +hdparm + +dnl File systems btrfs-progs -mdadm -xfsprogs -jfsutils exfat-utils -reiserfsprogs -# System but not essential or who knows if needed -mesa-demos -pcmciautils - -# bluetooth -bluez-hid2hci -obexfs -obextool -pulseaudio-bluetooth - -# My asus laptop specific stuff -asus-kbd-backlight -intel-ucode -virtualgl-openrc -lib32-nvidia-utils -xf86-input-synaptics -xf86-video-intel +dosfstools -# Stuff used durring development -tig -dash -mkdocs -asciidoc -cppcheck -ctags -valgrind -texlive-latexextra -# Web -ruby-jekyll -# Python -twine -flake8 -ipython -python-pypandoc -python-xattr -python2-xattr -python-daemon +dnl network +bind-tools +nmap -# Building stuff -autoconf -automake -make -bison -flex -clang -cmake -fakeroot -patch -pkg-config +dnl archive +unzip +zip +rar -# Base -vi -which -licenses -lvm2 -usbutils -nano -man-db -man-pages +dnl Base group +syscmd(`pacman -Qg base | awk "{print \$2}"') diff --git a/archlinux.pkgs.d/cynerd-laptop b/archlinux.pkgs.d/cynerd-laptop new file mode 100644 index 0000000..85b9e7e --- /dev/null +++ b/archlinux.pkgs.d/cynerd-laptop @@ -0,0 +1,17 @@ +dnl vim:ft=m4 +include(laptop) +include(openrc) +include(devel) +include(steam) +include(wine) + +intel-ucode + +openvpn-openrc +easy-rsa +freecad +transmission-gtk +qemu-arch-extra + +dnl for testing +stress diff --git a/archlinux.pkgs.d/cynerd-pc b/archlinux.pkgs.d/cynerd-pc new file mode 100644 index 0000000..ae5d2f7 --- /dev/null +++ b/archlinux.pkgs.d/cynerd-pc @@ -0,0 +1,17 @@ +dnl vim:ft=m4 +dnl My asus laptop specific stuff +include(laptop) +include(openrc) +include(devel) +include(steam) +include(wine) + +asus-kbd-backlight +intel-ucode +virtualgl-openrc +lib32-nvidia-utils +xf86-input-synaptics +xf86-video-intel + +dnl steam controller user driver +sc-controller diff --git a/archlinux.pkgs.d/desktop b/archlinux.pkgs.d/desktop new file mode 100644 index 0000000..8efbff6 --- /dev/null +++ b/archlinux.pkgs.d/desktop @@ -0,0 +1,104 @@ +dnl vim:ft=m4 +define(DESKTOP) + +dnl Some system level stuff +gpm-openrc +alsa-utils-openrc +pulseaudio +pulseaudio-alsa +fuseiso + +dnl Some command line tools +lynx +abook +pass +syncthing-openrc +ttysterm +dnl Stardict +sdcv +stardict-cz +stardict-en-cz + +dnl Various graphic programs +gimp +inkscape +vlc +conkeror +surf-webkit2gtk-git +feh +okular +graphviz +mesa-demos + +dnl Pidgin +purple-facebook +purple-hangouts-hg +pidgin-encryption +pidgin-gpg-git +pidgin-hotkeys +pidgin-latex +pidgin-libnotify +pidgin-window_merge + +dnl Chromium +chromium-widevine +pepper-flash + +dnl Music player daemon +mpc +mpd +ncmpcpp + +dnl Mail +neomutt +msmtp +offlineimap +python2-daemon +urlview + +dnl My desktop +i3-wm +i3blocks +i3lock +dmenu +dunst +xzoom +xorg-server-nosystemd +xorg-server-utils +xorg-xinit +xorg-xev +rxvt-unicode +urxvt-perls +urxvt-resize-font-git +urxvt-vtwheel +numlockx +xdotool +inotify-tools +pulsemixer +qt5-styleplugins +numix-frost-themes +xorg-setxkbmap +dnl For app .desktop management +perl-file-mimeinfo + +dnl Fonts +terminus-font +font-mathematica +ttf-hack +ttf-symbola +noto-fonts-emoji +powertop +emojione-color-font +twemoji-color-font +texlive-fontsextra + +dnl Codecs +x264 +mpg123 +lib32-mpg123 + +dnl Matlab fix +ncurses5-compat-libs + +dnl Java blee +jre8-openjdk diff --git a/archlinux.pkgs.d/devel b/archlinux.pkgs.d/devel new file mode 100644 index 0000000..41c7b74 --- /dev/null +++ b/archlinux.pkgs.d/devel @@ -0,0 +1,41 @@ +dnl vim:ft=m4 +define(DEVEL) + +dnl devel group +syscmd(`pacman -Qg base-devel | awk "{print \$2}"') + +dnl yep ansible +ansible +dnl I sometimes use busybox for testing scripts +busybox + +dnl Stuff used durring development +tig +dash +mkdocs +asciidoc +cppcheck +ctags +valgrind +texlive-latexextra +git +dnl Web +ruby +ruby-jekyll + +dnl Python +twine +flake8 +ipython +python-pypandoc +python-xattr +python2-xattr +python-daemon + +dnl Building stuff +clang +cmake +patch + +dnl work devel +lua51 diff --git a/archlinux.pkgs.d/laptop b/archlinux.pkgs.d/laptop new file mode 100644 index 0000000..0d1e89a --- /dev/null +++ b/archlinux.pkgs.d/laptop @@ -0,0 +1,30 @@ +dnl vim:ft=m4 +define(LAPTOP) +include(desktop) + +dnl System essentials +syslinux +efibootmgr +acpid-openrc +lm_sensors-openrc +xf86-input-synaptics +xf86-video-intel + +dnl Network +wpa_supplicant-openrc +wireless_tools +rfkill + +dnl Also system but not exactly essential for me +cpupower-openrc +powertop +pm-utils +acpi + +dnl bluetooth +bluez +bluez-utils +bluez-hid2hci +obexfs +obextool +pulseaudio-bluetooth diff --git a/archlinux.pkgs.d/openrc b/archlinux.pkgs.d/openrc new file mode 100644 index 0000000..03f8ac7 --- /dev/null +++ b/archlinux.pkgs.d/openrc @@ -0,0 +1,9 @@ +dnl vim:ft=m4 +define(OPENRC) + +syscmd(`pacman -Qg base-openrc | awk "{print \$2}"') +syslog-ng-openrc +cronie-openrc +bluez-openrc +consolekit-openrc +libpulse-nosystemd diff --git a/archlinux.pkgs.d/steam b/archlinux.pkgs.d/steam new file mode 100644 index 0000000..db6ed40 --- /dev/null +++ b/archlinux.pkgs.d/steam @@ -0,0 +1,4 @@ +dnl vim:ft=m4 + +steam +steam-native-runtime diff --git a/archlinux.pkgs.d/wine b/archlinux.pkgs.d/wine new file mode 100644 index 0000000..ae6c153 --- /dev/null +++ b/archlinux.pkgs.d/wine @@ -0,0 +1,6 @@ +dnl vim:ft=m4 + +wine +wine_gecko +wine-mono +winetricks diff --git a/install b/install index 416bae5..b7a289f 100755 --- a/install +++ b/install @@ -6,16 +6,18 @@ cd `dirname $0` git submodule update --init || (echo "Submodule update failed! Use --ignore-sub if it's ok."; exit 5) # Source inst and diff function -source utils/inst -source utils/arch +. ./utils/inst # TODO if on archlinux install pkgstats and other packages we would need for every feature ################################################################################# source private/install # private files, sorry but some privacy is required. -read -p "Chek Archlinux system? (Y/n) " -if [[ $REPLY =~ ^[Yy]?$ ]]; then - archlinux_inst +if [ -e /etc/arch-release ]; then + . ./utils/arch + read -p "Chek Archlinux packages? (Y/n) " + if [[ $REPLY =~ ^[Yy]?$ ]]; then + archlinux_inst + fi fi read -p "Install Bashrc? (Y/n) " diff --git a/utils/arch b/utils/arch index 5a1ed19..ccf1133 100644 --- a/utils/arch +++ b/utils/arch @@ -14,9 +14,10 @@ archlinux_inst() { fi TFILE1=$(mktemp myconfigs-pacaur1-XXXXX) - grep -E '^[^# ]+$' archlinux.pkgs | sort > "$TFILE1" + m4 archlinux.pkgs -I archlinux.pkgs.d | grep -E '^[^ ]+$' | sort | uniq > "$TFILE1" TFILE2=$(mktemp myconfigs-pacaur2-XXXXX) - pacaur -Qqet | sort > "$TFILE2" + pacaur -Qqe | sort > "$TFILE2" + echo " Required Local" diff --suppress-common-lines -ay "$TFILE1" "$TFILE2" rm "$TFILE1" "$TFILE2" } diff --git a/utils/install_pacaur b/utils/install_pacaur index 0add3b2..0cabd46 100755 --- a/utils/install_pacaur +++ b/utils/install_pacaur @@ -31,3 +31,5 @@ cd pacaur makepkg -Acis cd .. rm -rf pacaur pacaur.tar.gz +# Set cower to be just an dependency +pacman -D --asdeps cower -- cgit v1.2.3