Kaynağa Gözat

remove viewnior in favor of qview

Casey DeLorme 1 hafta önce
ebeveyn
işleme
18c8906de9
2 değiştirilmiş dosya ile 32 ekleme ve 25 silme
  1. 20 13
      arch.sh
  2. 12 12
      install/etc/skel/.config/mimeapps.list

+ 20 - 13
arch.sh

@@ -96,21 +96,26 @@ PACKAGES="${PACKAGES} sway swaybg alacritty wofi waybar xorg-xwayland xorg-xlscl
 PACKAGES="${PACKAGES} fontconfig ttf-bitstream-vera ttf-droid ttf-dejavu ttf-liberation ttf-hanazono ttf-font-awesome"
 
 # GUI software
-PACKAGES="${PACKAGES} xarchiver gparted psensor steam steam-native-runtime gamemode gamescope mangohud lib32-mangohud lib32-gamemode discord mpv mpv-mpris openshot gimp krita firefox obs-studio mednafen mame ppsspp lutris sublime-text evince viewnior virt-manager virtualbox virtualbox-host-modules-arch corectrl"
+PACKAGES="${PACKAGES} xarchiver gparted psensor steam steam-native-runtime gamemode gamescope mangohud lib32-mangohud lib32-gamemode discord mpv mpv-mpris openshot gimp krita firefox obs-studio mednafen mame ppsspp lutris sublime-text evince virt-manager virtualbox virtualbox-host-modules-arch corectrl"
 
-# conditional GPU packages
+# conditional AMD GPU packages
 if [ $(lspci | grep -i "vga" | grep -ci "amd") -gt 0 ]; then
 	PACKAGES="${PACKAGES} xf86-video-amdgpu vulkan-radeon lib32-vulkan-radeon mesa-vdpau"
 
 	# update modules to load
 	[ $(grep -c "amd" /etc/mkinitcpio.conf) -eq 0 ] && sed -i 's/MODULES=(\(.*\))/MODULES=(\1 amdgpu radeon)/' /etc/mkinitcpio.conf
 fi
+
+# conditional Intel GPU packages
 if [ $(lspci | grep -i "vga" | grep -ci "intel") -gt 0 ]; then
 	PACKAGES="${PACKAGES} xf86-video-intel vulkan-intel lib32-vulkan-intel mesa-vdpau"
 
 	# update modules to load
 	[ $(grep -c "amd" /etc/mkinitcpio.conf) -eq 0 ] && sed -i 's/MODULES=(\(.*\))/MODULES=(\1 i915)/' /etc/mkinitcpio.conf
 fi
+
+# conditional nVidia GPU packages
+# @note: untested since 2019; I stopped using nvidia
 if [ $(lspci | grep -i "vga" | grep -ci "nvidia") -gt 0 ]; then
 	PACKAGES="${PACKAGES} nvidia-dkms libglvnd lib32-libglvnd opencl-nvidia lib32-opencl-nvidia xf86-video-nouveau nvidia-utils lib32-nvidia-utils mesa-vdpau nvidia-settings"
 
@@ -129,25 +134,29 @@ pacman -Syu --noconfirm $PACKAGES
 [ -d /srv/arch-desktop/install ] || git clone https://git.caseydelorme.com/cdelorme/arch-desktop /srv/arch-desktop
 rsync -Pav /srv/arch-desktop/install/ /
 mkdir -p /etc/skel/{desktop,downloads,public,public/templates,documents,music,pictures,videos,code}
-# @todo: verify if these is necessary /w pipewire-pulse
-#mkdir -p /etc/skel/.config/pulse
-# sed "/module-suspend-on-idle/d" /etc/pulse/default.pa > /etc/skel/.config/pulse/default.pa
-# sed -i "/module-switch-on-port-available/d" /etc/skel/.config/pulse/default.pa
 rsync -Pav /etc/skel/ "$(getent passwd root | cut -d: -f6)/"
 sed -i "/ssh-add/d" "$(getent passwd root | cut -d: -f6)/.bashrc"
 
