From 0b7f6502a9183968792bdfecef2c56208a7ea5a5 Mon Sep 17 00:00:00 2001 From: Severin Kaderli Date: Tue, 28 May 2019 21:43:26 +0200 Subject: [PATCH] Fix package lists Signed-off-by: Severin Kaderli --- install | 27 ++++++++-- packages/packages.aur.list | 48 +++++++++++++++++ .../{packages.list => packages.native.list} | 51 ------------------- post-install | 11 +--- 4 files changed, 72 insertions(+), 65 deletions(-) create mode 100644 packages/packages.aur.list rename packages/{packages.list => packages.native.list} (80%) diff --git a/install b/install index 61d6173..3665cb5 100755 --- a/install +++ b/install @@ -115,6 +115,12 @@ SYSTEMD_SERVICES=( "xboxdrv" ) +# Rust components which should be installed +RUST_COMPONENTS=( + "rls" + "rustfmt" +) + ############################################################################### # Install package manager and packages # ############################################################################### @@ -136,12 +142,24 @@ else print_log "yay is already installed" fi - -print_section "Installing packages" -package_count=$(< "${PACKAGES_DIR}/packages.list" wc -l) +print_section "Installing native packages" +# List created using: yay -Qqen > packages.native.list +package_count=$(< "${PACKAGES_DIR}/packages.native.list" wc -l) print_log "Installing ${package_count} packages" yay -Syy > /dev/null 2>&1 -yay -S --noconfirm --sudoloop --needed --devel --nopgpfetch --mflags --skippgpcheck - < "${PACKAGES_DIR}/packages.list" +yay -S --noconfirm --sudoloop --needed --devel --nopgpfetch --mflags --skippgpcheck - < "${PACKAGES_DIR}/packages.native.list" + +print_section "Installing Rust toolchain and components" +rustup toolchain install beta +rustup component add "${RUST_COMPONENTS[@]}" +rustup default beta + +print_section "Installing AUR packages" +package_count=$(< "${PACKAGES_DIR}/packages.aur.list" wc -l) +# List created using: yay -Qqem > packages.aur.list +print_log "Installing ${package_count} packages" +yay -Syy > /dev/null 2>&1 +yay -S --noconfirm --sudoloop --needed --devel --nopgpfetch --mflags --skippgpcheck - < "${PACKAGES_DIR}/packages.aur.list" ############################################################################### @@ -164,7 +182,6 @@ else done fi - ############################################################################### # Creating symlinks # ############################################################################### diff --git a/packages/packages.aur.list b/packages/packages.aur.list new file mode 100644 index 0000000..7101139 --- /dev/null +++ b/packages/packages.aur.list @@ -0,0 +1,48 @@ +autokey +betterlockscreen-git +cava +citra-qt-git +cutentr-git +discord +displaylink +dolphin-emu-git +escrotum-git +flips-git +g810-led-git +gksu +godot-mono-bin +google-chrome-beta +gotop-bin +grive-git +ibus-qt +intellij-idea-ultimate-edition +java-openjfx-bin +jstest-gtk-git +melonds-git +mgba-qt-git +minecraft-launcher +mupen64plus-qt +notable-bin +nvidia-xrun-git +pandoc-bin +pandoc-citeproc-bin +pandoc-crossref-bin +paper-icon-theme +pegasus-fe-git +phonon-qt4 +php-cs-fixer +plata-theme +polybar +protontricks +python-gspread-git +rpcs3-git +slack-desktop-dark +streamlink-git +sxiv-git +tealdeer +ttf-mac-fonts +ttf-ms-fonts +xboxdrv +xwiimote-git +xwinwrap-git +yay diff --git a/packages/packages.list b/packages/packages.native.list similarity index 80% rename from packages/packages.list rename to packages/packages.native.list index 1d32a9e..3e9d70b 100644 --- a/packages/packages.list +++ b/packages/packages.native.list @@ -6,24 +6,19 @@ anki arandr autoconf autojump -autokey automake autopep8 bash bash-completion bat -bbswitch beep -betterlockscreen-git biber binutils bison blueman bluez-utils bzip2 -cava ccache -citra-qt-git cmatrix cmus code @@ -35,21 +30,16 @@ cronie cryptsetup cups cups-pdf -cutentr-git deluge desmume device-mapper dhcpcd diffutils -discord -displaylink docker docker-compose -dolphin-emu-git dunst e2fsprogs efibootmgr -escrotum-git evince evtest exfat-utils @@ -64,25 +54,18 @@ findutils firefox flameshot flex -flips-git fuseiso -g810-led-git gawk gcc gcc-libs gettext gimp git -gksu glibc -godot-mono-bin -google-chrome-beta -gotop-bin gparted gpick gpicview-gtk3 grep -grive-git grub gtk-engine-murrine gtk-engines @@ -94,22 +77,17 @@ gzip hplip httpie i3-gaps -i3-layout-manager-git ibus ibus-anthy -ibus-qt inetutils inotify-tools -intellij-idea-ultimate-edition iproute2 iputils -java-openjfx-bin jdk-openjdk jdk8-openjdk jfsutils jpegoptim jre-openjdk -jstest-gtk-git keepassxc kvantum-theme-adapta less @@ -135,29 +113,23 @@ man-pages mariadb maven mdadm -melonds-git mesa mesa-demos -mgba-qt-git -minecraft-launcher mono mpv mtpfs mupdf mupen64plus -mupen64plus-qt nano nemo nemo-fileroller neofetch -nerd-fonts-complete netctl network-manager-applet networkmanager newsboat nmap nodejs -notable-bin noto-fonts noto-fonts-cjk noto-fonts-emoji @@ -165,7 +137,6 @@ npm nss-mdns nvidia nvidia-settings -nvidia-xrun obs-studio openssh optipng @@ -173,24 +144,14 @@ ovmf p7zip pacman pamixer -pandoc-bin -pandoc-citeproc-bin -pandoc-crossref-bin -paper-icon-theme patch pavucontrol pciutils -pegasus-fe-git perl perl-archive-zip -phonon-qt4 -php-cs-fixer picard -plata-theme -polybar postgresql procps-ng -protontricks psmisc pulseaudio pulseaudio-alsa @@ -198,7 +159,6 @@ pyside2 python-atspi python-black python-google-api-python-client -python-gspread-git python-numpy python-oauth2client python-pycodestyle @@ -220,7 +180,6 @@ reiserfsprogs riot-desktop ripgrep rofi -rpcs3-git ruby rust-racer rustup @@ -230,19 +189,15 @@ sed shadow shellcheck simple-scan -slack-desktop-dark slock sqlitebrowser steam -streamlink-git sudo sxhkd -sxiv-git sysfsutils systemd-sysvcompat tar task -tealdeer terminus-font texinfo texlive-bibtexextra @@ -273,8 +228,6 @@ ttf-fira-sans ttf-font-awesome ttf-hack ttf-liberation -ttf-mac-fonts -ttf-ms-fonts ttf-roboto ttf-ubuntu-font-family tumbler @@ -289,7 +242,6 @@ whois wine winetricks wqy-zenhei -xboxdrv xclip xdelta3 xdg-user-dirs @@ -306,10 +258,7 @@ xorg-xwininfo xpad xreader xss-lock -xwiimote-git -xwinwrap-git yarn -yay youtube-dl zathura-pdf-mupdf zsh diff --git a/post-install b/post-install index cc938eb..9ddc5ac 100755 --- a/post-install +++ b/post-install @@ -28,11 +28,7 @@ NPM_PACKAGES=( "npm-check-updates" ) -# Rust components which should be installed -RUST_COMPONENTS=( - "rls" - "rustfmt" -) + ####################################### # Main code @@ -57,10 +53,7 @@ print_section "Installing global npm packages" print_log "Installing ${#NPM_PACKAGES[@]} packages" npm i -g "${NPM_PACKAGES[@]}" -print_section "Install Rust toolchain and components" -rustup toolchain install beta -rustup default beta -rustup component add "${RUST_COMPONENTS[@]}" + print_section "Manual TODOs" print_log "Run ${YELLOW}~/.config/polybar/scripts/gmail/auth.py${RESET}"