small logical update

PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: Eric Lay <ericlaytm@gmail.com>
 # Contributor: Yochananmarqos
 pkgname=fuzzy-pkg-finder
-pkgver=1.2
+pkgver=1.1
 pkgrel=1
 pkgdesc="Simple cli command for using fzf to search and install packages"
 arch=('x86_64' 'aarch64' 'armv7h')

README.md

@@ -6,24 +6,13 @@
 
 **Simple cli utility using fzf to search and install/list/remove packages.**\
  \
-![Screenshot](https://raw.githubusercontent.com/ericlay/fuzzy-pkg-finder/master/fpf.png) \
+![Screenshot](https://gitlab.com/airclay/fuzzy-pkg-finder/-/raw/master/fpf.png) \
  \
 Leverages the power of fzf to search package names and descriptions then presents complete package information in preview pane. \
 On selection will hand off to Pacman or Paru/Yay to complete transaction. \
   \
 *For use with Pacman/Yay/Paru package managers only.*\
  \
-There are countless fzf package manager wrappers out there, some much more built out that this. \
-What separates Fuzzy-pkg-finder?
-- It's mine and it works the way I like it to
-- It works as a simple script to wrap pacman/yay/paru, no need to rebuild the wheel
-- Searches both package names and descriptions for keyword
-- Hide preview window to see only packages and descriptions
-- Shows files list and/or missing files for official repo or installed AUR packages
-- Toggle between package info view and PKGBUILD view on AUR package preview
-- Update feature shows package information and link to recent commits \
- \
- \
 Installation: \
 For Arch and arch-based distros, it is available in the AUR. \
 Use: `paru -S fuzzy-pkg-finder` or `yay -S fuzzy-pkg-finder` \
@@ -38,7 +27,7 @@ makepkg -sric
 Usage: 
 ```
 Syntax: fpf [-a| --aur] [-l| --list-installed] [-la| --list-aur-installed]
-              [R| --remove] [-o| --orphans] [-U | --update] [-h | --help]
+              [R| --remove] [-o| --orphans] [-h | --help]
 Defaults to Pacman if no options passed
 
 Searching for a package:
@@ -61,22 +50,13 @@ Options:
 -o, --orphans
      Search/List orphaned packages for removal
 
--U, --update
-     Shows packages with updates available
-
 -h, --help
      Print this help screen
 ```
 \
 Keybinds:
 ```
-'ctrl + /' Toggle the preview window
-'ctrl + h' Show help in the preview window
-'ctrl + k' Show the keybinds in the preview window
-'ctrl + n' Move to the next selected item
-'ctrl + b' Back to previoius selected item
-
 When browsing AUR or installed Aur pkgs:
-'ctrl + p' Preview the highlighted pkgbuild file
-'ctrl + x' Return to the highlighted pkg info
+'ctrl + p' Will preview the highlighted pkgbuild file
+'ctrl + x' Will return to the highlighted pkg info
 ```

fpf

@@ -2,114 +2,81 @@
 
 ### Help 
 Help() {
-	helpF="/tmp/fpf-help"
-    { printf "\n%s\n" "Use fzf to search and install with Pacman or Yay/Paru"
-    printf "\n%s\n\t%s\n\t\t%s\n" "SYNTAX" \
-	"fpf [-a| --aur] [-l| --list-installed] [-la| --list-aur-installed]" "[R| --remove] [-o| --orphans] [-h | --help]" 
-	printf "\n%s\n\t%s\n\t\t%s\n\n\t%s\n\t\t%s\n" "EXAMPLE" "For official repo search:" \
-	"fpf [pkg name]" "For AUR search:" "fpf -a [pkg name]"
-	printf "\n%s\n" "OPTIONS"
-	printf "\t%s\n\\t\t%s\n\n" "-l, --list-installed" "Search/List installed packages from official repo"
-	printf "\t%s\n\\t\t%s\n\n" "-la, --list-aur-installed" "Search/List installed packages from AUR"
-	printf "\t%s\n\\t\t%s\n\n" "-a, --aur" "Search/List and install from AUR with Yay"
-	printf "\t%s\n\\t\t%s\n\n" "-R, -remove" "Search/List installed packages for removal"
-	printf "\t%s\n\\t\t%s\n\n" "-o, --orphans" "Search/List orphaned packages for removal"
-	printf "\t%s\n\\t\t%s\n\n" "-U, --update" "Show packages with updates available"
-	printf "\t%s\n\\t\t%s\n\n" "-h, --help" "Print this help screen"; } > "$helpF"
-}
-
-KBINDS() {
-	kbindF="/tmp/fpf-kbinds"
-	{ printf "\n%s\n\n  %s\n" "Keybinds:" "GLOBAL"
-	printf "\t%s\t%s\n" "'ctrl + h'" "Show help in the preview window"
-	printf "\t%s\t%s\n" "'ctrl + k'" "Show the keybinds in the preview window" 
-	printf "\t%s\t%s\n" "'ctrl + /'" "Toggle the preview window" 
-	printf "\t%s\t%s\n" "'ctrl + n'" "Move to the next selected item"
-	printf "\t%s\t%s\n" "'ctrl + b'" "Back to previoius selected item"
-	printf "\n  %s\n" "AUR"
-	printf "\t%s\t%s\n" "'ctrl + p'" "Preview the highlighted pkgbuild file"
-	printf "\t%s\t%s\n" "'ctrl + x'" "Return to the highlighted pkg info"; } > "$kbindF"
+    echo -e "\nUse fzf to search and install with Pacman and Yay"
+    echo -e "Defaults to Pacman if no options passed\n"
+    echo -e "SYNTAX\n\tfpf [-a| --aur] [-l| --list-installed] [-la| --list-aur-installed]\n\t\t[R| --remove] [-o| --orphans] [-h | --help]\n"
+	echo -e "EXAMPLE\n\tfpf [pkg name] for official repo search\n\tfpf -a [pkg name] for aur search\n"
+	echo -e "OPTIONS"
+	echo -e "\t-a, --aur\n\t\tSearch/List and install from AUR with Yay\n"
+	echo -e "\t-l, --list-installed\n\t\tSearch/List installed packages from official repo\n"
+	echo -e "\t-la, --list-aur-installed\n\t\tSearch/List installed packages from AUR\n"
+	echo -e "\t-R, -remove\n\t\tSearch/List installed packages for removal\n"
+	echo -e "\t-o, --orphans\n\t\tSearch/List orphaned packages for removal\n"
+	echo -e "\t-h, --help\n\t\tPrint this help screen"
+	echo -e "KEYBINDS"
+	echo -e "     GLOBAL\n\tctrl-h\tShows this help text in preview window\n\tctrl-r\tClears previously selected pkg's from list\n\tctrl-x\tReturns preview window to default view\n"
+	echo -e "     AUR\n\tctrl-p\tShows PKGBUILD in preview window\n"
 }
 
 #	Check things are up to date
 UpdateInfos() {
-	[ -f /var/lib/pacman/sync/core.files ] || { printf "Syncing files database"; sudo pacman -Fy; }
+	[ -f /var/lib/pacman/sync/core.files ] || { echo -e "Syncing files database"; sudo pacman -Fy; }
     d1=$(stat -c %y /var/lib/pacman/sync/core.files)
     d2=$(stat -c %y /var/lib/pacman/sync/core.db)
 	d1="${d1:0:10}"
 	d2="${d2:0:10}"
-	[[ "${d2///-/}" > "${d1//-/}" ]] && { printf "Files database is out of date\nSyncing now..."; sudo pacman -Fy; }
+	[[ "${d2///-/}" > "${d1//-/}" ]] && { echo -e "Files database is out of date\nSyncing now..."; sudo pacman -Fy; }
 }
 
 UpdateAurInfos() {
+	echo -e "Syncing AUR package information..."
 	[[ ! -d /tmp/aur ]] && mkdir -p /tmp/aur
 	zcat <(curl  https://aur.archlinux.org/packages-meta-ext-v1.json.gz) |
 	jq --compact-output '.[] |
 	{ Name, Description } ' |
-	awk -F'"' '{ printf "%-20s\t%s\n", $4, $8}' > /tmp/aur/fpf-packages-meta
-	while IFS= read -r pkgName; do
-		grep -w "^$pkgName " /tmp/aur/fpf-packages-meta >> /tmp/aur/fpf-installed
-	done < <(pacman -Qqm)
-	sort <(comm -23 <(cat /tmp/aur/fpf-packages-meta | sort) <( cat /tmp/aur/fpf-installed | sort)) \
-	<(comm -12 <( cat /tmp/aur/fpf-packages-meta | sort) <(cat /tmp/aur/fpf-installed | sort) |
-	awk -F"\t" '{print $1" \033[32m*\033[0m  ", $2}') -o /tmp/aur/fpf-packages-meta
-}
-
-AurFD() {
-	[ -f /tmp/aur/packages-meta ] || 
-	printf "Syncing AUR package information..." && UpdateAurInfos
-	d1=$(stat -c %y /tmp/aur/fpf-packages-meta)
-	d1="${d1:0:10}"
-	d2=$(date -I'date')
-	[[ "${d2///-/}" > "${d1//-/}" ]] && { 
-	printf "Syncing AUR package information..."; UpdateAurInfos; }
+	awk -F'"' '{ printf "%-20s\t%s\n", $4, $8}' > /tmp/aur/packages-meta
+	parallel grep -w "^{} " /tmp/aur/packages-meta ">>" /tmp/aur/installed < <(pacman -Qqm)
+	sort <(comm -23 <(cat /tmp/aur/packages-meta | sort) <( cat /tmp/aur/installed | sort)) <(comm -12 <( cat /tmp/aur/packages-meta | sort) <(cat /tmp/aur/installed | sort) | awk -F"\t" '{print $1" \033[32m*\033[0m  ", $2}') -o /tmp/aur/packages-meta
 }
 
 #	Check AUR helper
 AHELPR=""
-AHELPRUPDATE=""
 if [[ -z "$AHELPR" ]]
 then
     if [[ -f /usr/bin/paru ]]
     then 
     	AHELPR="paru"
-		AHELPRUPDATE="paru -Sua"
     elif [[ -f /usr/bin/yay ]]
     then
     	AHELPR="yay"
-		AHELPRUPDATE="yay -a"
     else
-    	printf "Suitable AUR Helper not found.\nPlease install \"paru\" or \"yay\" to continue."
+    	echo -e "Suitable AUR Helper not found.\nPlease install \"paru\" or \"yay\" to continue."
 		exit 1
 	fi
 fi
 
-#	Create the helper files
-Help
-KBINDS
-
 ### Official Repo
 #	Get Official package list, sort, mark installed, preview infos and finally hand off to pacman for install
 Official() {
-	printf "Setting things up..."
-	sort <(comm -23 <(expac -S '%-20n\t%d' | sort) <(expac '%-20n\t%d' | sort)) <(comm -12 <(expac -S '%-20n\t%d' | sort) \
-	<(expac '%-20n\t%d' | sort) | awk -F"\t" '{print $1"\033[32m*\033[0m  ", $2}') &>/dev/null  >  /tmp/fpf-packages
+	echo "Setting things up..."
+	sort <(comm -23 <(expac -S '%-20n\t%d' | sort) <(expac '%-20n\t%d' | sort)) <(comm -12 <(expac -S '%-20n\t%d' | sort) <(expac '%-20n\t%d' | sort) | awk -F"\t" '{print $1"\033[36m*\033[0m  ", $2}') &>/dev/null  >  /tmp/packages
+  	cat /tmp/packages |
   	fzf -q "$1" -e -m \
   	--preview='cat <(pacman -Si {1}) <(pacman -Fl {1} | awk "{print \$2}")' \
-  	--preview-window=55%:wrap:border-sharp \
+  	--preview-window=55%:wrap:border-rounded \
   	--layout=reverse \
-  	--marker='>>' \
-  	--header="$(echo -e '\n Select packages to install\n (use TAB to toggle selection)\n\n')" \
+  	--marker='✔ ' \
+  	--prompt=' ' \
+  	--pointer='󰧚 ' \
+  	--header="$(echo -e ' Select packages to install\n (use TAB to toggle selection)\n')" \
   	--info=hidden \
+  	--no-scrollbar \
   	--ansi \
+  	--color='fg+:15,fg:42,preview-fg:123,preview-label:123,hl+:134,hl:123,query:134,gutter:0,border:134,prompt:15,pointer:15,marker:15,header:123' \
   	--margin="2%,1%,2%,1%" \
   	--cycle \
-	--tiebreak=begin,chunk,length \
-	--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
-	--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
-	--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
-	--bind 'ctrl-/:change-preview-window(hidden|)' \
-	--bind ctrl-n:next-selected,ctrl-b:prev-selected < /tmp/fpf-packages |
+  	--bind 'focus:transform-preview-label:echo [ {1} ]' \
+	--tiebreak=begin,chunk,length |
   	awk '{print $1}' |
   	sed -e 's/\*$//' |
   	xargs -ro sudo pacman -S
@@ -117,97 +84,69 @@ Official() {
 
 #	List installed pkgs
 Installed() {
-	expac '%-20n\t%d' |
+	sort <(pacman -Qqs) > /tmp/installed_packages
+	echo "$(echo -e ' Select packages to print info\n (use TAB to toggle selection)'; cat /tmp/installed_packages)" > /tmp/installed_packages
+	cat /tmp/installed_packages |
 	fzf -q "$1" -e -m \
 	--preview='cat <(pacman -Qik {1}) <(echo "") <(pacman -Fl {1} | awk "{print \$2}")' \
 	--preview-window=65%:wrap \
 	--layout=reverse \
-	--marker='>>' \
-	--header="$(echo -e '\n Select packages to print info\n (use TAB to toggle selection)\n\n')" \
+	--marker='✔ ' \
+	--header-lines=2 \
 	--info=hidden \
 	--ansi \
 	--margin="2%,1%,2%,1%" \
-	--cycle \
-	--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
-	--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
-	--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
-	--bind 'ctrl-/:change-preview-window(hidden|)' \
-	--bind ctrl-n:next-selected,ctrl-b:prev-selected |
-	awk '{print $1}' |
+	--cycle |
 	xargs -ro pacman -Qik
 }
 
 #	Remove installed pkgs
 Remove() {
-	expac '%-20n\t%d' |
+	sort <(pacman -Qqs) > /tmp/installed_packages
+	echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)'; cat /tmp/installed_packages)" > /tmp/installed_packages
+	cat /tmp/installed_packages |
 	fzf -q "$1" -e -m \
-	--preview='cat <(pacman -Si {1} 2>/dev/null || yay -Qi {1} 2>/dev/null || paru -Qi {1}) <(pacman -Ql {1} | awk "{print \$2}")' \
+	--preview='bat <(pacman -Si {1} 2>/dev/null || yay -Qi {1} 2>/dev/null || paru -Qi {1}) <(pacman -Ql {1} | awk "{print \$2}")' \
 	--preview-window=65%:wrap \
 	--layout=reverse \
-	--marker='>>' \
-  	--header="$(echo -e '\n Select packages to remove\n (use TAB to toggle selection)\n\n')" \
+	--marker='✔ ' \
+	--header-lines=2 \
 	--info=hidden \
 	--ansi \
 	--margin="2%,1%,2%,1%" \
-	--cycle \
-	--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
-	--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
-	--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
-	--bind 'ctrl-/:change-preview-window(hidden|)' \
-	--bind ctrl-n:next-selected,ctrl-b:prev-selected |
-	awk '{print $1}' |
+	--cycle |
 	xargs -ro sudo pacman -Rsn
 }
 
-#	Update installed pkgs
-Update() (
-	viewUpdates() {
-		fzf --preview='cat <(pacman -Si {1}) <(pacman -Fl {1} | awk "{print \$2}")' \
-		--preview-window=65%:wrap \
-		--layout=reverse \
-		--marker='>>' \
-  		--header="$(echo -e '\nPackages with updates available:\n\n')" \
-		--info=hidden \
-		--ansi \
-		--margin="2%,1%,2%,1%" \
-		--cycle \
-		--bind 'focus:transform-preview-label:echo \
-		⌇ Commit History: https://gitlab.archlinux.org/archlinux/packaging/packages/{1}/-/commits/main ⌇' \
-		--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
-		--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
-		--bind 'ctrl-/:change-preview-window(hidden|)' \
-		--bind ctrl-n:next-selected,ctrl-b:prev-selected < /tmp/fpf-updates > /dev/null
-		[[ "$(printf '\nWould you like to update? [y/N]> ' >&2; read; echo $REPLY)" == [Nn]* ]] \
-  		&& printf "\nPlease update soon :(\n" || sudo pacman -Syu
-	}
-	checkupdates > "/tmp/fpf-updates"
-	[ -s "/tmp/fpf-updates" ] && viewUpdates ||
-	printf "\nThere are no available updates :)\n"
-)
-
 ### AUR
 #	Get AUR package database, remove unwanted lines, sort, mark installed, preview infos and finally hand off to yay for install
 Aur() {
-	AurFD	
+	[ -f /tmp/aur/packages-meta ] || UpdateAurInfos
+	d1=$(stat -c %y /tmp/aur/packages-meta)
+	d1="${d1:0:10}"
+	d2=$(date -I'date')
+	[[ "${d2///-/}" > "${d1//-/}" ]] && UpdateAurInfos		
+	cat /tmp/aur/packages-meta |
 	fzf -q "$1" -e -m \
-	--preview='cat <(yay -Si {1} 2>/dev/null || paru -Si {1}) <(pacman -Ql {1} 2>/dev/null | awk "{print \$2}")' \
+	--preview='bat <(yay -Si {1} 2>/dev/null || paru -Si {1}) <(pacman -Ql {1} 2>/dev/null | awk "{print \$2}")' \
 	--preview-window=55%:wrap:border-sharp \
 	--layout=reverse \
-	--marker='>>' \
+  	--marker='✔ ' \
+  	--prompt=' ' \
+  	--pointer='󰧚 ' \
 	--header="$(echo -e ' Select packages to install\n (use TAB to toggle selection)\n')" \
 	--info=hidden \
+  	--no-scrollbar \
 	--ansi \
+  	--color='fg+:15,fg:42,preview-fg:123,preview-label:123,hl+:134,hl:123,query:134,gutter:0,border:134,prompt:15,pointer:15,marker:15,header:123' \
 	--margin="2%,1%,2%,1%" \
 	--cycle \
 	--tiebreak=begin,chunk,length \
-	--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
-	--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
-	--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
-	--bind ctrl-n:next-selected,ctrl-b:prev-selected \
-	--bind 'ctrl-/:change-preview-window(hidden|)' \
+  	--bind 'focus:transform-preview-label:echo [ {1} ]' \
+  	--bind=ctrl-h:preview:'/home/ez/Git/fuzzy-pkg-finder/fpf -h' \
+  	--bind=ctrl-r:clear-selection \
 	--bind=ctrl-p:preview:'curl --silent https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD\?h={1}' \
-	--bind=ctrl-x:preview:'cat <(yay -Si {1} 2>/dev/null || paru -Si {1}) <(pacman -Ql {1} 2>/dev/null | awk "{print \$2}")' \
-	< /tmp/aur/fpf-packages-meta |
+	--bind=ctrl-x:preview:'cat <(yay -Si {1} 2>/dev/null || paru -Si {1}) <(pacman -Ql {1} 2>/dev/null | awk "{print \$2}")' |
 	awk '{print $1}' |
 	sed -e 's/\*$//' |
 	xargs -ro $AHELPR -S
@@ -215,87 +154,40 @@ Aur() {
 
 #	List installed pkgs only from AUR
 AurInstalled() {
-	AurFD
-	while IFS= read -r pkgName; do
-	grep -w "^$pkgName " /tmp/aur/fpf-packages-meta >> /tmp/aur/fpf-installed
-	done < <(pacman -Qqm)
+	sort <(pacman -Qqm) > /tmp/aur_installed_packages
+	echo "$(echo -e ' Select packages to print info\n (use TAB to toggle selection)'; cat /tmp/aur_installed_packages)" > /tmp/aur_installed_packages
+	cat /tmp/aur_installed_packages |
 	fzf -q "$1" -e -m \
 	--preview 'cat <(pacman -Qik {1}) <(echo "") <(pacman -Ql {1} | awk "{print \$2}")' \
 	--preview-window=65%:wrap \
 	--layout=reverse \
-	--marker='>>' \
-	--header="$(echo -e ' Select packages to print info\n (use TAB to toggle selection)\n')" \
+	--marker='✔ ' \
+	--header-lines=2 \
 	--info=hidden \
 	--ansi \
 	--margin="2%,1%,2%,1%" \
 	--cycle \
-	--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
-	--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
-	--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
-	--bind 'ctrl-/:change-preview-window(hidden|)' \
-	--bind ctrl-n:next-selected,ctrl-b:prev-selected \
 	--bind=ctrl-p:preview:'curl --silent https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD\?h={1}' \
-	--bind=ctrl-x:preview:'cat <(pacman -Si {1} 2>/dev/null || yay -Qi {1} 2>/dev/null ||
-	paru -Qi {1}) <(pacman -Ql {1} | awk "{print \$2}")' \
-	< /tmp/aur/fpf-installed |
-	awk '{print $1}' |
+	--bind=ctrl-x:preview:'cat <(pacman -Si {1} 2>/dev/null || yay -Qi {1} 2>/dev/null || paru -Qi {1}) <(pacman -Ql {1} | awk "{print \$2}")' |
 	xargs -ro pacman -Qik
 }
 
-#	Update AUR installed pkgs
-UpdateAURpkgs() (
-	viewAURUpdates() {
-		fzf --preview='cat <(yay -Si {1} 2>/dev/null || paru -Si {1}) <(pacman -Ql {1} 2>/dev/null | awk "{print \$2}")' \
-		--preview-window=65%:wrap \
-		--layout=reverse \
-		--marker='>>' \
-  		--header="$(echo -e '\nPackages with updates available:\n\n')" \
-		--info=hidden \
-		--ansi \
-		--margin="2%,1%,2%,1%" \
-		--cycle \
-		--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
-		--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
-		--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
-		--bind 'ctrl-/:change-preview-window(hidden|)' \
-		--bind=ctrl-p:preview:'curl --silent https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD\?h={1}' \
-		--bind=ctrl-x:preview:'cat <(pacman -Si {1} 2>/dev/null || yay -Qi {1} 2>/dev/null ||
-		paru -Qi {1}) <(pacman -Ql {1} | awk "{print \$2}")' < "/tmp/aur/fpf-updates" > /dev/null
-		[[ "$(printf '\nWould you like to update? [y/N]> ' >&2; read; echo $REPLY)" == [Nn]* ]] \
-  		&& printf "\nPlease update soon :(\n" || $AHELPRUPDATE
-		rm /tmp/aur/fpf-updates
-	}
-	while true; do printf "Reading updates" & eval "$(yay -a > /tmp/aur/fpf-yay & sleep ${1:-3})"; break; done
-	touch "/tmp/aur/fpf-updates"; grep '^[0-9]' "/tmp/aur/fpf-yay" | cut -c 8- > "/tmp/aur/fpf-updates"
-	[ -s "/tmp/aur/fpf-updates" ] && viewAURUpdates ||
-	printf "\nThere are no available updates :)\n"
-)
-
 ### ORPHANS
 #	List orphaned packages and remove selected 
 Orphans() {
-	[ -f /tmp/fpf-orphans ] ||
-	while IFS= read -r pkgName; do
-	expac '%-20n\t%d' "$pkgName" >> /tmp/fpf-orphans
-	done < <(pacman -Qtdq)
+	sort <(pacman -Qtdq) > /tmp/orphaned
+	echo "$(echo -e ' Select packages to remove\n (use TAB to toggle selection)'; cat /tmp/orphaned)" > /tmp/orphaned
+	cat /tmp/orphaned |
 	fzf -q "$1" -e -m \
-	--preview='cat <(pacman -Qik {1} 2>/dev/null || yay -Qi {1} 2>/dev/null ||
-	paru -Qi {1}) <(pacman -Ql {1} | awk "{print \$2}")' \
+	--preview='cat <(pacman -Qik {1} 2>/dev/null || yay -Qi {1} 2>/dev/null || paru -Qi {1}) <(pacman -Ql {1} | awk "{print \$2}")' \
 	--preview-window=65%:wrap \
 	--layout=reverse \
-	--marker='>>' \
-	--header="$(echo -e ' Select packages to remove\n (use TAB to toggle selection)\n')" \
+	--marker='✔ ' \
+	--header-lines=2 \
 	--info=hidden \
 	--ansi \
 	--margin="2%,1%,2%,1%" \
-	--cycle \
-	--bind 'focus:transform-preview-label:echo ⌇ {1} ⌇' \
-	--bind=ctrl-k:preview:"cat /tmp/fpf-kbinds" \
-	--bind=ctrl-h:preview:"cat /tmp/fpf-help" \
-	--bind ctrl-n:next-selected,ctrl-b:prev-selected \
-	--bind 'ctrl-/:change-preview-window(hidden|)' \
-	< /tmp/fpf-orphans |
-	awk '{print $1}' |
+	--cycle |
 	xargs -ro sudo pacman -Rsn	
 }
 
@@ -324,20 +216,12 @@ else
        		-R|--remove)
        			Remove "$2"
        			;;
-			-U|--update)
-       			Update
-       			;;
-			-Ua|--update-aur)
-       			UpdateAURpkgs "$2"
-       			;;
     		-h|--help)
        			Help
-				cat "/tmp/fpf-help"
        			;;       			
     		-*) 
+       			echo "Invalid Usage"
        			Help
-				sed -i "2s/.*/Invalid Usage/" /tmp/fpf-help
-				head -n 13 "/tmp/fpf-help"
        			;;
     	esac
 	done