Remove problematic PATH export in .bashrc

.bashrc

@@ -57,10 +57,7 @@ if [ -n "$force_color_prompt" ]; then
 fi
 
 if [ "$color_prompt" = yes ]; then
-    #PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\[\033[01;34m\]\W §\[\033[00m\] '
-    PS4='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\[\033[01;34m\]\W §\[\033[00m\] '
-	# PROMPT_DIRTRIM=3
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
 else
     PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
 fi
@@ -114,19 +111,18 @@ if ! shopt -oq posix; then
     . /etc/bash_completion
   fi
 fi
-#Special Settings
-set -o vi
 
-#Directory changes
-alias cdn='vim ~/Notes/text "+cd ~/Notes/text" "+enew" "+CtrlP"'
+# Directory changes
+alias cdn='vim ~/Notes "+cd ~/Notes" "+enew" "+CtrlP"'
 alias cdd='cd $HOME/Downloads/'
 alias cdo='cd $HOME/Source/'
 alias cdc='cd $HOME/.config/'
 alias cd-projects='cd $HOME/Projects/'
 alias cd-x='cd $HOME/Encrypted/x/'
 alias cd-vim='cd /usr/share/vim/vim82/pack/my-plugins/start'
+alias cdz='cd $((mru listdirs | fzf --height=50%) || printf ".")'
 
-#General
+# General
 alias v='vim'
 alias yt='youtube-dl'
 alias ytb='youtube-dl --no-progress'
@@ -137,19 +133,19 @@ alias lynx='lynx -vikeys'
 alias lsa='ls -laF'
 alias doihave='apt list --installed'
 
-#Utilities
+# Utilities
 alias ins='sudo apt-get install'
 alias uns='sudo apt-get purge'
 alias update='sudo apt-get update; sudo apt-get upgrade;'
-alias rn='ranger'
 alias nnn='nnn -xE'
-alias util-dropdown="st -c 'DROPDOWN_TERM' -e 'tmux' &"
-alias do-xbind='xbindkeys -f "$XDG_CONFIG_HOME"/xbindkeys/config'
+alias do-xbind='xbindkeys -f $HOME/Source/configs/xbindkeysrc'
 alias get-rndnum='head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8'
+alias music="ncmpcpp"
 
 
-#Programming
+# Programming
 alias py='ipython3 --TerminalInteractiveShell.editing_mode=vi'
+alias g='git'
 alias gc='git clone'
 
 # Edit config and system files
@@ -169,27 +165,22 @@ alias lo='load-profile'
 alias betterXev="xev | awk -F'[ )]+' '/^KeyPress/ { a[NR+2] } NR in a { printf \"%-3s %s\\n\", $5, $8 }'"
 
 
-#Encryption
+# Encryption
 alias mntx='encfs $HOME/Encrypted/.x/ $HOME/Encrypted/x/'
 alias umntx='encfs -u $HOME/Encrypted/x/'
 
-#Applications
+# Applications
 alias scan='sudo arp-scan 192.168.0.1/24'
 alias weechat='weechat -d "$XDG_CONFIG_HOME"/weechat'
 
-#BASE16_SHELL="$HOME/.config/base16-shell/"
-# [ -n "$PS1" ] && \
-#     [ -s "$BASE16_SHELL/profile_helper.sh" ] && \
-#         eval "$("$BASE16_SHELL/profile_helper.sh")"
-
 
 #Special functions! :D
