Package update 27.11.2022

karbs.sh

@@ -1,40 +1,64 @@
 #!/bin/sh
-echo 'Choose installation size: minimal or full'
+# Kristofers Auto Rice Boostrapping Script (KARBS)
-read size
+# by Kristofers Solo
+# License: GNU GPLv3
 
-if pacman -Q paru; then
+echo 'Choose display server (X11 / Wayland)[1/2]: '
-    echo
+read -r USER_INPUT
+
+
+# Get display server type from user
+if [ "$USER_INPUT" = 1 ]; then
+    DISPLAY_SERVER="X11"
+elif [ "$USER_INPUT" = 2 ]; then
+    DISPLAY_SERVER="wayland"
 else
-    sudo pacman -S --noconfirm rust
+    echo "Wrong input. Please try again."
+    exit
+fi
+
+
+# Install paru
+if pacman -Q paru; then
+    :
+else
+    sudo pacman -S --noconfirm rust-src
     git clone 'https://aur.archlinux.org/paru-bin'
-    cd paru-bin
+    cd paru-bin || exit
     makepkg -si
     cd ..
     rm -rf paru-bin
 fi
 
-FILE = "pkg-files/$size-pkgs.txt"
+FILE="pkg-files/$DISPLAY_SERVER-pkgs.txt"
 
-if [[ -f "$FILE" ]]; then
+if [ -f "$FILE" ]; then
-    paru -Syu --noconfirm --needed - < "pkg-files/$size-pkgs"
+    paru -Syu --noconfirm --needed - < "pkg-files/$DISPLAY_SERVER-pkgs"
 else
-    curl -LO "https://raw.githubusercontent.com/kristoferssolo/karbs/main/pkg-files/$size-pkgs"
+    curl -LO "https://raw.githubusercontent.com/kristoferssolo/karbs/main/pkg-files/$DISPLAY_SERVER-pkgs"
-    paru -Syu --noconfirm --needed - < "$size-pkgs"
+    paru -Syu --noconfirm --needed - < "$DISPLAY_SERVER-pkgs"
-    rm "$size"-pkgs
+    rm -f "$DISPLAY_SERVER-pkgs"
 fi
 
-mkdir -p "$HOME"/{repos,Downloads,Documents,Videos,Music,Pictures/screenshots}
+mkdir -p "$HOME/{repos,Downloads,Documents,Videos,Music,Pictures/screenshots}"
 git clone 'https://github.com/kristoferssolo/solorice' "$HOME/repos/solorice"
 
-cp -rf "$HOME/repos/solorice/.config" "$HOME"
+cp -raf "$HOME/repos/solorice/.config" "$HOME"
-rm -rf "$HOME/.config/awesome/desktop"
+cp -raf "$HOME/repos/solorice/.local" "$HOME"
-touch "$HOME/.config/awesome/weather"
-cp -rf "$HOME/repos/solorice/.local" "$HOME"
 ln -sf "$HOME/.config/zsh/.zshenv" "$HOME"
-git clone 'https://github.com/streetturtle/awesome-wm-widgets' "$HOME/.config/awesome/awesome-wm-widgets"
+sudo chsh -s /bin/zsh
 
-chsh -s /bin/zsh
+if [ $DISPLAY_SERVER = "wayland" ]; then
-
+    rm -rf "$HOME/.config/{awesome,picom,sx,zsh/.zprofile-X11}"
-echo
+    mv "$HOME/.config/zsh/zprofile-wayland" "$HOME/.config/zsh/.zprofile"
-echo
+    Hyprland
-echo -e '\033[1;31m For weather widget to work, enter API-key from https://openweathermap.org, latitude and logitude in `~/.config/awesome/weather` file, each on seperate line. \033[0m'
+else
+    rm -rf "$HOME/.config/{hypr,waybar,zsh/.zprofile-wayland}"
+    mv "$HOME/.config/zsh/zprofile-X11" "$HOME/.config/zsh/.zprofile"
+    git clone 'https://github.com/streetturtle/awesome-wm-widgets' "$HOME/.config/awesome/awesome-wm-widgets"
+    echo -e "\n\n\033[1;31mFor weather widget to work, enter API-key from https://openweathermap.org, latitude and longitude in '~/.config/awesome/weather' file, each on seperate line.\033[0m"
+    echo "API-key"
+    echo "latitude"
+    echo "longitude"
+    echo -e "\nEverything else is ready to go. You can run 'sx' or reboot."
+fi

pkg-files/X11-pkgs

@@ -1,82 +1,65 @@
-acpid
 alacritty
-alsa-utils
-amdvlk
 arc-solid-gtk-theme
-autopep8
 awesome
 bat
-beautysh
 btop
 catdoc
 chafa
-corectrl
-dhcpcd
-doasedit-alternative
 docx2txt
 dracula-gtk-theme
 dracula-icons-git
