diff --git a/README.md b/README.md
index 1b038ad..4b04c59 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,4 @@
Settings and Preferences for transfer between machines
## Usage
-Simple:
-
-1. run `sudo ./INSTALL_ALL_THE_THINGS`
-2. Sit back
-3. Wait
-4. Wait some more
-5. Fix any errors that come up
-6. Wait some more
-7. Install any extra packages manually
-7. Enjoy computer!
+Inside every directory is a file called `export.*`. Simply run this file from inside the directory, and it'll do the rest!
diff --git a/apt/add-apt-sources.sh b/apt/add-apt-sources.sh
old mode 100755
new mode 100644
diff --git a/apt/custom-installs.sh b/apt/custom-installs.sh
old mode 100755
new mode 100644
diff --git a/apt/export.py b/apt/export.py
old mode 100755
new mode 100644
diff --git a/atom/README.md b/atom/README.md
index 24c0bdb..93037b6 100644
--- a/atom/README.md
+++ b/atom/README.md
@@ -1 +1,8 @@
-# Atom Sync-Settings
\ No newline at end of file
+# Atom Sync-Settings
+
+Settings for atom are now stored in the gist at [https://gist.github.com/RealOrangeOne/9f9a4dd799ad01aa0502a09f06cbf454/](https://gist.github.com/RealOrangeOne/9f9a4dd799ad01aa0502a09f06cbf454/) and synced using [this plugin](https://atom.io/packages/sync-settings).
+
+This makes syncing them between machines far easier than my old implementation of Owncloud sync and symlinks!
+
+#### There's a lot of revisions on this gist!
+Unfortunately, this setup also stores the version number of the plugins, which means that a revision has to be made every time a package needs to be updated. It does kindof annoy me with all the spam, but at least it's not really obvious, and I'm sure there's a way of cleaning it up!
\ No newline at end of file
diff --git a/atom/packages.json b/atom/packages.json
index 8ded2e3..f7ea2df 100644
--- a/atom/packages.json
+++ b/atom/packages.json
@@ -9,15 +9,15 @@
},
{
"name": "about",
- "version": "1.4.2"
+ "version": "1.5.0"
},
{
"name": "activate-power-mode",
- "version": "0.5.2"
+ "version": "0.7.0"
},
{
"name": "aesthetic-ui",
- "version": "1.0.1",
+ "version": "2.0.0",
"theme": "ui"
},
{
@@ -28,6 +28,10 @@
"name": "atom-alignment",
"version": "0.12.1"
},
+ {
+ "name": "atom-beautify",
+ "version": "0.29.9"
+ },
{
"name": "atom-dark-syntax",
"version": "0.27.0",
@@ -44,7 +48,7 @@
},
{
"name": "atom-html-preview",
- "version": "0.1.19"
+ "version": "0.1.21"
},
{
"name": "atom-light-syntax",
@@ -58,16 +62,20 @@
},
{
"name": "atom-material-ui",
- "version": "1.2.11",
+ "version": "1.2.13",
"theme": "ui"
},
+ {
+ "name": "atom-react-native-autocomplete",
+ "version": "0.0.27"
+ },
{
"name": "autocomplete-atom-api",
"version": "0.10.0"
},
{
"name": "autocomplete-css",
- "version": "0.11.0"
+ "version": "0.11.1"
},
{
"name": "autocomplete-html",
@@ -75,7 +83,7 @@
},
{
"name": "autocomplete-plus",
- "version": "2.29.1"
+ "version": "2.29.2"
},
{
"name": "autocomplete-snippets",
@@ -105,11 +113,11 @@
},
{
"name": "bookmarks",
- "version": "0.38.2"
+ "version": "0.39.0"
},
{
"name": "bracket-matcher",
- "version": "0.81.0"
+ "version": "0.82.0"
},
{
"name": "change-case",
@@ -117,7 +125,7 @@
},
{
"name": "color-picker",
- "version": "2.1.1"
+ "version": "2.2.1"
},
{
"name": "command-palette",
@@ -141,7 +149,7 @@
},
{
"name": "file-icons",
- "version": "1.7.9"
+ "version": "1.7.16"
},
{
"name": "find-and-replace",
@@ -177,7 +185,7 @@
},
{
"name": "incompatible-packages",
- "version": "0.25.1"
+ "version": "0.26.1"
},
{
"name": "keybinding-cheatsheet",
@@ -189,11 +197,11 @@
},
{
"name": "language-babel",
- "version": "2.19.4"
+ "version": "2.30.1"
},
{
"name": "language-c",
- "version": "0.51.1"
+ "version": "0.51.3"
},
{
"name": "language-clojure",
@@ -205,11 +213,11 @@
},
{
"name": "language-csharp",
- "version": "0.12.0"
+ "version": "0.12.1"
},
{
"name": "language-css",
- "version": "0.36.0"
+ "version": "0.36.1"
},
{
"name": "language-gfm",
@@ -239,17 +247,21 @@
"name": "language-javascript",
"version": "0.110.0"
},
+ {
+ "name": "language-javascript-jsx",
+ "version": "0.3.7"
+ },
{
"name": "language-json",
- "version": "0.17.6"
+ "version": "0.18.0"
},
{
"name": "language-less",
- "version": "0.29.0"
+ "version": "0.29.3"
},
{
"name": "language-make",
- "version": "0.21.0"
+ "version": "0.21.1"
},
{
"name": "language-mustache",
@@ -261,7 +273,7 @@
},
{
"name": "language-perl",
- "version": "0.32.0"
+ "version": "0.34.0"
},
{
"name": "language-php",
@@ -273,11 +285,11 @@
},
{
"name": "language-python",
- "version": "0.43.0"
+ "version": "0.43.1"
},
{
"name": "language-ruby",
- "version": "0.68.3"
+ "version": "0.68.5"
},
{
"name": "language-ruby-on-rails",
@@ -289,7 +301,7 @@
},
{
"name": "language-shellscript",
- "version": "0.21.0"
+ "version": "0.21.1"
},
{
"name": "language-source",
@@ -317,7 +329,7 @@
},
{
"name": "language-yaml",
- "version": "0.25.1"
+ "version": "0.25.2"
},
{
"name": "lcov-info",
@@ -325,7 +337,7 @@
},
{
"name": "line-ending-selector",
- "version": "0.3.1"
+ "version": "0.4.1"
},
{
"name": "link",
@@ -333,15 +345,15 @@
},
{
"name": "linter",
- "version": "1.11.4"
+ "version": "1.11.14"
},
{
"name": "linter-eslint",
- "version": "7.2.2"
+ "version": "7.2.4"
},
{
"name": "linter-flake8",
- "version": "1.13.0"
+ "version": "1.13.2"
},
{
"name": "markdown-preview",
@@ -353,11 +365,11 @@
},
{
"name": "merge-conflicts",
- "version": "1.4.2"
+ "version": "1.4.4"
},
{
"name": "minimap",
- "version": "4.23.5"
+ "version": "4.24.7"
},
{
"name": "minimap-highlight-selected",
@@ -387,7 +399,7 @@
},
{
"name": "one-dark-ui",
- "version": "1.2.0",
+ "version": "1.3.1",
"theme": "ui"
},
{
@@ -397,7 +409,7 @@
},
{
"name": "one-light-ui",
- "version": "1.2.0",
+ "version": "1.3.1",
"theme": "ui"
},
{
@@ -422,7 +434,7 @@
},
{
"name": "pigments",
- "version": "0.26.2"
+ "version": "0.31.0"
},
{
"name": "project-manager",
@@ -432,9 +444,27 @@
"name": "react",
"version": "0.15.0"
},
+ {
+ "name": "redmond-syntax",
+ "version": "0.2.18",
+ "theme": "syntax"
+ },
+ {
+ "name": "redmond-ui",
+ "version": "0.1.5",
+ "theme": "ui"
+ },
+ {
+ "name": "rest-client",
+ "version": "1.2.0"
+ },
{
"name": "script",
- "version": "3.7.1"
+ "version": "3.8.1"
+ },
+ {
+ "name": "set-syntax",
+ "version": "0.3.0"
},
{
"name": "settings-view",
@@ -442,25 +472,25 @@
},
{
"name": "snippets",
- "version": "1.0.1"
+ "version": "1.0.2"
},
{
"name": "solarized-dark-syntax",
- "version": "1.0.0",
+ "version": "1.0.2",
"theme": "syntax"
},
{
"name": "solarized-light-syntax",
- "version": "1.0.0",
+ "version": "1.0.2",
"theme": "syntax"
},
{
"name": "spell-check",
- "version": "0.67.0"
+ "version": "0.67.1"
},
{
"name": "status-bar",
- "version": "1.1.2"
+ "version": "1.2.3"
},
{
"name": "styleguide",
@@ -480,7 +510,7 @@
},
{
"name": "tabs",
- "version": "0.92.0"
+ "version": "0.96.0"
},
{
"name": "timecop",
@@ -490,6 +520,10 @@
"name": "todo-show",
"version": "1.6.0"
},
+ {
+ "name": "toggle-quotes",
+ "version": "1.0.0"
+ },
{
"name": "trailing-spaces",
"version": "0.3.2"
diff --git a/atom/settings.json b/atom/settings.json
index 28b7e3b..eb8e598 100644
--- a/atom/settings.json
+++ b/atom/settings.json
@@ -2,6 +2,11 @@
"activate-power-mode": {
"autoToggle": false
},
+ "atom-beautify": {
+ "general": {
+ "_analyticsUserId": "3e7a84e3-1c7f-49a9-8c68-1b1e030cf498"
+ }
+ },
"color-picker": {
"abbreviateValues": true,
"preferredFormat": "HEX",
@@ -10,6 +15,7 @@
"core": {
"autoHideMenuBar": true,
"closeEmptyWindows": false,
+ "excludeVcsIgnoredPaths": false,
"openEmptyEditorOnStart": false,
"packagesWithKeymapsDisabled": [
"merge-conflicts",
@@ -41,6 +47,9 @@
"file-watcher": {
"promptWhenFileHasChangedOnDisk": false
},
+ "fonts": {
+ "fontFamily": "Roboto Mono"
+ },
"glowing-cursor": {
"glowColor": {
"red": 255,
@@ -56,7 +65,7 @@
}
},
"linter": {
- "errorPanelHeight": 27
+ "errorPanelHeight": 26
},
"linter-eslint": {
"disableWhenNoEslintConfig": false,
diff --git a/atom/styles.less b/atom/styles.less
index 0e07db3..eeaf456 100644
--- a/atom/styles.less
+++ b/atom/styles.less
@@ -1 +1 @@
-// styles file (not found)
\ No newline at end of file
+// styles file (not found)
diff --git a/bash/.bashrc b/bash/.bashrc
index d68f866..84c63c3 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -6,10 +6,8 @@ esac
# don't put duplicate lines or lines starting with space in the history.
HISTCONTROL=ignoreboth
-
# append to the history file, don't overwrite it
shopt -s histappend
-
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
HISTSIZE=1000
HISTFILESIZE=2000
@@ -24,28 +22,8 @@ if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
debian_chroot=$(cat /etc/debian_chroot)
fi
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
- xterm-color|*-256color) color_prompt=yes;;
-esac
-
-force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
- if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
- color_prompt=yes
- else
- color_prompt=
- fi
-fi
-
# Set prompt
-if [ "$color_prompt" = yes ]; then
- 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
-unset color_prompt force_color_prompt
+PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
# If this is an xterm set the title to user@host:dir
case "$TERM" in
@@ -60,9 +38,8 @@ esac
if [ -x /usr/bin/dircolors ]; then
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
alias ls='ls --color=auto'
- #alias dir='dir --color=auto'
- #alias vdir='vdir --color=auto'
-
+ alias dir='dir --color=auto'
+ alias vdir='vdir --color=auto'
alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
@@ -79,9 +56,7 @@ alias l='ls -CF'
# Add an "alert" alias for long running commands
alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
+# enable programmable completion features (you don't need to enable this, if it's already enabled in /etc/bash.bashrc and /etc/profile sources /etc/bash.bashrc).
if ! shopt -oq posix; then
if [ -f /usr/share/bash-completion/bash_completion ]; then
. /usr/share/bash-completion/bash_completion
@@ -90,31 +65,31 @@ if ! shopt -oq posix; then
fi
fi
-# load nvm
+
+
+# Load Programs
export NVM_DIR="/home/jake/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # Load on ubuntu
-
-# load thefuck
eval $(thefuck --alias)
+
# Export some variables
export ANDROID_HOME=/opt/android-sdk
-
-# Export PATH
-export PATH=${PATH}:/opt/android-sdk/tools
-export PATH=${PATH}:/opt/android-sdk/platform-tools
+# Extend PATH
+export PATH=${PATH}:${ANDROID_HOME}/tools
+export PATH=${PATH}:${ANDROID_HOME}/platform-tools
export PATH=${PATH}:/opt/genymobile/genymotion
-PATH=~/.bin:$PATH # Add part of home to path
+export PATH=~/.bin:${PATH}
-# Platform Specific
-if [ -f "$(command -v lsb_release)" ]; then # if on ubuntu
+# Export Java home on ubuntu
+if [ -f "$(command -v lsb_release)" ]; then
JAVA_HOME=/usr/local/java/jdk1.8.0_73
- export PATH=$PATH:$JAVA_HOME/bin
+ export PATH=${PATH}:$JAVA_HOME/bin
fi
-# JS aliases
+# npm aliases
alias ni="npm install"
alias ns="npm start"
alias nt="npm test"
@@ -137,10 +112,14 @@ nr() {
done
}
-# react-native
+alias nrc="npm run coverage"
+alias nrm="npm run mocha"
+alias nvmu="nvm use"
+
+# React extras
export REACT_EDITOR=atom
alias rnl="adb logcat | grep ReactNative"
-alias nvmu="nvm use"
+
# catfish aliases
ctp() {
@@ -152,6 +131,8 @@ ctp() {
command ctf project run runtests ${@:2}
elif [[ $1 == "migrate" ]]; then
command ctf project run manage.py migrate
+ elif [[ $1 == "makemigrations" ]]; then
+ command ctf project run manage.py makemigrations
else
command ctf project $@
fi
@@ -159,14 +140,33 @@ ctp() {
alias ctfs="cd ~/catfish && ./start && cd - > /dev/null"
+
# bash aliases
alias src="source ~/.bashrc"
-export EDITOR=/usr/bin/nano
-alias refresh="cd - > /dev/null && cd - > /dev/null"
+alias refresh="cd $PWD > /dev/null"
+alias c="clear"
+export EDITOR=/bin/nano
# git aliases
alias gs="git status"
alias gd="git diff"
+gh() {
+ command git clone git@github.com:${1}/${2} # My bash isnt great...
+}
+
+
+# Gnome
+gd-lock() {
+ sessionid=`/bin/loginctl list-sessions | grep jake | awk '{print $1}'`
+ /bin/loginctl lock-session $sessionid
+}
+gd-unlock() {
+ sessionid=`/bin/loginctl list-sessions | grep jake | awk '{print $1}'`
+ /bin/loginctl unlock-session $sessionid
+}
+alias gdl="gd-lock"
+alias gdu="gd-unlock"
+
# miscellaneous software aliases
alias y="yoga"
diff --git a/bash/export.sh b/bash/export.sh
old mode 100755
new mode 100644
diff --git a/config/export.sh b/config/export.sh
old mode 100755
new mode 100644
diff --git a/deploy.sh b/deploy.sh
old mode 100755
new mode 100644
index e1c1c49..db838f8
--- a/deploy.sh
+++ b/deploy.sh
@@ -22,7 +22,6 @@ git clone --depth=1 git@gist.github.com:9f9a4dd799ad01aa0502a09f06cbf454.git ato
rm -rf atom/.git
mv atom/Atom\ Settings.md atom/README.md
-
echo ">> Saving changes..."
git config user.name "Jake Howard"
git config user.email "git@theorangeone.net"
diff --git a/gnome/Templates/Empty HTML File b/gnome/Templates/Empty HTML File
new file mode 100644
index 0000000..7e5123e
--- /dev/null
+++ b/gnome/Templates/Empty HTML File
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/gnome/Templates/Empty Node Script b/gnome/Templates/Empty Node Script
new file mode 100644
index 0000000..908ba84
--- /dev/null
+++ b/gnome/Templates/Empty Node Script
@@ -0,0 +1 @@
+#!/usr/bin/env node
diff --git a/gnome/Templates/Empty Python File b/gnome/Templates/Empty Python File
new file mode 100644
index 0000000..e5a0d9b
--- /dev/null
+++ b/gnome/Templates/Empty Python File
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/gnome/export.sh b/gnome/export.sh
new file mode 100644
index 0000000..b0e1872
--- /dev/null
+++ b/gnome/export.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+echo "Exporting Templates"
+rm -rf ~/Templates/*
+ln -sfP ~/.dotfiles/gnome/Templates/* ~/Templates/
+
+
+
+
diff --git a/yaourt/export.py b/yaourt/export.py
old mode 100755
new mode 100644