From 1d590fe8c6fb228514340920d26ec2eac289ba90 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Tue, 17 Apr 2018 11:33:34 +0100 Subject: [PATCH 01/13] Add rofi-fontawesome picker variation --- scripts/rofi-fontawesome | 94 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100755 scripts/rofi-fontawesome diff --git a/scripts/rofi-fontawesome b/scripts/rofi-fontawesome new file mode 100755 index 0000000..5e8075d --- /dev/null +++ b/scripts/rofi-fontawesome @@ -0,0 +1,94 @@ +#!/usr/bin/env bash +# +# Use rofi to pick fontawesome because that's what this +# century is about apparently... +# +# Requirements: +# rofi, xclip, xdotool, curl, xmllint +# +# Usage: +# 1. Download all fontawesome +# $ rofi-fontawesome --download +# +# 2. Run it! +# $ rofi-fontawesome +# +# Notes: +# * You'll need a fontawesome font like "Noto fontawesome" or "fontawesomeOne". +# * Confirming an item will automatically paste it WITHOUT +# writing it to your clipboard. +# * Ctrl+C will copy it to your clipboard WITHOUT pasting it. +# + +# Where to save the fontawesomes file. +FONTAWESOME_FILE="${XDG_CACHE_DIR:-$HOME/.cache}/fontawesome.txt" + +function download() { + notify "$(basename "$0")" 'Downloading all Font Awesome for your pleasure' + + echo -n > "$FONTAWESOME_FILE" + + curl https://raw.githubusercontent.com/FortAwesome/Font-Awesome/master/advanced-options/metadata/icons.json | \ + jq '.[] | "\\u" + .unicode + "\t" + .label' -r | \ + xargs -0 printf \ + > "$FONTAWESOME_FILE" + + notify "$(basename "$0")" "We're all set!" +} + +function toclip() { + xclip -i -selection primary + xclip -o -selection primary | xclip -i -selection clipboard +} + +function repeat() { + local rplc str="$1" count="$2" + rplc="$(printf "%${count}s")" + echo "${rplc// /"$str"}" +} + +function notify() { + if which notify-send 1>/dev/null 2>/dev/null; then + notify-send "$1" "$2" + fi +} + +function display() { + fontawesome=$(cat "$FONTAWESOME_FILE" | grep -v '#' | grep -v '^[[:space:]]*$') + update=""$'\t'"Update Font Awesome cache" + fontawesome=$(printf "$fontawesome\n$update") + line=$(echo "$fontawesome" | rofi -dmenu -i -p fontawesome -kb-custom-1 Ctrl+c -kb-row-tab '' -kb-row-select Tab $@) + exit_code=$? + + if [ "${line[@]}" == "$update" ]; then + download + exit 0 + fi + + #IFS=$'\t' + line=($line) + last=${line[${#line[@]}-1]} + + quantifier="${last:${#last}-1:1}" + echo "$quantifier" | egrep -q '^[0-9]+$' || quantifier=1 + icons="$(repeat "${line[0]}" "$quantifier")" + + if [ $exit_code == 0 ]; then + xdotool type --clearmodifiers "$icons" + echo -n "$icons" | xclip -i + elif [ $exit_code == 10 ]; then + echo -n "$icons" | xclip -i + fi +} + + +if [[ "$1" =~ -D|--download ]]; then + download + exit 0 +elif [[ "$1" =~ -h|--help ]]; then + echo "usage: $0 [-D|--download]" + exit 0 +fi + +[ ! -f "$FONTAWESOME_FILE" ] && download +display From fff7fa1452ed22b9150ce9c498fc0a5b8d8df66b Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Tue, 17 Apr 2018 11:34:21 +0100 Subject: [PATCH 02/13] Fix typo 'emoij' in rofi-emoji --- scripts/rofi-emoji | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/rofi-emoji b/scripts/rofi-emoji index 135f8e9..b85c43b 100755 --- a/scripts/rofi-emoji +++ b/scripts/rofi-emoji @@ -97,13 +97,13 @@ function display() { quantifier="${last:${#last}-1:1}" echo "$quantifier" | egrep -q '^[0-9]+$' || quantifier=1 - emoijs="$(repeat "${line[0]}" "$quantifier")" + emojis="$(repeat "${line[0]}" "$quantifier")" if [ $exit_code == 0 ]; then - xdotool type --clearmodifiers "$emoijs" - echo -n "$emoijs" | xclip -i + xdotool type --clearmodifiers "$emojis" + echo -n "$emojis" | xclip -i elif [ $exit_code == 10 ]; then - echo -n "$emoijs" | xclip -i + echo -n "$emojis" | xclip -i fi } From 4579473479554fefd4bcf5c09d5311fb9427912f Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Fri, 20 Apr 2018 23:58:53 +0100 Subject: [PATCH 03/13] Add $GOPATH/bin to PATH --- .config/vim/vimrc | 1 + .profile | 5 ++++- scripts/vim-setup | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.config/vim/vimrc b/.config/vim/vimrc index 0a701a3..4b756ee 100644 --- a/.config/vim/vimrc +++ b/.config/vim/vimrc @@ -104,6 +104,7 @@ Plugin 'PotatoesMaster/i3-vim-syntax' Plugin 'lervag/vimtex' Plugin 'JamshedVesuna/vim-markdown-preview' Plugin 'junegunn/fzf.vim' +Plugin 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } call vundle#end() diff --git a/.profile b/.profile index 3e442ef..62dfe55 100644 --- a/.profile +++ b/.profile @@ -35,7 +35,10 @@ export TERMINAL="termite" export BROWSER="chromium" export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel" export QT_QPA_PLATFORMTHEME=gtk2 -export GOPATH="$XDG_LOCAL_HOME/go" + +# Go configuration +export GOPATH="$XDG_DATA_HOME/go" +export PATH="$PATH:$GOPATH/bin" exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; } diff --git a/scripts/vim-setup b/scripts/vim-setup index 3719dce..63afd1d 100755 --- a/scripts/vim-setup +++ b/scripts/vim-setup @@ -26,4 +26,4 @@ vim +PluginUpdate +qall ######################### cd "$VIMDIR/bundle/YouCompleteMe" git submodule update --init --recursive -./install.py --system-libclang --clang-completer +./install.py --system-libclang --clang-completer --go-completer --rust-completer --js-completer --java-completer From ff4bdb5ec24a48b6c500cfb8719d24cdedaeba51 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sat, 21 Apr 2018 00:08:53 +0100 Subject: [PATCH 04/13] Only start Vim with --servername if supported --- aliases | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/aliases b/aliases index e994393..cd4f162 100644 --- a/aliases +++ b/aliases @@ -58,7 +58,8 @@ alias make="make -j$(nproc)" alias dd='dd status=progress' alias env='env | sort' alias ssh="ssh -tt" -alias vim="vim --servername vim -p" +vim --version 2>/dev/null | command grep -q +clientserver && \ + alias vim="vim --servername vim -p" alias vi=vim alias grip='grip --user=frebib --pass=$GRIP_API_KEY' alias acme.sh='$XDG_CONFIG_HOME/acme.sh/acme.sh --home $XDG_CONFIG_HOME/acme.sh --config-home $XDG_CONFIG_HOME/acme.sh --log $XDG_CONFIG_HOME/acme.sh/acme.sh.log' From 73ecd1f58439d97629866cb4c94d5dda8d0e8912 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sat, 21 Apr 2018 00:15:17 +0100 Subject: [PATCH 05/13] Suppress tty output for busybox compatibility --- .config/zsh/.zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index db1b269..216d1ae 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -17,7 +17,7 @@ SAVEHIST=999999 exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; } # Only set tty if running interactively -if exists tty && tty -s; then +if exists tty && tty -s 1>/dev/null 2>/dev/null; then # Resolve at shell runtime export GPG_TTY="$(tty)" fi From ae1acb194cef579f91509e708b484d048cbdc01c Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sat, 21 Apr 2018 00:20:51 +0100 Subject: [PATCH 06/13] vim: create missing directories on startup --- .config/vim/vimrc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.config/vim/vimrc b/.config/vim/vimrc index 4b756ee..e4dc42a 100644 --- a/.config/vim/vimrc +++ b/.config/vim/vimrc @@ -1,12 +1,14 @@ set nocompatible " be iMproved, required " Reconfigure Vim to be clean! -set undodir=$XDG_CACHE_HOME/vim/undo -set directory=$XDG_CACHE_HOME/vim/swap -set backupdir=$XDG_CACHE_HOME/vim/backup +set undodir=$XDG_CACHE_HOME/vim/undo// +set directory=$XDG_CACHE_HOME/vim/swap// +set backupdir=$XDG_CACHE_HOME/vim/backup// set viminfo+='1000,n$XDG_CACHE_HOME/vim/viminfo set runtimepath+=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after +silent !mkdir -p $XDG_CACHE_HOME/vim/swap $XDG_CACHE_HOME/vim/undo $XDG_CACHE_HOME/vim/backup + syntax enable filetype plugin on From 1c297d3a776c3c3aa2353bf3a73bb93c65a419dc Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sat, 21 Apr 2018 01:03:17 +0100 Subject: [PATCH 07/13] Reorganise many directories into XDG dirs --- .config/X11/xinitrc | 18 +++++++++ .config/gopass/config.yml | 24 ++++++++++++ .gtkrc-2.0 => .config/gtk-2.0/settings.ini | 0 .profile | 43 +++++++++++----------- scripts/linkdotfiles | 24 ------------ 5 files changed, 63 insertions(+), 46 deletions(-) create mode 100644 .config/gopass/config.yml rename .gtkrc-2.0 => .config/gtk-2.0/settings.ini (100%) diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc index 62dd892..3131ec9 100644 --- a/.config/X11/xinitrc +++ b/.config/X11/xinitrc @@ -19,4 +19,22 @@ xrandr --dpi $(xrdb -query | grep -i xft.dpi | cut -d: -f2) setxkbmap -option caps:none xset r rate 200 18 + +export TERMINAL="termite" +export BROWSER="chromium" +export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel" +export QT_QPA_PLATFORMTHEME=gtk2 +export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open + +# Merge system clipboards +if [ -n "$DISPLAY" ] && exists autocutsel && ! pidof autocutsel 1>/dev/null; then + autocutsel -fork + autocutsel -selection PRIMARY -fork +fi + +# Start the gnome-keyring if it's installed +if exists gnome-keyring-daemon; then + export $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gnupg) +fi + exec i3 diff --git a/.config/gopass/config.yml b/.config/gopass/config.yml new file mode 100644 index 0000000..a39fbb8 --- /dev/null +++ b/.config/gopass/config.yml @@ -0,0 +1,24 @@ +root: + askformore: false + autoimport: true + autosync: true + cliptimeout: 45 + noconfirm: false + nopager: false + path: /home/frebib/.local/share/pass + safecontent: false + usesymbols: false + nocolor: false +mounts: + spritsail: + askformore: false + autoimport: true + autosync: true + cliptimeout: 45 + noconfirm: false + nopager: false + path: /home/frebib/.local/share/pass-spritsail + safecontent: false + usesymbols: false + nocolor: false +version: 1.6.10 diff --git a/.gtkrc-2.0 b/.config/gtk-2.0/settings.ini similarity index 100% rename from .gtkrc-2.0 rename to .config/gtk-2.0/settings.ini diff --git a/.profile b/.profile index 62dfe55..48af925 100644 --- a/.profile +++ b/.profile @@ -6,7 +6,8 @@ export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}" export XDG_LOCAL_HOME="$HOME/.local" -export XDG_CURRENT_DESKTOP="GNOME" # Fixes xdg-open + +mkdir -p "$XDG_CONFIG_HOME" "$XDG_CACHE_HOME" "$XDG_DATA_HOME" "$XDG_LOCAL_HOME" case "$(basename "$(readlink -f /proc/$$/exe)")" in zsh) thisfile="$(readlink -f "${(%):-%N}")";; @@ -16,25 +17,27 @@ esac export DOTFILES="$(dirname "${thisfile:-$XDG_CONFIG_HOME/dotfiles}")" export PATH="${PATH}:$DOTFILES/scripts" -# Allow Vim to load from ~/.config/vim +# Override paths for non-compliant programs +# https://wiki.archlinux.org/index.php/XDG_Base_Directory_support +# Vim export VIMDIR="$XDG_CONFIG_HOME/vim" export VIMRC="$VIMDIR/vimrc" export VIMINIT=":so $VIMRC" export EDITOR="vim" export VISUAL="vim" - -# Allow ZSH to load from ~/.config/zsh +# ZSH export ZDOTDIR="$XDG_CONFIG_HOME/zsh" - -# Configure X11 config file paths +# Gnupg +export GNUPGHOME="$XDG_CONFIG_HOME/gnupg" +# X11 export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" export XINITRC="$XDG_CONFIG_HOME/X11/xinitrc" - -export MANPAGER="less -+N" -export TERMINAL="termite" -export BROWSER="chromium" -export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel" -export QT_QPA_PLATFORMTHEME=gtk2 +# GTK2 +export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/settings.ini +# Cargo/Rust +export CARGO_HOME="$XDG_DATA_HOME/cargo" +# Pass +export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass" # Go configuration export GOPATH="$XDG_DATA_HOME/go" @@ -42,8 +45,13 @@ export PATH="$PATH:$GOPATH/bin" exists() { which $@ 0<&- 1>/dev/null 2>/dev/null; } +# Configure less and add colours export LESS="-RI" export PAGER="less $LESS" +export MANPAGER="less -+N" +# Disable histfile +export LESSHISTFILE=- + if exists tput; then export LESS_TERMCAP_mb=$(tput bold; tput setaf 2) # green export LESS_TERMCAP_md=$(tput bold; tput setaf 6) # cyan @@ -67,18 +75,9 @@ if [ -f "$XDG_CONFIG_HOME/secrets" ]; then set +o allexport fi -# Merge system clipboards -if [ -n "$DISPLAY" ] && exists autocutsel && ! pidof autocutsel 1>/dev/null; then - autocutsel -fork - autocutsel -selection PRIMARY -fork -fi - +# Start a dbus session daemon for programs that require it if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && exists dbus-launch; then eval $(dbus-launch --sh-syntax --exit-with-session) dbus-update-activation-environment --systemd DISPLAY fi -# Start the gnome-keyring if it's installed -if exists gnome-keyring-daemon; then - export $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gnupg) -fi diff --git a/scripts/linkdotfiles b/scripts/linkdotfiles index cd611fd..9ec9ec4 100755 --- a/scripts/linkdotfiles +++ b/scripts/linkdotfiles @@ -23,27 +23,3 @@ echo cd `pwd` for file in $conffiles; do ln -sfv $confpath/.config/$file . done - -cd $HOME -mkdir -p .local/share/ && cd .local/share -echo cd `pwd` -ln -sfv $DOTFILES/fonts . - -sudo -s << EOF -cd ~ -echo -n "cd " -pwd - -ln -sfv $DOTFILES .config/ -ln -sfv $userhome/.zshrc . -ln -sfv $userhome/.profile . -ln -sfv $userhome/.zprofile . -ln -sfv $userhome/.vimrc . -ln -sfv $userhome/.vim/ . -ln -sfv $userhome/.gtkrc-2.0 . - -mkdir -p .config && cd .config/ -echo -n "cd " -pwd -ln -sfv $userhome/.config/gtk-3.0 . -EOF From c0420a7022e9fec2e875196b363e71d05cbb1696 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sat, 21 Apr 2018 01:10:10 +0100 Subject: [PATCH 08/13] Add a more relevant README Addresses #1 --- README.md | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 2c6dac9..c3a4584 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,10 @@ -These are the configs I use on my Arch Linux installation at home. They can be use and changed as much or as little as you please +# frebib/dotfiles ## Usage -To quickly get started, clone this repo and run the setup scripts. +To get started, clone this repo and link the relevant files/directories - git clone https://github.com/frebib/dotfiles.git ~/.config/dotfiles - cd ~/.config/dotfiles - -You can put the `dotfiles` directory anywhere, just be sure to update the `$DOTFILES` envvar in `.profile` - -To link all the configuration files, run the init-dotfiles script: - -**Be warned that this will destroy your current configs without warning** - - scripts/init-dotfiles.sh - -To install all of my packages & programs, check out my other repo and the [`userinstall`](https://github.com/frebib/arch-install/blob/master/userinstall) script +```shell +git clone https://github.com/frebib/dotfiles.git ~/.config/dotfiles +ln -sfv .config/dotfiles/.config/* .config/ +ln -sfv .config/dotfiles/.profile .zprofile +``` From 40c3f618199c872900d1806013b8e813fc9c9275 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sat, 21 Apr 2018 01:14:16 +0100 Subject: [PATCH 09/13] Remove broken ANSI codes from 'env' --- aliases | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases b/aliases index cd4f162..cd9732e 100644 --- a/aliases +++ b/aliases @@ -56,7 +56,7 @@ alias pacaur='pacaur --color=always' alias tree='tree --dirsfirst -C -F' alias make="make -j$(nproc)" alias dd='dd status=progress' -alias env='env | sort' +alias env='env | sort | sed -r "s/\x1B\[(([0-9]+)(;[0-9]+)*)?[m,K,H,f,J]//g"' alias ssh="ssh -tt" vim --version 2>/dev/null | command grep -q +clientserver && \ alias vim="vim --servername vim -p" From 2b631fb2cd155b7ae60c73fbb9f4027370f1f9c7 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sat, 21 Apr 2018 01:33:52 +0100 Subject: [PATCH 10/13] Remove .fehbg script --- .config/i3/config | 2 +- .fehbg | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100755 .fehbg diff --git a/.config/i3/config b/.config/i3/config index 4679bf5..6c945b5 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -186,8 +186,8 @@ bindsym XF86MonBrightnessDown exec xbacklight -dec 5 && pkill -RTMIN+12 i3blocks exec --no-startup-id "ip monitor | while read; do pkill -RTMIN+15 i3blocks; done" # app launch shortcuts -exec --no-startup-id ~/.fehbg exec --no-startup-id ~/.config/i3/disable-standby-fs.py +exec --no-startup-id feh --no-fehbg --no-xinerama --bg-fill ~/pictures/lakesidesunrise.jpg exec --no-startup-id xautolock -time 5 -locker ~/.config/i3/lock.sh -nocloseout -nocloseerr # startup programs diff --git a/.fehbg b/.fehbg deleted file mode 100755 index 94f6942..0000000 --- a/.fehbg +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -'feh' '--no-xinerama' '--bg-fill' '/home/frebib/pictures/lakesidesunrise.jpg' From c164577bd7f2a7ac05c26b40da6d537edb589709 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sat, 21 Apr 2018 01:43:32 +0100 Subject: [PATCH 11/13] zsh: add nullglob option --- .config/zsh/.zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 216d1ae..368c81d 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -24,7 +24,7 @@ fi # Set some useful ZSH/Bash options setopt sharehistory histignorealldups histignorespace histreduceblanks -setopt pathdirs autocd autopushd extendedglob alwaystoend dvorak +setopt pathdirs autocd autopushd extendedglob nullglob alwaystoend dvorak # Completion initialisation autoload -U compinit ; compinit From fc4560b31f0e502607af7e774509a126a89c97aa Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sat, 21 Apr 2018 02:14:12 +0100 Subject: [PATCH 12/13] compton: improve blur on fading/exiting windows --- .config/compton.conf | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.config/compton.conf b/.config/compton.conf index 793452d..ca1425e 100644 --- a/.config/compton.conf +++ b/.config/compton.conf @@ -25,17 +25,14 @@ inactive-opacity-override = true; # Let inactive opacity set by 'inactive-opacit opacity-rule = [ "0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'" ]; -alpha-step = 0.06; # XRender backend: Step size for alpha pictures. Increasing +alpha-step = 0.02; # XRender backend: Step size for alpha pictures. Increasing # it may result in less X resource usage, # Yet f ading may look bad. -# inactive-dim = 0.2; # Dim inactive windows. (0.0 - 1.0) -#inactive-dim-fixed = true; # Do not let dimness adjust based on window opacity. -inactive-opacity-exclude = [ "window_type = 'dock'", "window_type = 'desktop'" ]; blur-background = true; # Blur background of transparent windows. blur-background-exclude = [ "class_g = 'Peek'", "class_g = 'Onboard'", "class_g = 'slop'" ]; blur-background-frame = false; # Blur background of opaque windows with transparent # frames as well. -blur-background-fixed = true; # Do not let blur radius adjust based on window opacity. +blur-background-fixed = false; # Do not let blur radius adjust based on window opacity. # Exclude conditions for background blur. # python compton-convgen.py --dump-compton gaussian 9 -f=sigma=10 blur-kern = "9,9,0.852144,0.882497,0.904837,0.918512,0.923116,0.918512,0.904837,0.882497,0.852144,0.882497,0.913931,0.937067,0.951229,0.955997,0.951229,0.937067,0.913931,0.882497,0.904837,0.937067,0.960789,0.975310,0.980199,0.975310,0.960789,0.937067,0.904837,0.918512,0.951229,0.975310,0.990050,0.995012,0.990050,0.975310,0.951229,0.918512,0.923116,0.955997,0.980199,0.995012,0.995012,0.980199,0.955997,0.923116,0.918512,0.951229,0.975310,0.990050,0.995012,0.990050,0.975310,0.951229,0.918512,0.904837,0.937067,0.960789,0.975310,0.980199,0.975310,0.960789,0.937067,0.904837,0.882497,0.913931,0.937067,0.951229,0.955997,0.951229,0.937067,0.913931,0.882497,0.852144,0.882497,0.904837,0.918512,0.923116,0.918512,0.904837,0.882497,0.852144" @@ -43,7 +40,7 @@ blur-kern = "9,9,0.852144,0.882497,0.904837,0.918512,0.923116,0.918512,0.904837, # Fading fading = true; # Fade windows during opacity changes. # fade-delta = 16; # The time between steps in a fade in milliseconds. (default 10). -fade-in-step = 0.025; # Opacity change between steps while fading in. (default 0.028). +fade-in-step = 0.022; # Opacity change between steps while fading in. (default 0.028). fade-out-step = 0.02; # Opacity change between steps while fading out. (default 0.03). # no-fading-openclose = true; # Avoid fade windows in/out when opening/closing. # fade-exclude = [ ]; # Exclude conditions for fading. @@ -78,7 +75,7 @@ invert-color-include = [ ]; # Conditions for windows to be painted with inverte glx-no-stencil = true; # Recommended. glx-copy-from-front = false; # Useful with --glx-swap-method, # glx-use-copysubbuffermesa = true; # Recommended if it works. Breaks VSync. -# glx-no-rebind-pixmap = true; # Recommended if it works. +glx-no-rebind-pixmap = true; # Recommended if it works. glx-swap-method = "undefined"; # See man page. # Window type settings From 24cf4ac4948f10f2295709cf24ff72b1cfb1e2f0 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Mon, 23 Apr 2018 01:10:05 +0100 Subject: [PATCH 13/13] vim: migrate from Vundle to vim-plug --- .config/vim/.gitignore | 9 ++++--- .config/vim/vimrc | 59 +++++++++++++++++++++--------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.config/vim/.gitignore b/.config/vim/.gitignore index 3bd6b88..b513f65 100644 --- a/.config/vim/.gitignore +++ b/.config/vim/.gitignore @@ -1,7 +1,8 @@ -/bundle/ +/.netrwhist +/autoload/plug.vim +/plug/ /spell/ /swapfiles/ -/viminfo -/viminf*.tmp /vim-latex -/.netrwhist +/viminf*.tmp +/viminfo diff --git a/.config/vim/vimrc b/.config/vim/vimrc index e4dc42a..191315c 100644 --- a/.config/vim/vimrc +++ b/.config/vim/vimrc @@ -9,9 +9,6 @@ set runtimepath+=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after silent !mkdir -p $XDG_CACHE_HOME/vim/swap $XDG_CACHE_HOME/vim/undo $XDG_CACHE_HOME/vim/backup -syntax enable -filetype plugin on - set tabstop=4 set shiftwidth=0 " Use tabstop set softtabstop=-1 " Use tabstop @@ -80,35 +77,37 @@ set cul cuc highlight CursorLine cterm=NONE ctermbg=8 highlight CursorColumn cterm=NONE ctermbg=8 -" set the runtime path to include Vundle and initialize -set rtp+=~/.config/vim/bundle/Vundle.vim -call vundle#begin() -call vundle#rc('~/.config/vim/bundle') +if empty(glob('$XDG_CONFIG_HOME/vim/autoload/plug.vim')) + silent !curl -fsSLo $XDG_CONFIG_HOME/vim/autoload/plug.vim --create-dirs + \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + autocmd VimEnter * PlugInstall --sync | source $VIMRC +endif -Plugin 'VundleVim/Vundle.vim' -Plugin 'Valloric/YouCompleteMe' -Plugin 'scrooloose/syntastic' -Plugin 'scrooloose/nerdtree' -Plugin 'tpope/vim-sensible' -Plugin 'tpope/vim-fugitive' -Plugin 'tpope/vim-rhubarb' -Plugin 'tpope/vim-abolish' -Plugin 'tpope/vim-surround' -Plugin 'tpope/vim-repeat' -Plugin 'tpope/vim-commentary' -Plugin 'majutsushi/tagbar' -Plugin 'airblade/vim-gitgutter' -Plugin 'ryanoasis/vim-devicons' -Plugin 'vim-airline/vim-airline' -Plugin 'vim-airline/vim-airline-themes' -Plugin 'chr4/nginx.vim' -Plugin 'PotatoesMaster/i3-vim-syntax' -Plugin 'lervag/vimtex' -Plugin 'JamshedVesuna/vim-markdown-preview' -Plugin 'junegunn/fzf.vim' -Plugin 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } +call plug#begin('$XDG_CONFIG_HOME/vim/plug') -call vundle#end() +Plug 'Valloric/YouCompleteMe' +Plug 'scrooloose/syntastic' +Plug 'scrooloose/nerdtree', { 'on': 'NERTreeToggle' } +Plug 'tpope/vim-sensible' +Plug 'tpope/vim-fugitive' +Plug 'tpope/vim-rhubarb' +Plug 'tpope/vim-abolish' +Plug 'tpope/vim-surround' +Plug 'tpope/vim-repeat' +Plug 'tpope/vim-commentary' +Plug 'majutsushi/tagbar' +Plug 'airblade/vim-gitgutter' +Plug 'ryanoasis/vim-devicons' +Plug 'vim-airline/vim-airline' +Plug 'vim-airline/vim-airline-themes' +Plug 'chr4/nginx.vim' +Plug 'PotatoesMaster/i3-vim-syntax' +Plug 'lervag/vimtex' +Plug 'JamshedVesuna/vim-markdown-preview' +Plug 'junegunn/fzf.vim' +Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' } + +call plug#end() " Change to dvorak-mapped keys let g:use_dvorak = 1