-dust
-efibootmgr
 epub-thumbnailer-git
 exa
-fastfetch-git
+fakeroot
-fd
+fastfetch
 feh
 ffmpegthumbnailer
-flameshot-git
+flameshot
-glow
+git
 gnumeric
-grep
-groff
-groffdown
-grub
-gzip
 imagemagick
-inxi
+lazygit
 lf
 librewolf-bin
-libtool
+linux-headers
-lua
+make
-luacheck
 man-db
-meson
 mpv
 ncdu
 neovim
+network-manager-applet
+networkmanager
+nextcloud
 nextcloud-client
-noto-fonts-emoji
+nodejs
-noto-fonts-extra
-npm
 nsxiv
 ntfs-3g
 numlockx
-opendoas
+pandoc-bin
 papirus-icon-theme
-paru-bin
 picom
 pipewire
 pipewire-jack
 pipewire-pulse
 pipewire-v4l2
+pkgconf
 playerctl
+polkit-gnome
 poppler
 pulsemixer
-python-pip
+redshift
 reflector
 ripgrep
-seahorse
-sed
 skim
 spacefm
-speedtest++
+sshfs
-spotify
 starship
 sx
 tealdeer
-ttf-nerd-fonts-symbols
+transmission-cli
 ueberzug
 unicode-emoji
+unimatrix-git
 unrar
 unzip
 v4l2loopback-dkms
@@ -84,16 +67,16 @@ v4l2loopback-utils
 wget
 wireplumber
 xclip
-xf86-video-amdgpu
-xlockmore
 xorg-xinit
 xorg-xinput
 xorg-xwininfo
+youtube-dl
 zathura
 zathura-cb
 zathura-djvu
 zathura-pdf-mupdf
 zathura-ps
+zip
 zsh
 zsh-autosuggestions
 zsh-fast-syntax-highlighting

pkg-files/full-pkgs

