From f69e46e488cd7f54caefb9aca39254eba9aedabc Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 29 Nov 2016 14:29:35 -0600 Subject: [PATCH] remove qutebrowser stuff --- browser/qutebrowser/.gitignore | 2 + browser/qutebrowser/bookmarks/urls | 2 - browser/qutebrowser/quickmarks | 0 browser/qutebrowser/qutebrowser.conf | 76 ++++++++++++++-------------- colors/gen/schemes/donokai.yml | 32 ++++++------ env/sh/aliases | 2 +- env/wm/bspwmrc | 9 +++- env/wm/sxhkdrc | 25 ++++----- env/wm/wmstart | 5 ++ env/x/gtk3settings.ini | 2 +- env/x/xinitrc | 2 +- os/arch_linux/3-utils.bash | 1 + variables.bash | 9 +++- 13 files changed, 93 insertions(+), 74 deletions(-) create mode 100644 browser/qutebrowser/.gitignore delete mode 100644 browser/qutebrowser/bookmarks/urls delete mode 100644 browser/qutebrowser/quickmarks create mode 100755 env/wm/wmstart diff --git a/browser/qutebrowser/.gitignore b/browser/qutebrowser/.gitignore new file mode 100644 index 0000000..8c84be8 --- /dev/null +++ b/browser/qutebrowser/.gitignore @@ -0,0 +1,2 @@ +bookmarks/* +quickmarks diff --git a/browser/qutebrowser/bookmarks/urls b/browser/qutebrowser/bookmarks/urls deleted file mode 100644 index cad4295..0000000 --- a/browser/qutebrowser/bookmarks/urls +++ /dev/null @@ -1,2 +0,0 @@ -https://security.google.com/settings/security/apppasswords?pli=1 App passwords - Account Settings -https://security.google.com/settings/security/apppasswords App passwords - Account Settings diff --git a/browser/qutebrowser/quickmarks b/browser/qutebrowser/quickmarks deleted file mode 100644 index e69de29..0000000 diff --git a/browser/qutebrowser/qutebrowser.conf b/browser/qutebrowser/qutebrowser.conf index b31d58c..448f838 100644 --- a/browser/qutebrowser/qutebrowser.conf +++ b/browser/qutebrowser/qutebrowser.conf @@ -290,11 +290,11 @@ message-unfocused = false confirm-quit = always zoom-text-only = false frame-flattening = false -user-stylesheet = ::-webkit-scrollbar { width: 0px; height: 0px; } +user-stylesheet = body::-webkit-scrollbar { display: none !important; } css-media-type = smooth-scrolling = true remove-finished-downloads = -1 -hide-statusbar = false +hide-statusbar = true statusbar-padding = 5,5,5,5 window-title-format = {perc}{title}{title_sep}qutebrowser hide-mouse-cursor = false @@ -638,8 +638,8 @@ background-tabs = false select-on-remove = right new-tab-position = right new-tab-position-explicit = last -last-close = ignore -show = always +last-close = close +show = switching show-switching-delay = 800 wrap = true movable = true @@ -647,11 +647,11 @@ close-mouse-button = middle position = bottom show-favicons = true width = 20% -indicator-width = 3 +indicator-width = 2 tabs-are-windows = false title-format = {title} title-alignment = center -mousewheel-tab-switching = true +mousewheel-tab-switching = false padding = 5,5,5,5 indicator-padding = 0,0,0,5 @@ -1285,14 +1285,14 @@ g = ${google} # keyhint.bg (QssColor): # Background color of the keyhint widget. # Default: rgba(0, 0, 0, 80%) -completion.fg = white -completion.bg = #333333 -completion.alternate-bg = #444444 +completion.fg = #ffffff +completion.bg = #111111 +completion.alternate-bg = #333333 completion.category.fg = white completion.category.bg = qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #888888, stop:1 #505050) -completion.category.border.top = black +completion.category.border.top = #111111 completion.category.border.bottom = ${completion.category.border.top} -completion.item.selected.fg = black +completion.item.selected.fg = #111111 completion.item.selected.bg = #e8c000 completion.item.selected.border.top = #bbbb00 completion.item.selected.border.bottom = ${completion.item.selected.border.top} @@ -1300,56 +1300,56 @@ completion.match.fg = #ff4444 completion.scrollbar.fg = ${completion.fg} completion.scrollbar.bg = ${completion.bg} statusbar.fg = white -statusbar.bg = black +statusbar.bg = #111111 statusbar.fg.error = ${statusbar.fg} -statusbar.bg.error = red +statusbar.bg.error = #f92672 statusbar.fg.warning = ${statusbar.fg} -statusbar.bg.warning = darkorange +statusbar.bg.warning = #f4bf75 statusbar.fg.prompt = ${statusbar.fg} -statusbar.bg.prompt = darkblue +statusbar.bg.prompt = #333333 statusbar.fg.insert = ${statusbar.fg} -statusbar.bg.insert = darkgreen +statusbar.bg.insert = #333333 statusbar.fg.command = ${statusbar.fg} statusbar.bg.command = ${statusbar.bg} statusbar.fg.caret = ${statusbar.fg} -statusbar.bg.caret = purple +statusbar.bg.caret = #ffffff statusbar.fg.caret-selection = ${statusbar.fg} -statusbar.bg.caret-selection = #a12dff +statusbar.bg.caret-selection = #666666 statusbar.progress.bg = white statusbar.url.fg = ${statusbar.fg} statusbar.url.fg.success = white -statusbar.url.fg.success.https = lime -statusbar.url.fg.error = orange -statusbar.url.fg.warn = yellow -statusbar.url.fg.hover = aqua -tabs.fg.odd = white -tabs.bg.odd = grey +statusbar.url.fg.success.https = #a6e22e +statusbar.url.fg.error = #fd971f +statusbar.url.fg.warn = #f4bf75 +statusbar.url.fg.hover = #a1efe4 +tabs.fg.odd = #ffffff +tabs.bg.odd = #666666 tabs.fg.even = white -tabs.bg.even = darkgrey +tabs.bg.even = #888888 tabs.fg.selected.odd = white -tabs.bg.selected.odd = black +tabs.bg.selected.odd = #111111 tabs.fg.selected.even = ${tabs.fg.selected.odd} tabs.bg.selected.even = ${tabs.bg.selected.odd} -tabs.bg.bar = #555555 -tabs.indicator.start = #0000aa -tabs.indicator.stop = #00aa00 -tabs.indicator.error = #ff0000 +tabs.bg.bar = #111111 +tabs.indicator.start = #66d9ef +tabs.indicator.stop = #a6e22e +tabs.indicator.error = #f92672 tabs.indicator.system = rgb -hints.fg = black +hints.fg = #111111 hints.bg = -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFF785), color-stop(100%,#FFC542)) -hints.fg.match = green -downloads.bg.bar = black +hints.fg.match = #a6e22e +downloads.bg.bar = #111111 downloads.fg.start = white -downloads.bg.start = #0000aa +downloads.bg.start = #66d9ef downloads.fg.stop = ${downloads.fg.start} -downloads.bg.stop = #00aa00 +downloads.bg.stop = #a6e22e downloads.fg.system = rgb downloads.bg.system = rgb downloads.fg.error = white -downloads.bg.error = red +downloads.bg.error = #f92672 webpage.bg = white keyhint.fg = #FFFFFF -keyhint.fg.suffix = #FFFF00 +keyhint.fg.suffix = #fd971f keyhint.bg = rgba(0, 0, 0, 80%) [fonts] @@ -1431,7 +1431,7 @@ keyhint.bg = rgba(0, 0, 0, 80%) # keyhint (Font): # Font used in the keyhint widget. # Default: 8pt ${_monospace} -_monospace = Terminus, Monaco, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Courier New", Courier, "Liberation Mono", monospace, Fixed, Consolas, Terminal +_monospace = lemon, Terminus, Monaco, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Courier New", Courier, "Liberation Mono", monospace, Fixed, Consolas, Terminal completion = 8pt ${_monospace} tabbar = 8pt ${_monospace} statusbar = 8pt ${_monospace} diff --git a/colors/gen/schemes/donokai.yml b/colors/gen/schemes/donokai.yml index af0ee0f..b6ee153 100644 --- a/colors/gen/schemes/donokai.yml +++ b/colors/gen/schemes/donokai.yml @@ -1,19 +1,19 @@ scheme: "Donokai" author: "Wimer Hazenberg (http://www.monokai.nl)" -base00: "111111" -base01: "383830" -base02: "49483e" -base03: "75715e" -base04: "a59f85" -base05: "f8f8f2" -base06: "f5f4f1" -base07: "f9f8f5" -base08: "f92672" -base09: "fd971f" -base0A: "f4bf75" -base0B: "a6e22e" -base0C: "a1efe4" -base0D: "66d9ef" -base0E: "ae81ff" -base0F: "cc6633" +base00: "111111" # background, dark grey +base01: "383830" # lighter grey +base02: "49483e" # lighter grey +base03: "75715e" # greyish yellow (peuce) +base04: "a59f85" # lighter peuce +base05: "f8f8f2" # foreground white +base06: "f5f4f1" # foreground 2 white +base07: "f9f8f5" # foreground 3 white +base08: "f92672" # magenta +base09: "fd971f" # orange +base0A: "f4bf75" # yellow +base0B: "a6e22e" # green +base0C: "a1efe4" # cyan +base0D: "66d9ef" # blue +base0E: "ae81ff" # purple +base0F: "cc6633" # pale orange diff --git a/env/sh/aliases b/env/sh/aliases index 13da6b0..36d85dd 100644 --- a/env/sh/aliases +++ b/env/sh/aliases @@ -50,7 +50,7 @@ alias gp="git push" alias gac="git add -A && git commit -m" # browser aliases -alias qutebrowser="qutebrowser --backend webengine" +alias qute="qutebrowser --backend webengine" # networking aliases alias p="ping 8.8.8.8" diff --git a/env/wm/bspwmrc b/env/wm/bspwmrc index 5810080..7177d8a 100755 --- a/env/wm/bspwmrc +++ b/env/wm/bspwmrc @@ -2,11 +2,16 @@ source "$DOTFILES_PATH/variables.bash" +if [ -e "$BSPWM_STATE" ] ; then + bspc wm -l "$BSPWM_STATE" + rm "$BSPWM_STATE" +fi + source "$DOTFILES_PATH/env/wm/bspwm_config" source "$DOTFILES_PATH/scripts/get_color.sh" source "$DOTFILES_PATH/scripts/get_x_fonts.sh" -bspc wm -o - urxvtd & sxhkd & + +bspc wm -o diff --git a/env/wm/sxhkdrc b/env/wm/sxhkdrc index 4df429c..9429c0d 100755 --- a/env/wm/sxhkdrc +++ b/env/wm/sxhkdrc @@ -1,17 +1,5 @@ # node manager shortcuts -# kill the wm -super + ctrl + Escape - bspc quit - -# close the current application -super + c - bspc node -c - -# kill the current application -super + shift + c - bspc node -k - # focus the node for the given path jump super + {p,b,comma,period} bspc node -f @{parent,brother,first,second} @@ -219,6 +207,19 @@ XF86AudioPrev {_,shift + }XF86MonBrightnessDown sub_percent_brightness {0.1,0.01} && update_bar_DisplayBrightness +# close the current application +super + c + bspc node -c + +# kill the current application +super + shift + c + bspc node -k + +# kill the wm +super + ctrl + {alt +,_} Escape + {bspc wm -d > "$BSPWM_STATE_FILE" && bspc quit, \ + bspc quit 1} + # make sxhkd reload its configuration files: super + Escape pkill -USR1 -x sxhkd diff --git a/env/wm/wmstart b/env/wm/wmstart new file mode 100755 index 0000000..61b2c60 --- /dev/null +++ b/env/wm/wmstart @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +while true; do + bspwm || break +done diff --git a/env/x/gtk3settings.ini b/env/x/gtk3settings.ini index 08bdb71..79142c0 100644 --- a/env/x/gtk3settings.ini +++ b/env/x/gtk3settings.ini @@ -1,4 +1,4 @@ [Settings] -gtk-icon-theme-name = Adwaita +gtk-icon-theme-name = elementary gtk-theme-name = Arc-Dark gtk-font-name = Monaco 9 diff --git a/env/x/xinitrc b/env/x/xinitrc index 0ffe731..9312f45 100644 --- a/env/x/xinitrc +++ b/env/x/xinitrc @@ -31,5 +31,5 @@ fi # fire up wm unclutter & -exec bspwm +exec "$DOTFILES_PATH/env/wm/wmstart" diff --git a/os/arch_linux/3-utils.bash b/os/arch_linux/3-utils.bash index af6226f..4bbc63d 100755 --- a/os/arch_linux/3-utils.bash +++ b/os/arch_linux/3-utils.bash @@ -49,6 +49,7 @@ pacaur -S \ nvidia-beta \ lib32-nvidia-beta \ pmount \ + qt5-webengine \ --noconfirm --noedit # sudo ln -s /usr/bin/google-chrome-unstable /usr/bin/chrome diff --git a/variables.bash b/variables.bash index 061fb61..91c4cf9 100755 --- a/variables.bash +++ b/variables.bash @@ -38,8 +38,15 @@ source "$DOTFILES_PATH/scripts/get_color.sh" # load our bar variables source "$DOTFILES_PATH/env/wm/extras/bar/variables.bash" +# when we kill bspwm we can export the state to this file +export BSPWM_STATE_FILE="$DOTFILES_PATH/bspwm_state.json.tmp" + # this lets our window gap account for the border width -export WINDOW_GAP=$(expr $WINDOW_GAP - $BORDER_WIDTH) +# if this is enabled, it is usually so that I can reduce border width on my +# desktops with a single chrome window on them so that I can click that tabs at +# the top quickly +# I really need to migrate browsers +# export WINDOW_GAP=$(expr $WINDOW_GAP - $BORDER_WIDTH) # load per-device bashrc_env if it exists if [ -a "$HOME/.bashrc_env" ]; then