diff options
37 files changed, 301 insertions, 202 deletions
diff --git a/bin/bin/dot b/bin/bin/dot deleted file mode 100755 index acb0e64..0000000 --- a/bin/bin/dot +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -get_links() -{ - find $HOME -not -path "$HOME/dotfiles/*" -type l | while read line; do - if [[ "$(realpath -q $line)" == "${HOME}/dotfiles/"* ]]; then - echo $line - fi - done -} - -clean() -{ - get_links | while read link; do - rm -v ${link} - done -} - -down() -{ - source $HOME/dotfiles/.dotmap - for link in "${!dotmap[@]}"; do - echo "Removing ${link}." - rm -rf $link - done -} - -up() -{ - source $HOME/dotfiles/.dotmap - for link in "${!dotmap[@]}"; do - target=${dotmap[$link]} - mkdir -p $(dirname ${link}) - echo "Linking $target." - rm -rf $link && ln -s $target $link - done -} - -save() -{ - echo "declare -A dotmap" > .dotmap - get_links | while read link; do - echo "dotmap[$link]=$(readlink -f -q $link)" | sed "s#$HOME#"'$HOME#g' >> .dotmap - done - sort .dotmap -o .dotmap -} - -$1 diff --git a/bin/bin/dyndns b/bin/bin/dyndns deleted file mode 100755 index 8d1f553..0000000 --- a/bin/bin/dyndns +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -PASSWORD=$(pass show email/urbain@vaes.uk) - -curl -4 -X PUT --user "urbain@vaes.uk:$PASSWORD" https://box.bknguyen.org/admin/dns/custom/urbainvaes.com diff --git a/bin/bin/i3-shell b/bin/bin/i3-shell deleted file mode 100755 index 120e4b4..0000000 --- a/bin/bin/i3-shell +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# i3 thread: https://faq.i3wm.org/question/150/how-to-launch-a-terminal-from-here/?answer=152#post-id-152 - -CMD=urxvt -CWD='' - -# Get window ID -ID=$(xdpyinfo | grep focus | cut -f4 -d " ") - -# Get PID of process whose window this is -PID=$(xprop -id $ID | grep -m 1 PID | cut -d " " -f 3) - -# Get last child process (shell, vim, etc) -if [ -n "$PID" ]; then - TREE=$(pstree -lpA $PID | tail -n 1) - PID=$(echo $TREE | awk -F'---' '{print $NF}' | sed -re 's/[^0-9]//g') - - # If we find the working directory, run the command in that directory - if [ -e "/proc/$PID/cwd" ]; then - CWD=$(readlink /proc/$PID/cwd) - fi -fi -if [ -n "$CWD" ]; then - cd $CWD && $CMD -else - $CMD -fi diff --git a/bin/bin/keyboard b/bin/bin/keyboard index d00035b..45d9972 100755 --- a/bin/bin/keyboard +++ b/bin/bin/keyboard @@ -30,6 +30,9 @@ xmodmap -e "keysym g = g G 7" xmodmap -e "keysym c = c C 8" xmodmap -e "keysym r = r R 9" +# Special characters +xmodmap -e "keysym XF86Eject = Insert" + # Xcape settings killall -9 xcape diff --git a/bin/bin/references b/bin/bin/references new file mode 100755 index 0000000..a578728 --- /dev/null +++ b/bin/bin/references @@ -0,0 +1,5 @@ +#!/bin/bash +REF_DIR="$HOME/phd/references" +PDF=$(locate "$REF_DIR/**/*.pdf") +TARGET=$(echo "${PDF//"$REF_DIR/"/}" | dmenu -i -p "Open File:") +[[ -n $TARGET ]] && zathura "$REF_DIR/$TARGET" & diff --git a/bin/bin/rename_workspace b/bin/bin/rename_workspace deleted file mode 100755 index 61fffd3..0000000 --- a/bin/bin/rename_workspace +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -workspace=$(i3-msg -t get_workspaces | grep -Po '{[^}]*"focused":true[^}]*}' | sed 's/.*"name":"\([^"]*\)".*$/\1/g') -number=$(i3-msg -t get_workspaces | grep -Po '{[^}]*"focused":true[^}]*}' | sed 's/{"num":\([^,]*\),.*$/\1/g') - -new_name=$(zenity --entry --title="Rename workspace" --entry-text "$workspace") -if [[ "$new_name" != *:* ]]; then - new_name="$number:$new_name" -fi - -echo $new_name -exec i3-msg rename workspace to "$new_name" diff --git a/bin/bin/swap b/bin/bin/swap deleted file mode 100755 index 4c17dc7..0000000 --- a/bin/bin/swap +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/python - -import i3 -outputs = i3.get_outputs() -print(outputs[0]) - -# set current workspace to output 0 -i3.workspace(outputs[0]['current_workspace']) - -# ..and move it to the other output. -# outputs wrap, so the right of the right is left ;) -i3.command('move', 'workspace to output right') - -# rinse and repeat -i3.workspace(outputs[1]['current_workspace']) -i3.command('move', 'workspace to output right') diff --git a/bin/bin/vimin b/bin/bin/vimin index 905b30f..b00d8fa 100755 --- a/bin/bin/vimin +++ b/bin/bin/vimin @@ -1,4 +1,4 @@ #!/usr/bin/env bash tempfile=$(mktemp) -urxvt -e vim ${tempfile} +urxvt -e nvim ${tempfile} +star cat ${tempfile} | xclip -i diff --git a/bin/bin/workspace b/bin/bin/workspace index a9e4aa0..e380f98 100755 --- a/bin/bin/workspace +++ b/bin/bin/workspace @@ -11,7 +11,7 @@ workspaces=$(i3-msg -t get_workspaces | grep -Po '"name":.*?[^\\]"' | sed 's/"na workspaces=$(echo $workspaces | sed '/:/!d') # Get desired workspace -target=$(echo $workspaces | dmenu -b -i -sf green -p "Go to workspace:") +target=$(echo $workspaces | dmenu "Go to workspace:") # Exit if empty [[ -z $target ]] && exit diff --git a/conky/.config/conky/conky.conf b/conky/.config/conky/conky.conf new file mode 100644 index 0000000..5499b07 --- /dev/null +++ b/conky/.config/conky/conky.conf @@ -0,0 +1,82 @@ +-- vim: ts=4 sw=4 noet ai cindent syntax=lua +--[[ +Conky, a system monitor, based on torsmo + +Any original torsmo code is licensed under the BSD license + +All code written since the fork of torsmo is licensed under the GPL + +Please see COPYING for details + +Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen +Copyright (c) 2005-2012 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) +All rights reserved. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +]] + +conky.config = { + alignment = 'top_right', + background = true, + border_width = 1, + cpu_avg_samples = 2, + default_color = 'white', + default_outline_color = 'white', + default_shade_color = 'white', + double_buffer = true, + draw_borders = false, + draw_graph_borders = true, + draw_outline = false, + draw_shades = false, + use_xft = true, + font = 'DejaVu Sans Mono:size=12', + gap_x = 10, + gap_y = 10, + minimum_height = 5, + minimum_width = 5, + net_avg_samples = 2, + no_buffers = true, + out_to_console = false, + out_to_stderr = false, + extra_newline = false, + own_window = false, + stippled_borders = 0, + update_interval = 1.0, + uppercase = false, + use_spacer = 'none', + show_graph_scale = false, + show_graph_range = false +} + +conky.text = [[ +$hr +${color grey}Uptime:$color $uptime +${color grey}Frequency (in MHz):$color $freq +${color grey}Frequency (in GHz):$color $freq_g +${color grey}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4} +${color grey}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4} +${color grey}CPU Usage:$color $cpu% ${cpubar 4} +${color grey}Processes:$color $processes ${color grey}Running:$color $running_processes +$hr +${color grey}File systems: + / $color${fs_used /}/${fs_size /} ${fs_bar 6 /} + /home $color${fs_used /home}/${fs_size /home} ${fs_bar 6 /home} +${color grey}Networking: +Up:$color ${upspeed eth0} ${color grey} - Down:$color ${downspeed eth0} +$hr +${color grey}Name PID CPU% MEM% +${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1} +${color lightgrey} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2} +${color lightgrey} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3} +${color lightgrey} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4} +]] diff --git a/crontab/crontab b/crontab/crontab new file mode 100644 index 0000000..edb4b22 --- /dev/null +++ b/crontab/crontab @@ -0,0 +1,4 @@ +*/5 * * * * /usr/bin/r2e run +*/5 * * * * /home/urbain/bin/email >> /home/urbain/.cron_email_log +*/5 * * * * /usr/bin/vdirsyncer sync >> /home/urbain/.cron_calendar_log +0 * * * * cd /home/urbain/ && /usr/bin/mr update && /usr/bin/mr push diff --git a/i3/.config/i3/config b/i3/.config/i3/config index ffed0bd..b6e54d1 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -147,7 +147,10 @@ bindsym $mod+r mode "resize" # finds out, if available) bar { status_command $HOME/bin/mystatus + mode hide + modifier none } +bindsym $mod+m bar mode toggle # Workspaces bindsym $mod+Tab workspace back_and_forth @@ -157,7 +160,7 @@ bindsym $mod+period workspace next # Programs shortcuts bindsym $mod+b exec --no-startup-id qutebrowser bindsym $mod+i exec $HOME/bin/vimin - +bindsym Print exec xfce4-screenshooter # Pulse Audio controls bindsym XF86AudioRaiseVolume exec amixer -D pulse sset Master 5%+ bindsym XF86AudioLowerVolume exec amixer -D pulse sset Master 5%- @@ -177,6 +180,7 @@ bindsym $mod+Shift+n exec $HOME/bin/workspace m bindsym $mod+semicolon exec --no-startup-id $HOME/bin/run bindsym $mod+z exec --no-startup-id $HOME/bin/tmux_attach bindsym $mod+e exec --no-startup-id $HOME/bin/rename_workspace -bindsym $mod+m exec --no-startup-id $HOME/bin/i3-shell +bindsym $mod+o exec rofi -show window +# bindsym $mod+m exec --no-startup-id $HOME/bin/i3-shell for_window [class="^.*"] border pixel 2 diff --git a/info/.infokey b/info/.infokey new file mode 100644 index 0000000..0680692 --- /dev/null +++ b/info/.infokey @@ -0,0 +1,23 @@ +#info +j next-line +k prev-line +l forward-char +h backward-char +g beginning-of-node +G end-of-node +u up-node +t top-node +d dir-node +n search-next +N search-previous +m menu-item +} next-node +{ prev-node +/ search +^f scroll-forward +^b scroll-backward +^c abort-key +^o history-node + +#echo-area +^w echo-area-backward-kill-word diff --git a/khal/.config/khal/config b/khal/.config/khal/config new file mode 100644 index 0000000..2cfb434 --- /dev/null +++ b/khal/.config/khal/config @@ -0,0 +1,15 @@ +[calendars] + + [[home]] + path = ~/.calendars/home/ + color = dark green + + [[work]] + path = ~/.calendars/work/ + color = dark blue + +[default] + default_calendar = home + print_new = event + timedelta = 7d + highlight_event_days = True diff --git a/mr/.mrconfig b/mr/.mrconfig index a007de9..73b38d3 100644 --- a/mr/.mrconfig +++ b/mr/.mrconfig @@ -1,19 +1,24 @@ [$HOME/dotfiles] -checkout = git clone 'git@urbainvaes.com:dotfiles.git' 'dotfiles' +checkout = git clone 'gitolite@urbainvaes.com:dotfiles.git' dotfiles update = git pull origin master push = git push origin master [$HOME/gitolite] -checkout = git clone 'git@urbainvaes.com:gitolite-admin.git' 'gitolite' +checkout = git clone 'gitolite@urbainvaes.com:gitolite-admin.git' gitolite update = git pull origin master push = git push origin master [$HOME/personal] -checkout = git clone 'git@urbainvaes.com:private/personal.git' 'personal' +checkout = git clone 'gitolite@urbainvaes.com:private/personal.git' personal update = git pull origin master push = git push origin master [$HOME/.password-store] -checkout = git clone 'git@urbainvaes.com:private/passwords.git' '.password-store' +checkout = git clone 'gitolite@urbainvaes.com:private/passwords.git' .password-store +update = git pull origin master +push = git push origin master + +[$HOME/phd] +checkout = git clone 'gitolite@urbainvaes.com:phd/base.git' phd update = git pull origin master push = git push origin master diff --git a/mr/.mrtrust b/mr/.mrtrust index aa0f340..5f0dbe2 100644 --- a/mr/.mrtrust +++ b/mr/.mrtrust @@ -1 +1 @@ -~/Dropbox/phd/.mrconfig +~/phd/.mrconfig diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc index 74c26e3..20bb17a 100644 --- a/mutt/.mutt/muttrc +++ b/mutt/.mutt/muttrc @@ -24,6 +24,7 @@ set fcc_clear unset markers set sleep_time = 0 set wait_key = no +my_hdr Jabber-ID: urbain@vaes.uk # Encryption set crypt_autosign = no @@ -35,12 +36,13 @@ set pgp_use_gpg_agent = yes set pgp_timeout = 3600 # Sidebar -set sidebar_width=26 set sidebar_visible = yes -set sidebar_delim='|' -set sidebar_shortpath = yes -set sidebar_folderindent = yes +set sidebar_width=25 +set sidebar_short_path = yes +set sidebar_folder_indent = yes +set sidebar_indent_string = " " set sidebar_format = "%B%* %?F?[%F]?%?N?(%N)?%4S" +set mail_check_stats bind index,pager \Cn sidebar-next bind index,pager \Cp sidebar-prev bind index,pager O sidebar-open diff --git a/ncmpcpp/bindings b/ncmpcpp/bindings new file mode 100644 index 0000000..7758f51 --- /dev/null +++ b/ncmpcpp/bindings @@ -0,0 +1,35 @@ +def_key "?" + show_help + +def_key "t" + find +def_key "t" + find_item_forward + +def_key "j" + scroll_down +def_key "k" + scroll_up + +def_key "ctrl-b" + page_up +def_key "ctrl-f" + page_down + +def_key "h" + previous_column +def_key "l" + next_column + +def_key "." + show_lyrics + +def_key "n" + next_found_item +def_key "N" + previous_found_item + +def_key "J" + move_sort_order_down +def_key "K" + move_sort_order_up diff --git a/newsbeuter/.config/newsbeuter/cache.db b/newsbeuter/.config/newsbeuter/cache.db Binary files differdeleted file mode 100644 index a92771b..0000000 --- a/newsbeuter/.config/newsbeuter/cache.db +++ /dev/null diff --git a/newsbeuter/.config/newsbeuter/config b/newsbeuter/.config/newsbeuter/config deleted file mode 100644 index 84a1546..0000000 --- a/newsbeuter/.config/newsbeuter/config +++ /dev/null @@ -1,25 +0,0 @@ -# Dark solarized color scheme for newsbeuter, based on -# Ethan Schoonover's Solarized. -# -# In order to use this color scheme, you must first configure -# your terminal emulator to use the Solarized palette. -# See <http://ethanschoonover.com/solarized/> for more information. - -color background default default -color listnormal default default -color listfocus black yellow -color info default black -color article default default - -# highlights -highlight article "^(Title):.*$" blue default -highlight article "https?://[^ ]+" red default -highlight article "\\[image\\ [0-9]+\\]" green default - -# vim-like navigation -bind-key j down -bind-key k up -bind-key h left -bind-key l right - -browser "qutebrowser %u" diff --git a/newsbeuter/.config/newsbeuter/history.cmdline b/newsbeuter/.config/newsbeuter/history.cmdline deleted file mode 100644 index aed4974..0000000 --- a/newsbeuter/.config/newsbeuter/history.cmdline +++ /dev/null @@ -1,3 +0,0 @@ -q -q -q diff --git a/newsbeuter/.config/newsbeuter/history.search b/newsbeuter/.config/newsbeuter/history.search deleted file mode 100644 index e69de29..0000000 --- a/newsbeuter/.config/newsbeuter/history.search +++ /dev/null diff --git a/newsbeuter/.config/newsbeuter/urls b/newsbeuter/.config/newsbeuter/urls deleted file mode 120000 index 777955c..0000000 --- a/newsbeuter/.config/newsbeuter/urls +++ /dev/null @@ -1 +0,0 @@ -../../../../personal/newsbeuter/urls
\ No newline at end of file diff --git a/qutebrowser/.config/qutebrowser/keys.conf b/qutebrowser/.config/qutebrowser/keys.conf index e441f4e..d8f070c 100644 --- a/qutebrowser/.config/qutebrowser/keys.conf +++ b/qutebrowser/.config/qutebrowser/keys.conf @@ -168,13 +168,13 @@ hint images tab hint images tab-bg .i -hint links fill ":open {hint-url}" +hint links fill :open {hint-url} ;o -hint links fill ":open -t {hint-url}" +hint links fill :open -t {hint-url} ;O -hint links fill ":open -b {hint-url}" +hint links fill :open -b {hint-url} .o hint links yank @@ -434,6 +434,12 @@ yank -p yank -ps yP +hint inputs + ;t + +repeat-command + . + [insert] # Keybindings for insert mode. # Since normal keypresses are passed through, only special keys are @@ -529,6 +535,9 @@ prompt-yes prompt-no n +prompt-open-download + <ctrl-x> + [command,prompt] rl-backward-char diff --git a/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf b/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf index b2a0669..b429b24 100644 --- a/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf +++ b/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf @@ -1,8 +1,8 @@ [FileDialog] -history=file:///home/urbain/Dropbox/toprint -lastVisited=file:///home/urbain/Dropbox/toprint -qtVersion=5.6.0 +history=file:///home/urbain/Dropbox/toprint, file:///home/urbain/Pictures/family +lastVisited=file:///home/urbain/Pictures/family +qtVersion=5.7.0 shortcuts=file:, file:///home/urbain sidebarWidth=90 -treeViewHeader=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1\xec\0\0\0\x4\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x4\0\0\0\xff\0\0\0\x1\0\0\0\0\0\0\0?\0\0\0\x1\0\0\0\0\0\0\0@\0\0\0\x1\0\0\0\0\0\0\0n\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0) +treeViewHeader=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1\xec\0\0\0\x4\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x4\0\0\0\xff\0\0\0\x1\0\0\0\0\0\0\0?\0\0\0\x1\0\0\0\0\0\0\0@\0\0\0\x1\0\0\0\0\0\0\0n\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\xff\xff\xff\xff) viewMode=Detail diff --git a/qutebrowser/.config/qutebrowser/qutebrowser.conf b/qutebrowser/.config/qutebrowser/qutebrowser.conf index f635c74..9944be4 100644 --- a/qutebrowser/.config/qutebrowser/qutebrowser.conf +++ b/qutebrowser/.config/qutebrowser/qutebrowser.conf @@ -34,11 +34,6 @@ # smart: Search case-sensitively if there are capital chars # Default: smart # -# wrap-search (Bool): -# Whether to wrap finding text to the top when arriving at the end. -# Valid values: true, false -# Default: true -# # startpage (List): # The default page(s) to open at the start, separated by commas. # Default: https://duckduckgo.com @@ -153,7 +148,6 @@ # Valid values: host, path, query, anchor # Default: path,query ignore-case = smart -wrap-search = true startpage = about:blank default-page = https://startpage.com auto-search = naive @@ -190,6 +184,11 @@ url-incdec-segments = path,query # Valid values: top, bottom # Default: top # +# status-position (VerticalPosition): +# The position of the status bar. +# Valid values: top, bottom +# Default: bottom +# # message-timeout (Int): # Time (in ms) to show messages in the statusbar for. # Default: 2000 @@ -208,11 +207,6 @@ url-incdec-segments = path,query # never: Never show a confirmation. # Default: never # -# display-statusbar-messages (Bool): -# Whether to display javascript statusbar messages. -# Valid values: true, false -# Default: false -# # zoom-text-only (Bool): # Whether the zoom factor on a frame applies only to the text or to # all content. @@ -264,6 +258,7 @@ url-incdec-segments = path,query # otherwise. # * `{id}`: The internal window ID of this window. # * `{scroll_pos}`: The page scroll position. +# * `{host}`: The host of the current web page. # Default: {perc}{title}{title_sep}qutebrowser # # hide-mouse-cursor (Bool): @@ -289,10 +284,10 @@ url-incdec-segments = path,query zoom-levels = 25%,33%,50%,67%,75%,90%,100%,110%,125%,150%,175%,200%,250%,300%,400%,500% default-zoom = 100% downloads-position = top +status-position = bottom message-timeout = 2000 message-unfocused = false confirm-quit = never -display-statusbar-messages = false zoom-text-only = false frame-flattening = false user-stylesheet = ::-webkit-scrollbar { width: 0px; height: 0px; } @@ -619,6 +614,7 @@ mouse-zoom-divider = 512 # * `{index}`: The index of this tab. # * `{id}`: The internal tab ID of this tab. # * `{scroll_pos}`: The page scroll position. +# * `{host}`: The host of the current web page. # Default: {index}: {title} # # title-alignment (TextAlignment): @@ -993,7 +989,7 @@ DEFAULT = https://duckduckgo.com/?q={} # Colors used in the UI. # A value can be in one of the following format: # * `#RGB`/`#RRGGBB`/`#RRRGGGBBB`/`#RRRRGGGGBBBB` -# * A SVG color name as specified in http://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification]. +# * An SVG color name as specified in http://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification]. # * transparent (no color) # * `rgb(r, g, b)` / `rgba(r, g, b, a)` (values 0-255 or percentages) # * `hsv(h, s, v)` / `hsva(h, s, v, a)` (values 0-255, hue 0-359) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 437f8e3..a1b28cb 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -18,8 +18,5 @@ bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D" bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U" bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R" -bind C-n next-window -bind C-p previous-window - -bind-key -n C-S-Left swap-window -t -1 -bind-key -n C-S-Right swap-window -t +1 +bind-key H swap-window -t -1 +bind-key L swap-window -t +1 diff --git a/vdirsyncer/.config/vdirsyncer/.gitignore b/vdirsyncer/.config/vdirsyncer/.gitignore new file mode 100644 index 0000000..8be5547 --- /dev/null +++ b/vdirsyncer/.config/vdirsyncer/.gitignore @@ -0,0 +1 @@ +status diff --git a/vdirsyncer/.config/vdirsyncer/config b/vdirsyncer/.config/vdirsyncer/config new file mode 100644 index 0000000..0b2b070 --- /dev/null +++ b/vdirsyncer/.config/vdirsyncer/config @@ -0,0 +1,20 @@ +[general] +status_path = ~/.config/vdirsyncer/status/ + +# CALDAV +[pair calendar] +a = calendar_local +b = calendar_remote +collections = ["from b"] +conflict_resolution = b wins + +[storage calendar_local] +type = filesystem +path = ~/.calendars/ +fileext = .ics + +[storage calendar_remote] +type = caldav +url = "https://cal.urbainvaes.com/" +username = urbain +password.fetch = ["command", "pass", "show", "radicale/urbain"] diff --git a/vim/.vim/after/ftplugin/tex/mappings.vim b/vim/.vim/after/ftplugin/tex/mappings.vim index 939af68..9da769b 100644 --- a/vim/.vim/after/ftplugin/tex/mappings.vim +++ b/vim/.vim/after/ftplugin/tex/mappings.vim @@ -36,9 +36,10 @@ iabbrev <buffer> gD \Delta iabbrev <buffer> gT \Theta iabbrev <buffer> gL \Lambda iabbrev <buffer> gX \Xi -iabbrev <buffer> gF \Phi iabbrev <buffer> gP \Pi +iabbrev <buffer> gS \Sigma iabbrev <buffer> gW \Omega +iabbrev <buffer> gF \Phi nnoremap <buffer> <LocalLeader>i :VimtexCompile<CR> nnoremap <buffer> <LocalLeader>e :VimtexErrors<CR> diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add new file mode 100644 index 0000000..87ee2ba --- /dev/null +++ b/vim/.vim/spell/en.utf-8.add @@ -0,0 +1,6 @@ +diagonality +laplacian +Maruyama +multiscale +SPDE +advective diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl Binary files differnew file mode 100644 index 0000000..b52c8a6 --- /dev/null +++ b/vim/.vim/spell/en.utf-8.add.spl @@ -13,6 +13,7 @@ Plug 'altercation/vim-colors-solarized' Plug 'beloglazov/vim-online-thesaurus' Plug 'christoomey/vim-tmux-navigator' Plug 'critiqjo/lldb.nvim' +Plug 'embear/vim-localvimrc' Plug 'holomorph/vim-freefem' Plug 'honza/vim-snippets' Plug 'jamessan/vim-gnupg' @@ -22,20 +23,21 @@ Plug 'junegunn/goyo.vim' Plug 'junegunn/gv.vim' Plug 'junegunn/seoul256.vim' Plug 'junegunn/vim-easy-align' -Plug 'junegunn/vim-oblique' Plug 'junegunn/vim-peekaboo' -Plug 'junegunn/vim-pseudocl' Plug 'justinmk/vim-dirvish' Plug 'justinmk/vim-sneak' Plug 'klen/python-mode' Plug 'lervag/vimtex' Plug 'LnL7/vim-nix' Plug 'majutsushi/tagbar' -Plug 'mileszs/ack.vim' +Plug 'mhinz/vim-startify' +Plug 'mhinz/vim-grepper' Plug 'nanotech/jellybeans.vim' +Plug 'pgdouyon/vim-evanesco' Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' , 'on' : 'YcmGenerateConfig' } Plug 'scrooloose/nerdtree' Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' } +Plug 'terryma/vim-expand-region' Plug 'terryma/vim-multiple-cursors' Plug 'tomasr/molokai' Plug 'tommcdo/vim-exchange' @@ -55,6 +57,7 @@ Plug 'troydm/zoomwintab.vim' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' Plug 'vim-scripts/gmsh.vim' +Plug 'vim-scripts/SpellCheck' if has("nvim") Plug 'Shougo/deoplete.nvim' @@ -64,7 +67,6 @@ if has("nvim") else Plug 'Shougo/neocomplete.vim' Plug 'scrooloose/syntastic' - " Plug 'Valloric/YouCompleteMe', { 'do' : 'python2 install.py --clang-completer' } endif call plug#end() @@ -79,12 +81,17 @@ nnoremap cpt :TagbarToggle<cr> nnoremap cpu :GundoToggle<cr> " Fuzzy finder +nnoremap <c-p>a :Ag nnoremap <c-p>b :Buffers<cr> +nnoremap <c-p>c :Commands<cr> nnoremap <c-p>f :Files<cr> -nnoremap <c-p>r :History<cr> nnoremap <c-p>g :GitFiles<cr> -nnoremap <c-p>c :Colors<cr> -nnoremap <c-p>h :History:<cr> +nnoremap <c-p>hf :History<cr> +nnoremap <c-p>h: :History:<cr> +nnoremap <c-p>h/ :History/<cr> +nnoremap <c-p>l :BLines<cr> +nnoremap <c-p>m :Marks<cr> +nnoremap <c-p>t :Tags<cr> imap <c-x><c-l> <plug>(fzf-complete-line) imap <c-x><c-f> <plug>(fzf-complete-file) @@ -101,6 +108,7 @@ vnoremap <c-d>p :<C-U>LL print <C-R>=lldb#util#get_selection()<CR><CR> " Fugitive nnoremap <Leader>gs :Gstatus<cr> +nnoremap <Leader>gc :Gcommit<cr> nnoremap <Leader>gr :Gread<cr> nnoremap <Leader>gd :Gdiff<cr> @@ -159,6 +167,13 @@ let g:deoplete#omni_patterns.tex = g:neocomplete#sources#omni#input_patterns.tex " FZF.vim let g:fzf_buffers_jump = 1 +" Gundo +let g:gundo_prefer_python3 = 1 + +" Idealvimrc +let g:localvimrc_sandbox = 0 +let g:localvimrc_whitelist='/home/*' + " NerdTree let g:NERDTreeHijackNetrw = 0 @@ -219,7 +234,6 @@ let g:netrw_bufsettings='relativenumber' let g:tex_conceal= 'adgm' let g:tex_flavor='latex' - "" Vim options set smartindent set expandtab @@ -227,7 +241,6 @@ set tabstop=4 set softtabstop=4 set shiftwidth=4 set showcmd -" set nofoldenable set foldmethod=marker set noswapfile set nowritebackup @@ -253,16 +266,25 @@ endif "" Mappings -nnoremap <Leader>w :w!<cr> +nnoremap <Leader>w :update<cr> nnoremap <Leader>q :q!<cr> nnoremap <Leader>d :bd!<cr> -nnoremap <Leader>n :tabnew<cr> + +nnoremap <Leader>tn :tabnew<cr> +nnoremap <Leader>te :tabedit +nnoremap <Leader>th :-tabmove<cr> +nnoremap <Leader>tl :+tabmove<cr> +nnoremap <Leader>tm :tabmove +nnoremap <Leader>t0 :tabmove 0<cr> +nnoremap <Leader>t$ :tabmove<cr> nnoremap cqo :copen<cr> nnoremap cqc :cclose<cr> nnoremap got :call system('urxvt -cd '.getcwd().' &')<cr> nnoremap goT :call system('urxvt -cd '.expand("%:p:h").' &')<cr> +nnoremap gof :call system('urxvt -e vifm '.getcwd().' '.getcwd().' &')<cr> +nnoremap goF :call system('urxvt -e vifm '.expand("%:p:h").' '.expand("%:p:h").' &')<cr> nnoremap <LocalLeader>h :e %:p:s,.hpp$,.X123X,:s,.cpp$,.hpp,:s,.X123X$,.cpp,<CR> nnoremap Y y$ @@ -270,6 +292,11 @@ nnoremap + za nnoremap <BS> <C-W>h nnoremap <Leader>fw :%s/\s\+$//<cr> +cnoremap <c-p> <up> +cnoremap <c-n> <down> +cnoremap <up> <c-p> +cnoremap <down> <c-n> + "" Colorscheme let g:seoul256_background =235 silent! colo $COLORSCHEME @@ -285,7 +312,10 @@ augroup vimrc au BufNewFile,Bufread /tmp/mutt-* setlocal tw=72 au BufNewFile,BufRead *.geo setf gmsh au BufNewFile,BufRead *.pde setf freefem - au FileType gmsh set makeprg=gmsh\ % + au BufNewFile,BufRead *.plt setf gnuplot + au FileType gmsh setlocal makeprg=gmsh\ % + au FileType gnuplot setlocal makeprg=gnuplot\ % + au FileType gnuplot setlocal commentstring=#%s au FileType freefem comp freefem - au FileType dirvish set relativenumber + au FileType dirvish setlocal relativenumber augroup END diff --git a/xinit/.xinitrc b/xinit/.xinitrc index abaadb4..5ae3595 100755 --- a/xinit/.xinitrc +++ b/xinit/.xinitrc @@ -7,7 +7,8 @@ xset r rate 400 50 $HOME/bin/keyboard # Load Xresources to light colorscheme -xrdb $HOME/.Xresources/solarized.light +source $HOME/.local/share/zsh/colors.zsh +xrdb $HOME/.Xresources/$XRESOURCE # Background feh --bg-fill --randomize /usr/share/backgrounds @@ -27,5 +28,6 @@ eval $(ssh-agent) nm-applet & dropbox & dunst & +conky exec i3 diff --git a/zsh/.zsh/alias b/zsh/.zsh/alias index 7d0dc7d..8477d7d 100644 --- a/zsh/.zsh/alias +++ b/zsh/.zsh/alias @@ -5,13 +5,9 @@ alias c='clear' alias ca='printf "\ec"' alias cdd='cd ~/dotfiles' -# Shortcut to files -alias notes='vim ~/dotfiles/.notes' - # Programs alias a='vifm . .' alias ff='FreeFem++' -alias g='git' alias m='cd ~/.mutt/attachments && mutt && cd -' alias e='nvim' alias n='nvim' @@ -19,13 +15,14 @@ alias ns='nvim -S Session.vim' alias v='vim' alias vs="vim -S Session.vim" -# Build +# Git +alias g='git' +alias rd='cd $(git rev-parse --show-toplevel)' + +# GNU Make +alias mi='make install' alias mc='make clean' alias mca='make clean-all' -# Tmux -alias son="tmux set -g status on" -alias soff="tmux set -g status off" - # Unablias ag from ubuntu plugin unalias ag diff --git a/zsh/.zsh/plugins b/zsh/.zsh/plugins index 3506d70..3cbc6fd 100644 --- a/zsh/.zsh/plugins +++ b/zsh/.zsh/plugins @@ -20,7 +20,6 @@ if ! zgen saved; then zgen oh-my-zsh plugins/themes # Appearance - # zgen oh-my-zsh themes/eastwood zgen load mafredri/zsh-async zgen load sindresorhus/pure @@ -49,4 +48,4 @@ fi } # Z -export _Z_EXCLUDE_DIRS=("$HOME/sshfs", "$HOME/nfs") +_Z_DADA=("$HOME/.local/share/z") @@ -1,4 +1,4 @@ -export PATH="${PATH}:$HOME/bin" +export PATH="${PATH}:$HOME/bin:/usr/lib/surfraw" export EDITOR=/usr/bin/nvim # Source configuration files |