@@ -1,287 +0,0 @@
-acpid
-adobe-source-han-sans-cn-fonts
-adobe-source-han-sans-hk-fonts
-adobe-source-han-sans-jp-fonts
-adobe-source-han-sans-kr-fonts
-adobe-source-han-sans-otc-fonts
-adobe-source-han-sans-tw-fonts
-adobe-source-han-serif-cn-fonts
-adobe-source-han-serif-hk-fonts
-adobe-source-han-serif-jp-fonts
-adobe-source-han-serif-kr-fonts
-adobe-source-han-serif-otc-fonts
-adobe-source-han-serif-tw-fonts
-alacritty
-alsa-utils
-amd-ucode
-amdvlk
-arc-solid-gtk-theme
-archlinux-appstream-data
-artix-archlinux-support
-asciidoctor
-audacity
-authy
-autoconf
-automake
-autopep8
-awesome
-base
-bat
-beautysh
-betterdiscordctl
-binutils
-bison
-bitwarden
-blender
-bridge-utils
-btop
-catdoc
-cef-minimal-obs-bin
-chafa
-corectrl
-cups
-cups-runit
-darktable
-dhcpcd
-discord
-dnsmasq
-doasedit-alternative
-docx2txt
-dracula-gtk-theme
-dracula-icons-git
-droidcam
-dropbox
-dust
-dxvk-bin
-efibootmgr
-element-desktop
-elogind-runit
-epub-thumbnailer-git
-esysusers
-etmpfiles
-exa
-fakeroot
-fastfetch-git
-fd
-feh
-ferdium-bin
-ffmpegthumbnailer
-file
-filelight
-findutils
-flameshot-git
-flex
-fontmatrix
-ftba
-gamemode
-gawk
-gcc
-gcolor3
-gettext
-gimp
-gimp-nufraw
-gitg
-glow
-gnu-efi
-gnumeric
-godot
-grep
-groff
-groffdown
-grub
-gst-plugin-pipewire
-gzip
-heroic-games-launcher-bin
-hplip
-imagemagick
-inkscape
-inxi
-joplin-desktop
-kdeconnect
-kdenlive
-krita
-lf
-lftp
-libreoffice-fresh
-librewolf-bin
-libtool
-libvirt-runit
-linux
-linux-firmware
-lm_sensors-runit
-lolcat
-lua
-luacheck
-lutris-git
-lxappearance
-m4
-make
-man-db
-mangoapp
-mcomix
-meson
-minecraft-launcher
-mpv
-multimc-bin
-ncdu
-neovide
-neovim
-networkmanager
-networkmanager-runit
-nextcloud-app-bookmarks
-nextcloud-app-calendar
-nextcloud-app-contacts
-nextcloud-app-deck
-nextcloud-app-mail
-nextcloud-app-notes
-nextcloud-app-notify_push
-nextcloud-app-spreed
-nextcloud-app-tasks
-nextcloud-client
-nodejs-mapscii
-noto-fonts-emoji
-noto-fonts-extra
-npm
-nsxiv
-ntfs-3g
-numlockx
-nvim-packer-git
-obs-studio-tytan652
-onedrive-abraunegg
-onlyoffice-bin
-openbsd-netcat
-opendoas
-openrgb-bin
-openssh-runit
-os-prober
-pacfinder
-pacman
-pandoc-bin
-papirus-icon-theme
-paru-bin
-patch
-perl-font-ttf
-picom
-pipewire
-pipewire-jack
-pipewire-pulse
-pipewire-v4l2
-pkgconf
-playerctl
-poppler
-prettier
-protonup-qt
-pulsemixer
-python-breathe
-python-build
-python-installer
-python-pip
-python-pylint
-python-pynvim
-python-pyqt5
-python-pyqt5-3d
-python-pyqt5-chart
-python-pyqt5-datavisualization
-python-pyqt5-networkauth
-python-pyqt5-purchasing
-python-pyqt5-webengine
-python-toml
-python-wheel
-qbittorrent
-qemu-desktop
-qpwgraph
-redshift
-reflector
-ripcord
-ripgrep
-runit
-rust-src
-rustdesk
-rustup
-seahorse
-sed
-skim
-spacefm
-speedtest++
-spotify
-sshfs
-starship
-steam
-stylua-bin
-sx
-system-config-printer
-tealdeer
-telegram-desktop
-texinfo
-texlive-bibtexextra
-texlive-fontsextra
-texlive-formatsextra
-texlive-games
-texlive-humanities
-texlive-latexextra
-texlive-music
-texlive-pictures
-texlive-pstricks
-texlive-publishers
-texlive-science
-texmaker
-thunderbird
-tidy
-tk
-tmux
-tree
-ttf-bitstream-vera
-ttf-croscore
-ttf-droid
-ttf-fira-code
-ttf-fira-mono
-ttf-fira-sans
-ttf-font-awesome
-ttf-hack
-ttf-inconsolata
-ttf-indic-otf
-ttf-nerd-fonts-symbols
-ttf-opensans
-ueberzug
-unicode-emoji
-unimatrix-git
-unityhub
-unrar
-unzip
-v4l2loopback-dkms
-v4l2loopback-utils
-vde2
-virt-manager
-virt-viewer
-vivaldi
-vivaldi-ffmpeg-codecs
-vscodium-bin
-vscodium-bin-features
-vscodium-bin-marketplace
-vulkan-mesa-layers
-wget
-which
-whois
-wine
-wine-gecko
-wine-mono
-winetricks
-wireplumber
-xclip
-xdg-ninja
-xf86-video-amdgpu
-xlockmore
-xorg-xinit
-xorg-xinput
-xorg-xwininfo
-yarn
-youtube-dl
-zathura
-zathura-cb
-zathura-djvu
-zathura-pdf-mupdf
-zathura-ps
-zsh
-zsh-autosuggestions
-zsh-fast-syntax-highlighting
-zsh-history-substring-search

pkg-files/wayland-pkgs

@@ -0,0 +1,89 @@
+alacritty
+arc-solid-gtk-theme
+bat
+brightnessctl
+btop
+catdoc
+chafa
+docx2txt
+dracula-gtk-theme
+dracula-icons-git
+epub-thumbnailer-git
+exa
+fakeroot
+fastfetch
+feh
+ffmpegthumbnailer
+flameshot
+git
+gnumeric
+grim
+gzip
+hybrid-bar
+hyprland-bin
+hyprpaper-git
+hyprpicker-git
+imagemagick
+lazygit
+lf
+librewolf-bin
+linux-headers
+make
+man-db
+mpd
+mpv
+mpvpaper
+ncdu
+neovim
+network-manager-applet
+networkmanager
+nextcloud
+nextcloud-client
+nodejs-jsonlint
+nsxiv
+ntfs-3g
+papirus-icon-theme
+pfetch
+pipewire
+pipewire-jack
+pipewire-pulse
+pipewire-v4l2
+playerctl
+polkit-gnome
+poppler
+pulsemixer
+redshift
+ripgrep
+rust-src
+skim
+slurp
+spacefm
+starship
+tealdeer
+transmission-cli
+ueberzug
+ufw
+unicode-emoji
+unimatrix-git
+unrar
+unzip
+v4l2loopback-dkms
+v4l2loopback-utils
+waybar-hyprland
+wget
+wireplumber
+wl-clipboard
+wofi
+xdg-desktop-portal
+xdg-desktop-portal-wlr
+youtube-dl
+zathura
+zathura-cb
+zathura-djvu
+zathura-pdf-mupdf
+zathura-ps
+zip
+zsh
+zsh-autosuggestions
+zsh-fast-syntax-highlighting
+zsh-history-substring-search