diff --git a/config/dotcss/accounts.google.com.css b/config/dotcss/accounts.google.com.css new file mode 100644 index 00000000..e69de29b diff --git a/config/dotcss/cloud.jonathanh.co.uk.css b/config/dotcss/cloud.jonathanh.co.uk.css new file mode 100644 index 00000000..e69de29b diff --git a/config/dotcss/docs.google.com.css b/config/dotcss/docs.google.com.css new file mode 100644 index 00000000..e69de29b diff --git a/config/dotcss/truckstuff.co.uk.css b/config/dotcss/truckstuff.co.uk.css new file mode 100644 index 00000000..e69de29b diff --git a/config/dotcss/truckv2.fpldev3.co.uk.css b/config/dotcss/truckv2.fpldev3.co.uk.css new file mode 100644 index 00000000..e69de29b diff --git a/config/dotcss/web.skype.com.css b/config/dotcss/web.skype.com.css new file mode 100644 index 00000000..e69de29b diff --git a/config/i3/configWork b/config/i3/configWork index b55a7a1c..febc1470 100644 --- a/config/i3/configWork +++ b/config/i3/configWork @@ -355,7 +355,8 @@ exec --no-startup-id xfce4-clipman #exec_always --no-startup-id sleep 1s; killall -9 conky exec --no-startup-id xrandr --output DP-1 --primary --mode 2560x1440 --pos 1440x0 --rotate normal --output HDMI-1 --mode 1440x900 --pos 0x0 --rotate normal --output HDMI-2 --off exec_always --no-startup-id /usr/lib/xfce4/notifyd/xfce4-notifyd -exec --no-startup-id sh ~/.fehbg +#exec --no-startup-id sh ~/.fehbg +exec --no-startup-id nitrogen --restore exec_always --no-startup-id sh "/home/jonathan/.config/conky/conky-startup.sh" #exec --no-startup-id conky -c "/home/jonathan/.config/conky/BibleVerse/bibleGateway" #exec --no-startup-id conky -c "/home/jonathan/.config/conky/MyBlue/MyBlue" diff --git a/config/oh-my-zsh/aliases.zsh b/config/oh-my-zsh/aliases.zsh index 9b9c7142..3e3b4ff8 100644 --- a/config/oh-my-zsh/aliases.zsh +++ b/config/oh-my-zsh/aliases.zsh @@ -46,6 +46,8 @@ alias ch='git checkout' alias push='git push ' alias pull='git pull ' alias bb='git open' +alias merge='git merge' +alias mg='git merge' # Always make grep ouput color alias grep="grep --color=auto"