From: Samir Benmendil Date: Mon, 24 Oct 2016 08:20:22 +0000 (+0100) Subject: Merge remote-tracking branch 'refs/remotes/origin/master' X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/30a510867ee248d937c772c091ce2b1f15bab755?hp=dd31c0dded7f7bcb22e6bc01b4c4d78f1e5d8f34 Merge remote-tracking branch 'refs/remotes/origin/master' --- diff --git a/.gitmodules b/.gitmodules index 80b041d..cbefaf3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,10 +7,6 @@ [submodule "awesome/widgets/net_widgets"] path = awesome/widgets/net_widgets url = git@github.com:Ram-Z/net_widgets.git -[submodule "awesome/widgets/pomodoro"] - path = awesome/widgets/pomodoro - url = git@github.com:/Ram-Z/awesome-pomodoro - branch = module-path [submodule "zsh/lib/zsh-syntax-highlighting"] path = zsh/lib/zsh-syntax-highlighting url = https://github.com/zsh-users/zsh-syntax-highlighting diff --git a/Makefile b/Makefile index e4f5e15..88e4ab3 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ APATH := $(realpath .) FILES := bin -DOTFILES := conky* goobookrc msmtp* mutt profile tmux.conf weechat Xresources xprofile zprofile zshenv zshrc -CONFIGFILES := aliases compton.conf git gnupg mpv offlineimap ranger retroarch systemd vim xbindkeys xkb zsh +DOTFILES := conky* goobookrc msmtp* mutt profile tmux.conf weechat Xresources xprofile +CONFIGFILES := aliases compton.conf git gnupg mpv offlineimap ranger retroarch systemd vim xbindkeys xkb .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES) install: $(FILES) $(DOTFILES) $(CONFIGFILES) @@ -17,6 +17,14 @@ ncmpcpp: mkdir -p ~/.local/share/mpd/lyrics .PHONY: ncmpcpp +zsh: + ln -sfT $(APATH)/zshrc ~/.zshrc + ln -sfT $(APATH)/zprofile ~/.zprofile + ln -sfT $(APATH)/zshenv ~/.zshenv + ln -sfT $(APATH)/zsh ~/.config/zsh + mkdir -p ~/.cache/zsh +.PHONY: zsh + $(FILES): @if [[ -e ~/$@ && ! -L ~/$@ ]]; then \ if [[ -d $@ ]]; then \ diff --git a/awesome/awesome-freedesktop b/awesome/awesome-freedesktop index e514e74..66d158e 160000 --- a/awesome/awesome-freedesktop +++ b/awesome/awesome-freedesktop @@ -1 +1 @@ -Subproject commit e514e742864495f23fd725f8c596f41a01d67795 +Subproject commit 66d158ee13fba22b03a89df3f75720f89f4fa84d diff --git a/awesome/topbar.lua b/awesome/topbar.lua index b816365..4d5d505 100644 --- a/awesome/topbar.lua +++ b/awesome/topbar.lua @@ -89,8 +89,6 @@ for s = 1, screen.count() do local right_layout = wibox.layout.fixed.horizontal() if s == 1 then right_layout:add(wibox.widget.systray()) end right_layout:add(separator) - right_layout:add(require("widgets/pomodoro")) - right_layout:add(separator) right_layout:add(require("widgets/awesompd")) right_layout:add(require("widgets/volume_widget")) if utils.has_battery() then diff --git a/awesome/widgets/pomodoro b/awesome/widgets/pomodoro deleted file mode 160000 index a861385..0000000 --- a/awesome/widgets/pomodoro +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a861385355d0ac10091eda49757fc9eda05480a3 diff --git a/awesome/widgets/pomodoro.lua b/awesome/widgets/pomodoro.lua deleted file mode 100644 index 3c7af63..0000000 --- a/awesome/widgets/pomodoro.lua +++ /dev/null @@ -1,22 +0,0 @@ -local pomodoro = require("widgets/pomodoro/init") -local wibox = require("wibox") - --- durations in seconds -pomodoro.short_pause_duration = 5 * 60 -pomodoro.long_pause_duration = 30 * 60 -pomodoro.work_duration = 25 * 60 - --- format string -pomodoro.format = function (t) return " "..t.."" end - -pomodoro.init() - -pombox = wibox.layout.fixed.horizontal() -pombox:add(pomodoro.icon_widget) -pombox:add(pomodoro.widget) - -globalkeys = awful.util.table.join(globalkeys, - awful.key({ modkey, "Shift" }, "p", function() pomodoro:start() end) -) - -return pombox diff --git a/git/config b/git/config index f3865cf..0e41b1f 100644 --- a/git/config +++ b/git/config @@ -29,3 +29,5 @@ [rebase] autostash = true autosquash = true +[status] + submodulesummary = true diff --git a/qutebrowser/keys.conf b/qutebrowser/keys.conf index 534a729..2ef0f35 100644 --- a/qutebrowser/keys.conf +++ b/qutebrowser/keys.conf @@ -27,8 +27,7 @@ # # For simple keys (no `<>`-signs), a capital letter means the key is pressed # with Shift. For special keys (with `<>`-signs), you need to explicitly add -# `Shift-` to match a key pressed with shift. You can bind multiple commands -# by separating them with `;;`. +# `Shift-` to match a key pressed with shift. # # Note that default keybindings are always bound, and need to be explicitly # unbound if you wish to remove them: @@ -287,7 +286,7 @@ set-cmd-text -s :set set-cmd-text -s :set -t sl -set-cmd-text -s :set keybind +set-cmd-text -s :bind sk zoom-out @@ -532,8 +531,8 @@ completion-item-focus prev-category # bind special keys. # Useful hidden commands to map in this section: # * `prompt-accept`: Confirm the entered value. -# * `prompt-yes`: Answer yes to a yes/no question. -# * `prompt-no`: Answer no to a yes/no question. +# * `prompt-accept yes`: Answer yes to a yes/no question. +# * `prompt-accept no`: Answer no to a yes/no question. prompt-accept @@ -543,10 +542,10 @@ prompt-accept -prompt-yes +prompt-accept yes y -prompt-no +prompt-accept no n prompt-open-download diff --git a/qutebrowser/qutebrowser.conf b/qutebrowser/qutebrowser.conf index 7eb7f85..0069283 100644 --- a/qutebrowser/qutebrowser.conf +++ b/qutebrowser/qutebrowser.conf @@ -38,6 +38,11 @@ # The default page(s) to open at the start, separated by commas. # Default: https://duckduckgo.com # +# yank-ignored-url-parameters (List of String): +# The URL parameters to strip with :yank url, separated by commas. +# Default: +# ref,utm_source,utm_medium,utm_campaign,utm_term,utm_content +# # default-page (FuzzyUrl): # The page to open if :open -t/-b/-w is used without URL. Use # `about:blank` for a blank page. @@ -160,6 +165,7 @@ # Default: path,query ignore-case = smart startpage = https://duckduckgo.com/?t=chakra +yank-ignored-url-parameters = ref,utm_source,utm_medium,utm_campaign,utm_term,utm_content default-page = ${startpage} auto-search = naive auto-save-config = true @@ -235,7 +241,7 @@ url-incdec-segments = path,query # User stylesheet to use (absolute filename, filename relative to # the config directory or CSS string). Will expand environment # variables. -# Default: ::-webkit-scrollbar { width: 0px; height: 0px; } +# Default: html > ::-webkit-scrollbar { width: 0px; height: 0px; } # # css-media-type (String): # Set the CSS media type. @@ -359,6 +365,11 @@ keyhint-blacklist = # custom-headers (HeaderDict): # Set custom headers for qutebrowser HTTP requests. # Default: +# +# netrc-file (File): +# Set location of a netrc-file for HTTP authentication. If empty, +# ~/.netrc is used. +# Default: do-not-track = true accept-language = en-US,en,de,fr referer-header = same-domain @@ -368,14 +379,17 @@ proxy-dns-requests = true ssl-strict = ask dns-prefetch = true custom-headers = +netrc-file = [completion] # Options related to completion and command history. # -# auto-open (Bool): -# Automatically open completion when typing. -# Valid values: true, false -# Default: true +# show (String): +# When to show the autocompletion window. +# always: Whenever a completion is available. +# auto: Whenever a completion is requested. +# never: Never. +# Default: always # # download-path-suggestion (String): # What to display in the download filename input. @@ -388,11 +402,6 @@ custom-headers = # How to format timestamps (e.g. for history) # Default: %Y-%m-%d # -# show (Bool): -# Whether to show the autocompletion window. -# Valid values: true, false -# Default: true -# # height (PercOrInt): # The height of the completion, in px or as percentage of the # window. @@ -427,10 +436,9 @@ custom-headers = # scrollbar-padding (Int): # Padding of scrollbar handle in completion window (in px). # Default: 2 -auto-open = true +show = always download-path-suggestion = path timestamp-format = %Y-%m-%d -show = true height = 150 cmd-history-max-items = 100 web-history-max-items = 1000 @@ -793,8 +801,9 @@ cache-size = 52428800 # Valid values: true, false, ask # Default: ask # -# javascript-can-open-windows (Bool): -# Whether JavaScript programs can open new windows. +# javascript-can-open-windows-automatically (Bool): +# Whether JavaScript programs can open new windows without user +# interaction. # Valid values: true, false # Default: false # @@ -881,7 +890,7 @@ css-regions = true hyperlink-auditing = false geolocation = ask notifications = ask -javascript-can-open-windows = false +javascript-can-open-windows-automatically = false javascript-can-close-windows = false javascript-can-access-clipboard = false ignore-javascript-prompt = false @@ -979,7 +988,7 @@ min-chars = 2 scatter = true uppercase = true dictionary = /usr/share/dict/words -auto-follow = true +auto-follow = unique-match auto-follow-timeout = 0 next-regexes = \bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b,\bcontinue\b prev-regexes = \bprev(ious)?\b,\bback\b,\bolder\b,\b[<←≪]\b,\b(<<|«)\b @@ -1094,22 +1103,6 @@ exit = quit # Background color of the statusbar. # Default: black # -# statusbar.fg.error (QssColor): -# Foreground color of the statusbar if there was an error. -# Default: ${statusbar.fg} -# -# statusbar.bg.error (QssColor): -# Background color of the statusbar if there was an error. -# Default: red -# -# statusbar.fg.warning (QssColor): -# Foreground color of the statusbar if there is a warning. -# Default: ${statusbar.fg} -# -# statusbar.bg.warning (QssColor): -# Background color of the statusbar if there is a warning. -# Default: darkorange -# # statusbar.fg.prompt (QssColor): # Foreground color of the statusbar if there is a prompt. # Default: ${statusbar.fg} @@ -1311,6 +1304,42 @@ exit = quit # keyhint.bg (QssColor): # Background color of the keyhint widget. # Default: rgba(0, 0, 0, 80%) +# +# messages.fg.error (QssColor): +# Foreground color of an error message. +# Default: white +# +# messages.bg.error (QssColor): +# Background color of an error message. +# Default: red +# +# messages.border.error (QssColor): +# Border color of an error message. +# Default: #bb0000 +# +# messages.fg.warning (QssColor): +# Foreground color a warning message. +# Default: white +# +# messages.bg.warning (QssColor): +# Background color of a warning message. +# Default: darkorange +# +# messages.border.warning (QssColor): +# Border color of an error message. +# Default: #d47300 +# +# messages.fg.info (QssColor): +# Foreground color an info message. +# Default: white +# +# messages.bg.info (QssColor): +# Background color of an info message. +# Default: black +# +# messages.border.info (QssColor): +# Border color of an info message. +# Default: #333333 completion.fg = white completion.bg = #333333 completion.alternate-bg = #444444 @@ -1327,10 +1356,6 @@ completion.scrollbar.fg = ${completion.fg} completion.scrollbar.bg = ${completion.bg} statusbar.fg = white statusbar.bg = black -statusbar.fg.error = ${statusbar.fg} -statusbar.bg.error = red -statusbar.fg.warning = ${statusbar.fg} -statusbar.bg.warning = darkorange statusbar.fg.prompt = ${statusbar.fg} statusbar.bg.prompt = darkblue statusbar.fg.insert = ${statusbar.fg} @@ -1377,6 +1402,15 @@ webpage.bg = white keyhint.fg = #FFFFFF keyhint.fg.suffix = #FFFF00 keyhint.bg = rgba(0, 0, 0, 80%) +messages.fg.error = ${statusbar.fg} +messages.bg.error = red +messages.border.error = #bb0000 +messages.fg.warning = ${statusbar.fg} +messages.bg.warning = darkorange +messages.border.warning = #d47300 +messages.fg.info = white +messages.bg.info = black +messages.border.info = #333333 [fonts] # Fonts used for the UI, with optional style/weight/size. @@ -1461,6 +1495,18 @@ keyhint.bg = rgba(0, 0, 0, 80%) # keyhint (Font): # Font used in the keyhint widget. # Default: 8pt ${_monospace} +# +# messages.error (Font): +# Font used for error messages. +# Default: 8pt ${_monospace} +# +# messages.warning (Font): +# Font used for warning messages. +# Default: 8pt ${_monospace} +# +# messages.info (Font): +# Font used for info messages. +# Default: 8pt ${_monospace} _monospace = Terminus, Monospace, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Liberation Mono", "Courier New", Courier, monospace, Fixed, Consolas, Terminal completion = 8pt ${_monospace} completion.category = bold ${completion} @@ -1480,3 +1526,6 @@ web-size-minimum-logical = web-size-default = web-size-default-fixed = keyhint = 8pt ${_monospace} +messages.error = 8pt ${_monospace} +messages.warning = 8pt ${_monospace} +messages.info = 8pt ${_monospace} diff --git a/vim/vimrc b/vim/vimrc index 9338067..47529e3 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -72,6 +72,7 @@ Plugin 'derekwyatt/vim-protodef' " needs editing colorscheme " Plugin 'jeaye/color_coded' " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp +Plugin 'wincent/loupe' call vundle#end() @@ -156,10 +157,18 @@ set mouse=rnv " list of flags for using the mouse set ttymouse=xterm " type of mouse " messages and info {{{2 -set showcmd " Show (partial) command in status line. -set ruler " show the cursor position all the time -set confirm " Ask what to do when closing unsaved documents -set shortmess=filnxtoOI " don't show intro message +set showcmd " Show (partial) command in status line. +set ruler " show the cursor position all the time +set confirm " Ask what to do when closing unsaved documents +set shortmess= " reset option +set shortmess+=a " all abbreviations +set shortmess+=o " overwrite file-written message +set shortmess+=O " file-read message overrides previous +set shortmess+=t " truncate file message at start +set shortmess+=T " truncate other messages in the middle +set shortmess+=W " don't give 'written' or '[w]' when writing a file +set shortmess+=A " ignore swapfile warning +set shortmess+=I " no splash screen " editing text {{{2 set backspace=indent,eol,start " allow backspacing over everything in insert mode diff --git a/zsh/lib/00-key-bindings.zsh b/zsh/lib/00-key-bindings.zsh index 5de80bf..c99f5dd 100644 --- a/zsh/lib/00-key-bindings.zsh +++ b/zsh/lib/00-key-bindings.zsh @@ -4,7 +4,8 @@ bindkey '^N' history-search-forward bindkey '^P' history-search-backward bindkey ' ' magic-space # also do history expansion on space -bindkey -s '^[l' 'ls ' # show dir content +bindkey -s '^[l' '^Qls ' # show dir content +bindkey -s '^Z' '^Qfg ' # fg with ^Z bindkey '^[[Z' reverse-menu-complete diff --git a/zsh/lib/zsh-syntax-highlighting b/zsh/lib/zsh-syntax-highlighting index 3679295..035d3eb 160000 --- a/zsh/lib/zsh-syntax-highlighting +++ b/zsh/lib/zsh-syntax-highlighting @@ -1 +1 @@ -Subproject commit 367929502fc1e6cb5a1bacc5ff8cc8a317cb998a +Subproject commit 035d3eb095a4396843bffbbeb640fe97e9a0dff2