Iceweasel -> Firefox

10 files changed, 14 insertions, 13 deletions

diff --git a/.Xdefaults b/.Xdefaults
index 4424014b..fc40e9db 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -44,7 +44,7 @@ urxvt*color13:     #ec93d3
 urxvt*color14:     #93e0e3
 urxvt*color15:     #ffffff
 
-URxvt.urlLauncher      : iceweasel
+URxvt.urlLauncher      : firefox
 URxvt.matcher.button  : 1
 
 ! Terminus for English and Baekmuk Gulim for Korean
diff --git a/.config/xfce4/helpers.rc b/.config/xfce4/helpers.rc
index 33900e0e..a225a16c 100644
--- a/.config/xfce4/helpers.rc
+++ b/.config/xfce4/helpers.rc
@@ -1,4 +1,4 @@
-WebBrowser=iceweasel
+WebBrowser=firefox
 MailReader=mutt
 TerminalEmulator=urxvt
 
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 3a4b1ef8..2e9480cf 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -2056,7 +2056,7 @@ Ensures the kill ring entry always ends with a newline."
 ;;(add-hook 'electric-indent-functions 'electric-indent-ignore-python)
 
 ;; browser
-(setq browse-url-generic-program "iceweasel"
+(setq browse-url-generic-program "firefox"
       browse-url-browser-function 'browse-url-generic)
 
 ;; clipboard & primary selection: see https://www.gnu.org/software/emacs/manual/html_node/emacs/Clipboard.html
@@ -2247,7 +2247,7 @@ superflous blank quoted lines."
 (setq TeX-output-view-style
       (quote
        (("^pdf$" "." "evince %o")
-        ("^html?$" "." "iceweasel %o"))))
+        ("^html?$" "." "firefox %o"))))
 
 ;;; fixes for exporting from Org-mode
 
diff --git a/.extract_urlview b/.extract_urlview
index c5405ff7..34525426 100644
--- a/.extract_urlview
+++ b/.extract_urlview
@@ -1,4 +1,4 @@
-COMMAND iceweasel
+COMMAND firefox
 DEFAULT_VIEW context
 HTML_TAGS a
 IGNORE_EMPTY_TAGS
diff --git a/.mutt/mailcap b/.mutt/mailcap
index 2b907fe9..60f4dcfa 100644
--- a/.mutt/mailcap
+++ b/.mutt/mailcap
@@ -1,4 +1,4 @@
-text/html; iceweasel %s; test=test -n "$DISPLAY"; nametemplate=%s.html
+text/html; firefox %s; test=test -n "$DISPLAY"; nametemplate=%s.html
 text/html; w3m -I %{charset} -T text/html; copiousoutput;
 application/pdf; mutt_bgrun evince '%s'; test=test -n "$DISPLAY"; nametemplate=%s.pdf
 image/jpeg; feh %s
diff --git a/.muttrc b/.muttrc
index a78d8fd9..7d409f4b 100644
--- a/.muttrc
+++ b/.muttrc
@@ -170,11 +170,11 @@ macro index <F8> "Fk|~/bin/capture-mail\nj"
 macro pager <F8> "qFk|~/bin/capture-mail\nj"
 
 # open RSS links in browser (fails because for some reason mutt can't bind <f{1--4}>
-macro index,pager <F4> "<pipe-message>grep '\^http' | sed 's/\^/-new-tab /' | xargs iceweasel<enter>" "open all URLs at beginning of lines in message in browser tabs"
+macro index,pager <F4> "<pipe-message>grep '\^http' | sed 's/\^/-new-tab /' | xargs firefox<enter>" "open all URLs at beginning of lines in message in browser tabs"
 
 # open rss2email source link in browser
-# macro pager <f12> "<pipe-message>grep \"\^URL: http\" | xargs iceweasel -new-tab<enter>" "open rss2email source link"
-macro pager <f12> "<pipe-message>egrep \"X-RSS-URL:\" | cut -d' ' -f2- | xargs iceweasel -new-tab<enter>" "open rss2email source link"
+# macro pager <f12> "<pipe-message>grep \"\^URL: http\" | xargs firefox -new-tab<enter>" "open rss2email source link"
+macro pager <f12> "<pipe-message>egrep \"X-RSS-URL:\" | cut -d' ' -f2- | xargs firefox -new-tab<enter>" "open rss2email source link"
 
 # train spam filter
 macro index,pager <f11> "<save-message>+spam<enter>" "mark as spam"
diff --git a/.shenv b/.shenv
index 00f1c83a..358a68d9 100755
--- a/.shenv
+++ b/.shenv
@@ -116,7 +116,7 @@ GTK_IM_MODULE=xim
 export GTK_IM_MODULE
 QT_IM_MODULE=xim
 export QT_IM_MODULE
-BROWSER="iceweasel"
+BROWSER="firefox"
 export BROWSER
 TERMCMD="urxvt"
 export TERMCMD
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 6fcdfe72..efee8b97 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -51,7 +51,7 @@ main = xmonad $ xfceConfig
 myMod        = mod4Mask
 myTerm       = "urxvtcd"
 myEditor     = "emacscd"
-myBrowser    = "iceweasel"
+myBrowser    = "firefox"
 myWorkspaces = ["one", "two", "three", "www", "comm", "view", "tail"]
 
 -- key bindings
@@ -98,7 +98,7 @@ myFloatClasses = [ "Gimp"
 myManageHook = composeOne $
                [ checkDock                              -?> doIgnore
                , isDialog                               -?> doFloat
-               , className     =? "Iceweasel"           -?> doShift "www"
+               , className     =? "Firefox"             -?> doShift "www"
                , className     =? "LibreOffice 5.0"     -?> doShift "view"
                , className     =? "Vlc"                 -?> doShift "view"
                , className     =? "Evince"              -?> doShift "view"
diff --git a/bin/xlaunch b/bin/xlaunch
index 9f82e70e..acf9b5ae 100755
--- a/bin/xlaunch
+++ b/bin/xlaunch
@@ -3,7 +3,7 @@
 
 case $1 in
     www)
-        wmctrl -a Iceweasel || iceweasel &
+        wmctrl -a Firefox || firefox &
         ;;
     emacs)
         if ! pgrep emacs; then
diff --git a/bin/xstartup b/bin/xstartup
index c3cbfbf1..11269479 100755
--- a/bin/xstartup
+++ b/bin/xstartup
@@ -76,6 +76,7 @@ fi
 redshift-gtk -l 53.57:1.5 -t 6500:3700 &
 caffeine-indicator &
 workrave &
+firefox &
 
 # ---- fire up my window manager