diff --git a/.bashrc b/.bashrc index a5f83b7..7cac8e2 100644 --- a/.bashrc +++ b/.bashrc @@ -112,3 +112,5 @@ if ! shopt -oq posix; then . /etc/bash_completion fi fi + +[ -s "/Users/doty/.dnx/dnvm/dnvm.sh" ] && . "/Users/doty/.dnx/dnvm/dnvm.sh" # Load dnvm diff --git a/.config/NuGet/NuGet.Config b/.config/NuGet/NuGet.Config new file mode 100644 index 0000000..d0d4c10 --- /dev/null +++ b/.config/NuGet/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.config/configstore/bower-github.yml b/.config/configstore/bower-github.yml new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/.config/configstore/bower-github.yml @@ -0,0 +1 @@ +{} diff --git a/.config/configstore/update-notifier-bower.json b/.config/configstore/update-notifier-bower.json new file mode 100644 index 0000000..9947597 --- /dev/null +++ b/.config/configstore/update-notifier-bower.json @@ -0,0 +1,4 @@ +{ + "optOut": false, + "lastUpdateCheck": 1458929677651 +} \ No newline at end of file diff --git a/.config/fish/config.fish b/.config/fish/config.fish index d6e25cb..ae2c2f6 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,3 +1,16 @@ if status --is-login - set PATH $PATH ~/bin -end \ No newline at end of file + set PATH $PATH ~/bin ~/devtools/buck/bin +end + +export EDITOR=ec +export VISUAL=ec + +export FBANDROID_DIR=/Users/doty/fbsource/fbandroid +alias quicklog_update=/Users/doty/fbsource/fbandroid/scripts/quicklog/quicklog_update.sh +alias qlu=quicklog_update + +# added by setup_fb4a.sh +export ANDROID_SDK=/opt/android_sdk +export ANDROID_NDK_REPOSITORY=/opt/android_ndk +export ANDROID_HOME={ANDROID_SDK} +export PATH={PATH}:{ANDROID_SDK}/tools:{ANDROID_SDK}/platform-tools diff --git a/.config/fish/functions/dnu.fish b/.config/fish/functions/dnu.fish new file mode 100644 index 0000000..d75cc3d --- /dev/null +++ b/.config/fish/functions/dnu.fish @@ -0,0 +1,8 @@ +function dnu --description "wraps the dnu bash script" + if test -e ~/.dnx/dnvm/dnvm.sh + set dnx ~/.dnx/dnvm/dnvm.sh + else if test -e /usr/local/bin/dnvm.sh + set dnx /usr/local/bin/dnvm.sh + end + bash -c ". $dnx && dnu $argv" +end diff --git a/.config/fish/functions/dnvm.fish b/.config/fish/functions/dnvm.fish new file mode 100644 index 0000000..04dd8c5 --- /dev/null +++ b/.config/fish/functions/dnvm.fish @@ -0,0 +1,8 @@ +function dnvm --description "wraps the dnvm.sh bash script" +if test -e ~/.dnx/dnvm/dnvm.sh + set dnx ~/.dnx/dnvm/dnvm.sh +else if test -e /usr/local/bin/dnvm.sh + set dnx /usr/local/bin/dnvm.sh +end + bash -c ". $dnx && dnvm $argv" +end diff --git a/.config/fish/functions/dnx.fish b/.config/fish/functions/dnx.fish new file mode 100644 index 0000000..562e497 --- /dev/null +++ b/.config/fish/functions/dnx.fish @@ -0,0 +1,8 @@ +function dnx --description "wraps the dnx bash script" +if test -e ~/.dnx/dnvm/dnvm.sh + set dnx ~/.dnx/dnvm/dnvm.sh +else if test -e /usr/local/bin/dnvm.sh + set dnx /usr/local/bin/dnvm.sh +end + bash -c ". $dnx && dnx $argv" +end diff --git a/.config/stetic/library-cache/4201152a-3448-4296-ba3b-c67344a4f00f/objects b/.config/stetic/library-cache/4201152a-3448-4296-ba3b-c67344a4f00f/objects new file mode 100644 index 0000000..473bc76 --- /dev/null +++ b/.config/stetic/library-cache/4201152a-3448-4296-ba3b-c67344a4f00f/objects @@ -0,0 +1,1869 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | + + + + + + + + + + + + + + + + + + + + + + | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | + + + + + + GTK_ + + + + + + + + + + + + + + + + + + + | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.config/stetic/library-cache/index.xml b/.config/stetic/library-cache/index.xml new file mode 100644 index 0000000..1de8351 --- /dev/null +++ b/.config/stetic/library-cache/index.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.emacs.d/core.el b/.emacs.d/core.el index 19c7623..e5c2154 100644 --- a/.emacs.d/core.el +++ b/.emacs.d/core.el @@ -61,10 +61,13 @@ ;; Packages ;; ================================================================= (setq package-archives - '(("gnu" . "http://elpa.gnu.org/packages/") + '( + ("gnu" . "http://elpa.gnu.org/packages/") ("org" . "http://orgmode.org/elpa/") ("melpa" . "http://melpa.org/packages/") - ("marmalade" . "https://marmalade-repo.org/packages/"))) + ;("marmalade" . "http://marmalade-repo.org/packages/") + ) + ) (when (< emacs-major-version 24) ;; For important compatibility libraries like cl-lib (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/"))) @@ -87,6 +90,8 @@ 'flymake ; Compiling 'flycheck ; Checking + 'exec-path-from-shell ; Fix path on MacOS + 'go-autocomplete ; Autocomplete for golang 'popup ; Pretty completions? @@ -151,14 +156,18 @@ ;; Consolas. (And, to a lesser extent, Inconsolata.) ;; (require 'cl) -(defun font-existsp (font) - (if (and (fboundp 'x-list-fonts) (null (x-list-fonts font))) - nil t)) +(defun font-candidate (&rest fonts) + "Return existing font which first match." + (find-if (lambda (f) (find-font (font-spec :name f))) fonts)) (setq my-font-choice - (find-if - 'font-existsp - '("Consolas-11" "Inconsolata-11"))) + (font-candidate + "Input Mono-12:weight=light" + "Consolas-10" + "Inconsolata-11")) + +;; This is just here for playing with things. +;; (set-frame-font my-font-choice) ;; ;; To obtain new font string, execute eval-expression, and eval this: @@ -184,16 +193,13 @@ (width . 91) (height . ,jd-frame-height))) -;; This is just here for playing with things. -;; (set-frame-font my-font-choice) - ;; COLORZ! ;; (if (display-graphic-p) (progn (require 'color-theme) (require 'color-theme-solarized) - (color-theme-solarized-light))) + (color-theme-solarized))) ;; Modeline format: (display-time-mode -1) @@ -243,6 +249,10 @@ ;; Cleanup all the whitespaces. (add-hook 'before-save-hook 'whitespace-cleanup) +;; Fix path loading on MacOS X +(when (memq window-system '(mac ns)) + (exec-path-from-shell-initialize)) + ;; ================================================================= ;; Text mode configuration. ;; ================================================================= @@ -354,8 +364,27 @@ (statement-case-open . +) )))) +(c-add-style "fb-c" + '("gnu" + (c-basic-offset . 2) + (c-offsets-alist . ((c . c-lineup-C-comments) + (inclass . +) + (access-label . -) + (defun-block-intro . +) + (substatement-open . 0) + (statement-block-intro . +) + (innamespace . +) + (statement-case-intro . +) + (statement-case-open . 0) + (brace-list-intro . +) + (substatement . +) + (arglist-intro . +) + (arglist-close . 0) + (statement-case-open . +) + )))) + (defun my-c-mode-hook () - (c-set-style "ms-c")) + (c-set-style "fb-c")) (add-hook 'c-mode-hook 'my-c-mode-hook) (add-hook 'c++-mode-hook 'my-c-mode-hook) @@ -553,6 +582,12 @@ (setq interpreter-mode-alist (cons '("python" . python-mode) interpreter-mode-alist)) +(defun my-python-hook () + (flycheck-mode) + ) + +(add-hook 'python-mode-hook 'my-python-hook) + ;; ================================================================= ;; JavaScript Support ;; ================================================================= @@ -660,12 +695,13 @@ (add-to-list 'auto-coding-alist '("\\.appx\\'" . no-conversion)) ;; ================================================================= -;; Some build stuff; I swiped this from handmade-hero +;; Some build stuff; I swiped this from handmade-hero. Good for +;; unibuild setups. ;; ================================================================= (when (featurep 'w32) (setq doty-makescript "build.bat")) -(when (featurep 'aquamacs) +(when (featurep 'cocoa) (setq doty-makescript "./build.macosx")) (when (featurep 'x) diff --git a/.gitignore b/.gitignore index 6b55be0..f3b9712 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ .config/fish/fish_history .config/fish/fishd* .config/fish/generated_completions +.config/xbuild/pkgconfig-cache-2.xml +.config/.isolated-storage _viminfo .emacs.d/url/cookies .emacs.d/ido.last diff --git a/.profile b/.profile index c9db459..b4372c5 100644 --- a/.profile +++ b/.profile @@ -20,3 +20,6 @@ fi if [ -d "$HOME/bin" ] ; then PATH="$HOME/bin:$PATH" fi + +# added by Anaconda3 2.4.1 installer +export PATH="/Users/doty/anaconda/bin:$PATH" diff --git a/.zshrc b/.zshrc index 8da87a4..6711b4a 100644 --- a/.zshrc +++ b/.zshrc @@ -35,3 +35,5 @@ alias l='ls -CF' if [ -f ~/.zsh_aliases ]; then . ~/.zsh_aliases fi + +[ -s "/Users/doty/.dnx/dnvm/dnvm.sh" ] && . "/Users/doty/.dnx/dnvm/dnvm.sh" # Load dnvm diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..578ea6d --- /dev/null +++ b/readme.md @@ -0,0 +1,7 @@ +# Doty's init files + +This is a git repo for your dotfiles. You know, like you do. + +On Windows, clone this into your home directory (so that it lives in +~/Init-Files) and run setup.cmd to get everything linked into the right +place. \ No newline at end of file diff --git a/setup.ps1 b/setup.ps1 index 620e38f..fad6668 100644 --- a/setup.ps1 +++ b/setup.ps1 @@ -6,11 +6,11 @@ function new-link($link, $target) { } } -$ignore = @(".gitignore", "setup.ps1") +$ignore = @(".gitignore", "setup.ps1", "setup.cmd") Get-ChildItem . | ? { !$ignore.Contains($_.Name) } | - % { + % { $l = split-path -leaf $_.FullName $p = split-path -parent (split-path -parent $_.FullName) $t = join-path $p $l @@ -18,6 +18,6 @@ Get-ChildItem . | if (test-path $t) { remove-item -recurse -force $t } - + new-link $t $($_.FullName) }