-# install protontricks
-# python3 -m pip install protontricks
-
 # enable ccache and optimize cores for AUR
 sed -i 's/!ccache/ccache/' /etc/makepkg.conf
 sed -i 's/^#MAKEFLAGS.*/MAKEFLAGS="-j$(($(nproc) + 1)) -l$(nproc)"/' /etc/makepkg.conf
 
+
+
+# @todo: switch to using the main user for these and cloning into code/aur.archlinux.org/
 # create a user to install aur packages
 export aur_username=$(head /dev/urandom | tr -dc a-z | head -c 13 ; echo '')
 useradd -r -m -s /bin/bash $aur_username
 echo "${aur_username} ALL= NOPASSWD: /usr/bin/pacman" > /etc/sudoers.d/${aur_username}
 
+# install qview
+sudo -u $aur_username git clone https://aur.archlinux.org/qview.git /home/${aur_username}/vimix-cursors
+(cd /home/${aur_username}/qview && sudo -u ${aur_username} makepkg -rcsi --noconfirm)
+
+# cmst (for connman UI)
+sudo -u $aur_username git clone https://aur.archlinux.org/cmst.git /home/${aur_username}/cmst
+(cd /home/${aur_username}/cmst && sudo -u ${aur_username} makepkg -rcsi --noconfirm)
+
 # install vimix-cursors
 sudo -u $aur_username git clone https://aur.archlinux.org/vimix-cursors.git /home/${aur_username}/vimix-cursors
 (cd /home/${aur_username}/vimix-cursors && sudo -u ${aur_username} makepkg -rcsi --noconfirm)
@@ -156,15 +165,13 @@ sudo -u $aur_username git clone https://aur.archlinux.org/vimix-cursors.git /hom
 sudo -u $aur_username git clone https://aur.archlinux.org/numix-icon-theme-git.git /home/${aur_username}/numix-icon-theme-git
 (cd /home/${aur_username}/numix-icon-theme-git && sudo -u ${aur_username} makepkg -rcsi --noconfirm)
 
-# cmst (for connman UI)
-sudo -u $aur_username git clone https://aur.archlinux.org/cmst.git /home/${aur_username}/cmst
-(cd /home/${aur_username}/cmst && sudo -u ${aur_username} makepkg -rcsi --noconfirm)
-
 # cleanup aur user
 rm -rf /etc/sudoers.d/${aur_username}
 userdel -fr $aur_username
 unset $aur_username
 
+
+
 # install gifduration
 if ! which gifduration &> /dev/null; then
 	curl -Lfs https://raw.githubusercontent.com/alimony/gifduration-script/master/gifduration.py > /usr/local/bin/gifduration

+ 12 - 12
install/etc/skel/.config/mimeapps.list

@@ -1,10 +1,10 @@
 [Added Associations]
-image/gif=viewnior.desktop;
-image/bmp=viewnior.desktop;
-image/jpg=viewnior.desktop;
-image/jpeg=viewnior.desktop;
-image/png=viewnior.desktop;
-image/tiff=viewnior.desktop;
+image/gif=qview.desktop;
+image/bmp=qview.desktop;
+image/jpg=qview.desktop;
+image/jpeg=qview.desktop;
+image/png=qview.desktop;
+image/tiff=qview.desktop;
 text/html=firefox.desktop;
 text/htmls=firefox.desktop;
 application/x-shockwave-flash=flash.desktop;
@@ -48,12 +48,12 @@ application/x-ms-dos-executable=wine.desktop;
 application/x-msdos-program=wine.desktop;
 
 [Default Applications]
-image/gif=viewnior.desktop;
-image/bmp=viewnior.desktop;
-image/jpg=viewnior.desktop;
-image/jpeg=viewnior.desktop;
-image/png=viewnior.desktop;
-image/tiff=viewnior.desktop;
+image/gif=qview.desktop;
+image/bmp=qview.desktop;
+image/jpg=qview.desktop;
+image/jpeg=qview.desktop;
+image/png=qview.desktop;
+image/tiff=qview.desktop;
 text/html=firefox.desktop;
 text/htmls=firefox.desktop;
 application/x-shockwave-flash=flash.desktop;