diff options
-rwxr-xr-x | home/.bin/bri.c (renamed from .bin/bri.c) | 0 | ||||
-rwxr-xr-x | home/.bin/clock.c (renamed from .bin/clock.c) | 0 | ||||
-rwxr-xr-x | home/.bin/jrp.c (renamed from .bin/jrp.c) | 0 | ||||
-rwxr-xr-x | home/.bin/manpager (renamed from .bin/manpager) | 0 | ||||
-rwxr-xr-x | home/.bin/pbcopy.c (renamed from .bin/pbcopy.c) | 0 | ||||
-rwxr-xr-x | home/.bin/pbd.c (renamed from .bin/pbd.c) | 0 | ||||
-rwxr-xr-x | home/.bin/xx.c (renamed from .bin/xx.c) | 0 | ||||
-rw-r--r-- | home/.config/git/config (renamed from .config/git/config) | 0 | ||||
-rw-r--r-- | home/.config/git/ignore (renamed from .config/git/ignore) | 0 | ||||
-rw-r--r-- | home/.config/htop/htoprc (renamed from .config/htop/htoprc) | 0 | ||||
-rw-r--r-- | home/.config/nvim/autoload/pathogen.vim (renamed from .config/nvim/autoload/pathogen.vim) | 0 | ||||
-rw-r--r-- | home/.config/nvim/colors/trivial.vim (renamed from .config/nvim/colors/trivial.vim) | 0 | ||||
-rw-r--r-- | home/.config/nvim/init.vim (renamed from .config/nvim/init.vim) | 0 | ||||
-rw-r--r-- | home/.config/nvim/syntax/nasm.vim (renamed from .config/nvim/syntax/nasm.vim) | 0 | ||||
-rw-r--r-- | home/.gdbinit (renamed from .gdbinit) | 0 | ||||
-rw-r--r-- | home/.gnupg/gpg-agent.conf (renamed from .gnupg/gpg-agent.conf) | 0 | ||||
-rw-r--r-- | home/.inputrc (renamed from .inputrc) | 0 | ||||
-rw-r--r-- | home/.psqlrc (renamed from .psqlrc) | 0 | ||||
-rw-r--r-- | home/.ssh/config (renamed from .ssh/config) | 0 | ||||
-rw-r--r-- | home/.tmux.conf (renamed from .tmux.conf) | 0 | ||||
-rw-r--r-- | home/.zshrc (renamed from .zshrc) | 0 | ||||
-rwxr-xr-x | import.sh | 2 | ||||
-rwxr-xr-x | install.sh | 20 | ||||
-rwxr-xr-x | vendor.sh | 2 |
24 files changed, 12 insertions, 12 deletions
diff --git a/.bin/bri.c b/home/.bin/bri.c index 4c53475f..4c53475f 100755 --- a/.bin/bri.c +++ b/home/.bin/bri.c diff --git a/.bin/clock.c b/home/.bin/clock.c index 288884d8..288884d8 100755 --- a/.bin/clock.c +++ b/home/.bin/clock.c diff --git a/.bin/jrp.c b/home/.bin/jrp.c index 9317ac8e..9317ac8e 100755 --- a/.bin/jrp.c +++ b/home/.bin/jrp.c diff --git a/.bin/manpager b/home/.bin/manpager index f358f5d9..f358f5d9 100755 --- a/.bin/manpager +++ b/home/.bin/manpager diff --git a/.bin/pbcopy.c b/home/.bin/pbcopy.c index 23403d2d..23403d2d 100755 --- a/.bin/pbcopy.c +++ b/home/.bin/pbcopy.c diff --git a/.bin/pbd.c b/home/.bin/pbd.c index e7b61d12..e7b61d12 100755 --- a/.bin/pbd.c +++ b/home/.bin/pbd.c diff --git a/.bin/xx.c b/home/.bin/xx.c index 269c9d55..269c9d55 100755 --- a/.bin/xx.c +++ b/home/.bin/xx.c diff --git a/.config/git/config b/home/.config/git/config index cb38682c..cb38682c 100644 --- a/.config/git/config +++ b/home/.config/git/config diff --git a/.config/git/ignore b/home/.config/git/ignore index 380a01a1..380a01a1 100644 --- a/.config/git/ignore +++ b/home/.config/git/ignore diff --git a/.config/htop/htoprc b/home/.config/htop/htoprc index f8c272a3..f8c272a3 100644 --- a/.config/htop/htoprc +++ b/home/.config/htop/htoprc diff --git a/.config/nvim/autoload/pathogen.vim b/home/.config/nvim/autoload/pathogen.vim index dbe07f00..dbe07f00 100644 --- a/.config/nvim/autoload/pathogen.vim +++ b/home/.config/nvim/autoload/pathogen.vim diff --git a/.config/nvim/colors/trivial.vim b/home/.config/nvim/colors/trivial.vim index 55f3ced6..55f3ced6 100644 --- a/.config/nvim/colors/trivial.vim +++ b/home/.config/nvim/colors/trivial.vim diff --git a/.config/nvim/init.vim b/home/.config/nvim/init.vim index 0e2683a3..0e2683a3 100644 --- a/.config/nvim/init.vim +++ b/home/.config/nvim/init.vim diff --git a/.config/nvim/syntax/nasm.vim b/home/.config/nvim/syntax/nasm.vim index 7eeb9abb..7eeb9abb 100644 --- a/.config/nvim/syntax/nasm.vim +++ b/home/.config/nvim/syntax/nasm.vim diff --git a/.gdbinit b/home/.gdbinit index 9422460c..9422460c 100644 --- a/.gdbinit +++ b/home/.gdbinit diff --git a/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf index 83ef4996..83ef4996 100644 --- a/.gnupg/gpg-agent.conf +++ b/home/.gnupg/gpg-agent.conf diff --git a/.inputrc b/home/.inputrc index b2cc9d61..b2cc9d61 100644 --- a/.inputrc +++ b/home/.inputrc diff --git a/.psqlrc b/home/.psqlrc index 60f39755..60f39755 100644 --- a/.psqlrc +++ b/home/.psqlrc diff --git a/.ssh/config b/home/.ssh/config index 4068ff35..4068ff35 100644 --- a/.ssh/config +++ b/home/.ssh/config diff --git a/.tmux.conf b/home/.tmux.conf index 46e9130a..46e9130a 100644 --- a/.tmux.conf +++ b/home/.tmux.conf diff --git a/.zshrc b/home/.zshrc index 6b7feebb..6b7feebb 100644 --- a/.zshrc +++ b/home/.zshrc diff --git a/import.sh b/import.sh index bd4909fb..a2fefd0a 100755 --- a/import.sh +++ b/import.sh @@ -12,7 +12,7 @@ error() { [ -z "$1" ] && error 'no path' source_path="$HOME/$1" -dest_path="$PWD/$1" +dest_path="$PWD/home/$1" [ -f "$dest_path" ] && error "$dest_path already exists" [ -f "$source_path" ] || error "$source_path does not exist" diff --git a/install.sh b/install.sh index 68e14899..98a4e135 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env zsh -# Create symlinks in ~ for files in the current directory. +# Create symlines in ~ for files in home. set -o errexit -o nounset -o pipefail @@ -10,7 +10,7 @@ error() { } link() { - local source_path="$PWD/$1" + local source_path="$PWD/home/$1" local dest_path="$HOME/$1" [ -h "$dest_path" ] && return @@ -21,14 +21,14 @@ link() { echo "$1" } -if [ -d ~/Library ]; then - link 'Library/Application Support/Karabiner/private.xml' - link 'Library/Keyboard Layouts/CodeTarmak1.keylayout' - link 'Library/Keyboard Layouts/Tarmak 1.keylayout' - link 'Library/Keyboard Layouts/Tarmak 2.keylayout' - link 'Library/Keyboard Layouts/Tarmak 3.keylayout' - link 'Library/Keyboard Layouts/Tarmak 4.keylayout' -fi +#if [ -d ~/Library ]; then +# link 'Library/Application Support/Karabiner/private.xml' +# link 'Library/Keyboard Layouts/CodeTarmak1.keylayout' +# link 'Library/Keyboard Layouts/Tarmak 1.keylayout' +# link 'Library/Keyboard Layouts/Tarmak 2.keylayout' +# link 'Library/Keyboard Layouts/Tarmak 3.keylayout' +# link 'Library/Keyboard Layouts/Tarmak 4.keylayout' +#fi link '.bin/bri.c' link '.bin/clock.c' diff --git a/vendor.sh b/vendor.sh index b5785d06..97b7134b 100755 --- a/vendor.sh +++ b/vendor.sh @@ -9,4 +9,4 @@ pull() { echo "$1" } -pull {.config/nvim,tpope/vim-pathogen/master}/autoload/pathogen.vim +pull {home/.config/nvim,tpope/vim-pathogen/master}/autoload/pathogen.vim |