Squashed commit of the following: removed urlview

ps1 change
removed urlview. replaced with urlview.sh
i3blocks bar changes

3 files changed, 14 insertions, 17 deletions

diff --git a/env/.config/i3blocks/config b/env/.config/i3blocks/config
index eff5ddb..1be7de4 100644
--- a/env/.config/i3blocks/config
+++ b/env/.config/i3blocks/config
@@ -36,7 +36,7 @@ markup=pango
 # See the script for details.
 
 [volume2]
-label=    
+label=  
 interval=1
 signal=10
 #STEP=5%
@@ -45,14 +45,14 @@ signal=10
 #
 # The type defaults to "mem" if the instance is not specified.
 [memory]
-label=   
+label=  
 separator=false
 interval=30
 
 [memory]
-label=SWAP
+# label=
 instance=swap
-separator=false
+separator=true
 interval=30
 
 # Disk usage
@@ -61,7 +61,7 @@ interval=30
 # The script may be called with a optional argument to set the alert
 # (defaults to 10 for 10%).
 [disk]
-label=   
+label=  
 #DIR=/mnt/data
 interval=30
 
@@ -77,7 +77,7 @@ interval=30
 
 [wifi]
 #INTERFACE=wlp3s0
-label=wifi:
+label=󰈀 
 interval=10
 separator=false
 
@@ -90,13 +90,13 @@ interval=5
 # The script may be called with -w and -c switches to specify thresholds,
 # see the script for details.
 [cpu_usage]
-label=   
+label=  
 interval=10
-min_width=   100.00%
+min_width=  100.00%
 #separator=false
 
 [load_average]
-label=LOAD
+label=  
 interval=10
 
 # Battery indicator
diff --git a/env/.local/bin/system/url-handler.sh b/env/.local/bin/scripts/urlview.sh
index 5d0e893..c4c38d7 100755
--- a/env/.local/bin/system/url-handler.sh
+++ b/env/.local/bin/scripts/urlview.sh
@@ -1,15 +1,12 @@
 #!/bin/sh
-url=$@
-prompt_message="Open with:"
 
-echo "$url"
+url="$(grep -o -e 'http://[^"]*' -e 'https://[^"]*' <&0 | fzf)"
 
-choices="
+choices="\
 clipboard
-browser/xdg-open
-"
+browser/xdg-open"
 
-choice=$(echo "$choices" | sed /^$/d | rofi -dmenu "$prompt_message")
+choice=$(echo "$choices" | fzf)
 choice=$(echo "$choice" | sed -e 's/browser\/xdg-open/xdg-open/')
 
 if [ "$choice" = "clipboard" ]; then
diff --git a/env/.zshrc b/env/.zshrc
index 9d75855..91eb0ec 100755
--- a/env/.zshrc
+++ b/env/.zshrc
@@ -8,7 +8,7 @@ HISTSIZE=1000
 SAVEHIST=1000
 # End of lines configured by zsh-newuser-install
 
-PS1='%B%F{magenta}%n%B%F{yellow}@%B%F{magenta}%M %B%F{cyan}%1~ %B%F{default}∮ '
+PS1='%B%F{magenta}%n%B%F{yellow}@%B%F{magenta}%M %B%F{cyan}%1~ %B%F{default}$ '
 tty | grep -q pts && test "$USER" = "iceyrazor" && PS1='%B%F{magenta}アイシライゾ%B%F{yellow}@%B%F{magenta}%M %B%F{cyan}%1~ %B%F{default}∮ '