-search () { 
-	apt search $@ | less
-
 
+search() { 
+	apt search $@ | less
 }
-clean () {
+
+clean() {
 	#Check if there is too many arguments
 	if [ "$#" -gt "1" ] 
 	then
@@ -214,7 +205,7 @@ clean () {
 	echo "Clean complete"
 }
 
-firewall(){
+firewall() {
 	if [ "$#" -gt "1" ] 
 	then
 		echo "Too many arguments. There are $#."
@@ -257,39 +248,10 @@ firewall(){
 		esac
 }
 
-#adb commands for moving files between the desktop and an android.
-apull () {
-	adb shell ls '/storage/self/primary/Download/'$1 | tr -d '\r' | xargs -n1 adb pull
-}
-
-als(){
-	adb shell ls /storage/self/primary/Download/$1
-}
-
-apush() {
-	adb push "$1" /storage/self/primary/Download; 
-}
-
-poly() {
-	# Terminate already running bar instances
-	killall -q polybar
-
-	# Wait until the processes have been shut down
-	while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
-
-	cp -r $XDG_CONFIG_HOME/polybar/bars/polybar-$1/* $XDG_CONFIG_HOME/polybar/
-	cp -r $XDG_CONFIG_HOME/polybar/fonts/* ~/.local/share/fonts
-	fc-cache
-	$XDG_CONFIG_HOME/polybar/launch.sh
-}
-
-vpn() {
-	nmcli connect $1 $2.protonvpn.com.udp
-}
-
 define() {
 	dict $1 | less;
 }
+
 n () {
 	# Block nesting of nnn in subshells
 	if [ -n $NNNLVL  ] && [ "${NNNLVL:-0}" -ge 1  ]; then
@@ -317,14 +279,18 @@ n () {
 	fi
 }
 
-compare() {
-	git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative $1..$2;
+rebind() {
+	sudo cp "$1" /usr/local/bin/
 }
 
-blaunch() {
- BASE16_SHELL="$HOME/.config/base16-shell/"
- [ -n "$PS1" ] && \
-     [ -s "$BASE16_SHELL/profile_helper.sh" ] && \
-         eval "$("$BASE16_SHELL/profile_helper.sh")"
- }
-
+export GOPATH="$HOME/go"
+export GO111MODULE=on
+export EDITOR='vim'
+export PAGER='less'
+export NNN_BMS='h:~/;c:~/.config;n:~/Notes;'
+export NNN_FIFO=/tmp/nnn.fifo
+export NNN_PLUG='p:preview-tui;c:x2sel;i:imgview;s:tmspawn'
+export USE_PISTOL=0
+export XDG_CONFIG_HOME=$HOME/.config
+export XDG_CACHE_HOME=$HOME/.cache
+export XDG_DATA_HOME=$HOME/.local/share

.profile

@@ -12,7 +12,7 @@
 if [ -n "$BASH_VERSION" ]; then
     # include .bashrc if it exists
     if [ -f "$HOME/.bashrc" ]; then
-    . "$HOME/.bashrc"
+	. "$HOME/.bashrc"
     fi
 fi
 
@@ -21,7 +21,12 @@ if [ -d "$HOME/bin" ] ; then
     PATH="$HOME/bin:$PATH"
 fi
 
-export PATH="$HOME/Macros:$HOME/.config/composer/vendor/bin:$HOME/go/bin:/usr/lib/go/bin:$PATH"
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/.local/bin" ] ; then
+    PATH="$HOME/.local/bin:$PATH"
+fi
+
+export PATH="$HOME/.config/composer/vendor/bin:$HOME/go/bin:/usr/lib/go/bin:$PATH"
 export GOPATH="$HOME/go"
 export GO111MODULE=on
 export EDITOR='vim'
@@ -33,5 +38,3 @@ export USE_PISTOL=0
 export XDG_CONFIG_HOME=$HOME/.config
 export XDG_CACHE_HOME=$HOME/.cache
 export XDG_DATA_HOME=$HOME/.local/share
-export BACKUPS_PATH=$HOME/Backups
-export WEECHAT_HOME="$XDG_CONFIG_HOME"/weechat

git/config

@@ -0,0 +1,7 @@
+
+[user]
+	name = Immanuel Onyeka
+	email = immanuel@onyeka.ca
+[content]
+	editor = vim -w
+[core]

git/gitignore_global

@@ -0,0 +1,166 @@
+# Compiled source #
+###################
+*.sw[klmnop]
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Created by https://www.gitignore.io/api/node,linux
+# Edit at https://www.gitignore.io/?templates=node,linux
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# End of https://www.gitignore.io/api/node,linux
+#
+/node_modules
+/public/hot
+/public/storage
+/storage/*.key
+/vendor
+.env
+.env.backup
+.phpunit.result.cache
+Homestead.json
+Homestead.yaml
+npm-debug.log
+yarn-error.log
+*.css
+*.bundle.js
+ses
+/public/images/*
+stuff

git/ignore

@@ -0,0 +1,166 @@
+# Compiled source #
+###################
+*.sw[klmnop]
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Created by https://www.gitignore.io/api/node,linux
+# Edit at https://www.gitignore.io/?templates=node,linux
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# End of https://www.gitignore.io/api/node,linux
+#
+/node_modules
+/public/hot
+/public/storage
+/storage/*.key
+/vendor
+.env
+.env.backup
+.phpunit.result.cache
+Homestead.json
+Homestead.yaml
+npm-debug.log
+yarn-error.log
+*.css
+*.bundle.js
+ses
+/public/images/*
+stuff

mbsyncrc

@@ -0,0 +1,94 @@
+# Immanuel account 
+IMAPAccount mailfence-immanuel
+Host imap.mailfence.com
+User immanuel
+PassCmd  "pass email/mailfence.com | head -n 1"
+Port 993
+# CertificateFile ~/.config/protonmail/bridge/cert.pem
+SSLType IMAPS
+# SSLVersions TLSv1.2
+
+IMAPAccount work-immanuel
+Host imap.gmail.com
+User "immanuel.onyeka@kunin.io"
+PassCmd  "pass work/gmail.com | head -n 1"
+Port 993
+SSLType IMAPS
+# SSLVersions TLSv1.2
+
+# Remote storage
+IMAPStore mailfence-immanuel-remote
+Account mailfence-immanuel
+PathDelimiter /
+
+IMAPStore work-remote
+Account work-immanuel
+PathDelimiter /
+
+
+# Local storage
+MaildirStore mailfence-immanuel-local
+Path ~/mail/personal/
+Inbox ~/mail/personal/INBOX
+
+MaildirStore work-local
+Path ~/mail/work/
+Subfolders Verbatim
+
+Channel mailfence-immanuel-inbox
+Master :mailfence-immanuel-remote:INBOX
+Slave :mailfence-immanuel-local:INBOX
+Create Both
+Expunge Both
+
+Channel work
+Master :work-remote:
+Slave :work-local:
+Patterns *
+Create Both
+Expunge Both
+
+
+Channel mailfence-immanuel-sent
+Master :mailfence-immanuel-remote:Sent
+Slave :mailfence-immanuel-local:sent
+Create Both
+Expunge Both
+
+Channel mailfence-immanuel-trash
+Master :mailfence-immanuel-remote:Trash
+Slave :mailfence-immanuel-local:sent
+Create Both
+Expunge Both
+
+Channel mailfence-immanuel-drafts
+Master :mailfence-immanuel-remote:Drafts
+Slave :mailfence-immanuel-local:drafts
+Create Both
+Expunge Both
+
+Channel mailfence-immanuel-spam
+Master :mailfence-immanuel-remote:Spam?
+Slave :mailfence-immanuel-local:junk
+Create Both
+Expunge Both
+
+Channel mailfence-immanuel-archive
+Master :mailfence-immanuel-remote:Archive
+Slave :mailfence-immanuel-local:archive
+Create Both
+Expunge Both
+
+Channel mailfence-immanuel-junk
+Master :mailfence-immanuel-remote:Trash
+Slave :mailfence-immanuel-local:trash
+Create Both
+Expunge Both
+
+Group main-mailbox
+Channel mailfence-immanuel-inbox
+Channel mailfence-immanuel-archive
+Channel mailfence-immanuel-drafts
+Channel mailfence-immanuel-sent
+Channel mailfence-immanuel-trash
+Channel mailfence-immanuel-junk

neomutt/neomuttrc

@@ -0,0 +1,150 @@
+# set mbox = ~/mail
+set realname = "Immanuel Onyeka"
+set folder = ~/mail
+set mbox_type = Maildir
+set mbox = ~/mail
+set spoolfile = "+personal/INBOX"
+set sidebar_visible
+set sidebar_format = "%B%?F? [%F]?%* %?N?%N/?%S"
+bind index,pager B sidebar-toggle-visible
+set mail_check_stats
+set from = "immanuel@onyeka.ca"
+set postponed = "+personal/drafts"
+set record = "+personal/sent"
+set trash = "+personal/trash"
+# set sendmail="msmtp"
+set sendmail="msmtp -a immanuel"
+set use_envelope_from = yes
+
+# compose View Options
+set edit_headers                     # show headers when composing
+set fast_reply                       # skip to compose when replying
+set askcc                            # ask for CC:
+set fcc_attach                       # save attachments with the body
+set forward_format = "Fwd: %s"       # format of subject when forwarding
+set forward_decode                   # decode when forwarding
+set attribution = "On %d, %n wrote:" # format of quoting header
+set reply_to                         # reply to Reply to: field
+set reverse_name                     # reply as whomever it was to
+set include                          # include message in replies
+set forward_quote                    # include message in forwards
+set editor = "vim"
+set text_flowed
+unset sig_dashes                     # no dashes before sig
+unset mime_forward                   # forward attachments as part of body
+
+# status bar, date format, finding stuff etc.
+# set status_chars = " *%A"
+set status_format = "[ Folder: %f  ] [%r%m messages%?n? (%n new)?%?d? (%d to delete)?%?t? (%t tagged)? ]%>─%?p?( %p postponed  )?"
+set date_format = "%d.%m.%Y %H:%M"
+set index_format = "[%Z] %?X?A&-? %D  %-20.20F  %s"
+set sort = threads
+set sort_aux = reverse-last-date-received
+set uncollapse_jump
+set sort_re
+# set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
+# set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+ )+"
+
+
+# Mailboxes to show in the sidebar.
+mailboxes =ALL-INBOX
+mailboxes =personal/INBOX =personal/archive =personal/sent =personal/drafts =personal/junk =personal/trash
+mailboxes =work/"[Gmail]INBOX" =work/"[Gmail]/Spam" =work/"[Gmail]/Trash" =work/"[Gmail]/All Mail" =work/Reference
+# mailboxes =hussar
+# mailboxes =hussar/archive =hussar/sent =hussar/drafts =hussar/junk =hussar/trash
+# set sidebar_short_path
+# set sidebar_delim_chars="/"
+# set sidebar_folder_indent
+# set sidebar_indent_string="  "
+
+# Pager View Options
+# set pager_index_lines = 10
+# set pager_context = 3
+# set pager_stop
+# set menu_scroll
+# set tilde
+# unset markers
+
+# set mail_check_stats
+
+# Bindings
+bind index,pager \CP sidebar-prev
+bind index,pager \CN sidebar-next
+bind index,pager \CO sidebar-open
+# bind pager gg top
+# bind index gg first-entry
+# bind pager G bottom
+# bind index G last-entry
+
+# Other
+auto_view text/html
+# Save all attachments
+macro pager S "<pipe-message> ripmime -i - -d ~/downloads && rm ~/downloads/textfile*" "Save all non-text attachments using ripmime"
+# opening urls with urlscan
+macro pager \cb "<pipe-message> urlscan --run 'printf "{}" | xclip -i -selection clipboard'<Enter>" "call urlscan to extract URLs out of a message"
+macro index,pager O "<shell-escape>mbsync -a<enter>" "run mbsync to sync all mail"
+
+macro index,pager A \
+  "<save-message>+immanuel/archive/<enter>"  \
+    "move message to the archive"
+
+	macro index,pager I \
+	  "<save-message>+immanuel/INBOX/<enter>"
+
+# GPG/PGP 
+# set pgp_sign_as = 2F283D0D
+set crypt_use_gpgme = yes
+set crypt_autosign = no
+set crypt_verify_sig = yes
+set crypt_replysign = yes
+set crypt_replyencrypt = yes
+set crypt_replysignencrypted = yes
+
+color normal      default default
+# color attachment  color109 default
+# color bold        color229 default
+# color error       color167 default
+# color hdrdefault  color246 default
+# color indicator   color235 color66
+# color markers     color243 default
+# color normal      color223 default
+# color quoted      color250 default
+# color quoted1     color108 default
+# color quoted2     color250 default
+# color quoted3     color108 default
+# color quoted4     color250 default
+# color quoted5     color108 default
+color search      default color208
+# color signature   color108 default
+# color tilde       color243 default
+# color tree        color142 default
+# color underline   color223 color239
+
+# color sidebar_divider    color250 default
+# color sidebar_new        color142 default
+
+# color index color142 default ~N
+# color index color108 default ~O
+# color index color109 default ~P
+# color index color214 default ~F
+# color index color175 default ~Q
+# color index color167 default ~=
+# color index default color223 ~T
+# color index default color167 ~D
+
+color header default default "^From:"
+color header default default "^To:"
+color header default default "^Subject:"
+color header default default "^X-Spam-Status:"
+color header default default "^Received:"
+
+# color body default default
+color body default default "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
+# color body color208 default "[-a-z_0-9.%$]+@[-a-z_0-9.]+\\.[-a-z][-a-z]+"
+# color body color208 default "mailto:[-a-z_0-9.]+@[-a-z_0-9.]+"
+# color body default default "[;:]-*[)>(<lt;|]"
+color body default default "[;:]-*[)>(<lt;|]"
+color body default default "\\*[- A-Za-z]+\\*"
+# color body color229 default "\\*[- A-Za-z]+\\*"
+
+# color compose header            color223 default")]"

taskrc

@@ -0,0 +1,31 @@
+# [Created by task 2.5.3 3/10/2021 14:37:24]
+# Taskwarrior program configuration file.
+# For more documentation, see http://taskwarrior.org or try 'man task', 'man task-color',
+# 'man task-sync' or 'man taskrc'
+
+# Here is an example of entries that use the default, override and blank values
+#   variable=foo   -- By specifying a value, this overrides the default
+#   variable=      -- By specifying no value, this means no default
+#   #variable=foo  -- By commenting out the line, or deleting it, this uses the default
+
+# Use the command 'task show' to see all defaults and overrides
+
+# Files
+data.location=~/.task
+
+# Color theme (uncomment one to use)
+#include /usr/share/taskwarrior/light-16.theme
+#include /usr/share/taskwarrior/light-256.theme
+#include /usr/share/taskwarrior/dark-16.theme
+#include /usr/share/taskwarrior/dark-256.theme
+#include /usr/share/taskwarrior/dark-red-256.theme
+#include /usr/share/taskwarrior/dark-green-256.theme
+#include /usr/share/taskwarrior/dark-blue-256.theme
+#include /usr/share/taskwarrior/dark-violets-256.theme
+#include /usr/share/taskwarrior/dark-yellow-green.theme
+#include /usr/share/taskwarrior/dark-gray-256.theme
+#include /usr/share/taskwarrior/dark-gray-blue-256.theme
+#include /usr/share/taskwarrior/solarized-dark-256.theme
+#include /usr/share/taskwarrior/solarized-light-256.theme
+#include /usr/share/taskwarrior/no-color.theme
+

vimrc.local

@@ -13,7 +13,8 @@ runtime ftplugin/man.vim
 set keywordprg=:Man
 let mapleader = "s"
 set is
-" hi Normal guibg=NONE ctermbg=NONE
+set tw=80
+set so=10
 
 "Colour settings
 set t_Co=256 "Use 256 colours (Use this setting only if your terminal supports 256 colours)
@@ -21,8 +22,7 @@ set tgc "More terminal colours
 let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
 let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
 let base16colorspace=256
-colorscheme base16-atelier-savanna-light
-"colorscheme Tomorrow-Night
+colorscheme base16-tomorrow-night
 
 "Pymode stuff
 let g:pymode_folding = 0
@@ -78,7 +78,10 @@ noremap <C-l> <C-W>l
 noremap <C-j> <C-W>j
 noremap <C-k> <C-W>k
 nnoremap <leader>z :wa<cr>
-set so=10
+nnoremap <leader>c :CtrlPChange<cr>
+nnoremap <leader>C :CtrlPChangeAll<cr>
+nnoremap <leader><cr> :center<cr>
+inoremap jj <esc>
 
 "Easymotion
 map <Leader> <Plug>(easymotion-prefix)

xbindkeysrc

@@ -20,5 +20,5 @@
 "prompt action"
 	Mod4 + a 
 
-"prompt ddg"
+"prompt search"
 	Mod4 + r