Merged, but uhhhhh

This commit is contained in:
John Doty 2016-09-29 06:37:55 -07:00
commit 65a646e377
16 changed files with 2032 additions and 20 deletions

View file

@ -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

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<activePackageSource>
<add key="Official NuGet Gallery" value="https://www.nuget.org/api/v2/" />
</activePackageSource>
</configuration>

View file

@ -0,0 +1 @@
{}

View file

@ -0,0 +1,4 @@
{
"optOut": false,
"lastUpdateCheck": 1458929677651
}

View file

@ -1,3 +1,16 @@
if status --is-login
set PATH $PATH ~/bin
end
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

View file

@ -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

View file

@ -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

View file

@ -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

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,43 @@
<?xml version="1.0"?>
<LibraryCache xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Members>
<LibraryInfo File="/Applications/Xamarin Studio.app/Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.GtkCore/libstetic.dll" Guid="4201152a-3448-4296-ba3b-c67344a4f00f" Timestamp="2015-11-12T10:56:47Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Web/4.0.0.0__b03f5f7f11d50a3a/System.Web.dll" Guid="6f4dde2b-a5a8-4a02-89ea-413b5ac9ec0c" Timestamp="2015-11-06T17:27:33Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/4.5/mscorlib.dll" Guid="4b6a0b98-2158-4764-a738-746b7a2590ab" Timestamp="2015-11-06T17:29:44Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Drawing/4.0.0.0__b03f5f7f11d50a3a/System.Drawing.dll" Guid="15c3c3ac-0700-4cb2-b18d-d6092c75fa7c" Timestamp="2015-11-06T17:27:07Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System/4.0.0.0__b77a5c561934e089/System.dll" Guid="73c1e6b1-5baf-44e3-b712-a2df55b9abb0" Timestamp="2015-11-06T17:27:02Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/Mono.Security/4.0.0.0__0738eb9f132ed756/Mono.Security.dll" Guid="ee95a3cc-bea9-496e-b0ff-e7974389eeb5" Timestamp="2015-11-06T17:26:51Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Configuration/4.0.0.0__b03f5f7f11d50a3a/System.Configuration.dll" Guid="a7b870d9-767b-4442-819c-d44b962c26e9" Timestamp="2015-11-06T17:26:55Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Xml/4.0.0.0__b77a5c561934e089/System.Xml.dll" Guid="ea0d2f6e-ac09-4156-8836-01a5ad8b0dae" Timestamp="2015-11-06T17:26:59Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Security/4.0.0.0__b03f5f7f11d50a3a/System.Security.dll" Guid="1a4899dc-b4f6-4e96-a7c2-77dc6a5af5c2" Timestamp="2015-11-06T17:26:55Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Core/4.0.0.0__b77a5c561934e089/System.Core.dll" Guid="37733873-89f2-4878-9c4e-6e8d3a85cda2" Timestamp="2015-11-06T17:27:06Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/Mono.Posix/4.0.0.0__0738eb9f132ed756/Mono.Posix.dll" Guid="7d35bdf7-d21e-4da4-af18-5280940e4d1d" Timestamp="2015-11-06T17:27:04Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Data/4.0.0.0__b77a5c561934e089/System.Data.dll" Guid="0638f823-7fac-4be8-b416-089facd52877" Timestamp="2015-11-06T17:27:12Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Numerics/4.0.0.0__b77a5c561934e089/System.Numerics.dll" Guid="7d85734f-23b0-4404-a44d-006241387b5c" Timestamp="2015-11-06T17:27:09Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Transactions/4.0.0.0__b77a5c561934e089/System.Transactions.dll" Guid="fd24c68c-b063-4056-9999-2769bad83476" Timestamp="2015-11-06T17:27:08Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/Mono.Data.Tds/4.0.0.0__0738eb9f132ed756/Mono.Data.Tds.dll" Guid="636d4cfc-d2b8-42a2-8940-e23617f95dda" Timestamp="2015-11-06T17:27:09Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.EnterpriseServices/4.0.0.0__b03f5f7f11d50a3a/System.EnterpriseServices.dll" Guid="b29d8850-0b83-4a7a-a7eb-9bf51b01d6fc" Timestamp="2015-11-06T17:27:08Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Web.ApplicationServices/4.0.0.0__31bf3856ad364e35/System.Web.ApplicationServices.dll" Guid="75f7affa-6922-4122-9719-32a61d3d4954" Timestamp="2015-11-06T17:27:21Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Runtime.Serialization.Formatters.Soap/4.0.0.0__b03f5f7f11d50a3a/System.Runtime.Serialization.Formatters.Soap.dll" Guid="03c2ff99-9841-4b67-920c-2173d9f6077e" Timestamp="2015-11-06T17:27:15Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Web.Services/4.0.0.0__b03f5f7f11d50a3a/System.Web.Services.dll" Guid="f4c88a89-682d-49e9-9841-b55a16ca4005" Timestamp="2015-11-06T17:27:30Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Design/4.0.0.0__b03f5f7f11d50a3a/System.Design.dll" Guid="7a94b628-aae2-4e56-86e8-9ede021126f3" Timestamp="2015-11-06T17:27:34Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Windows.Forms/4.0.0.0__b77a5c561934e089/System.Windows.Forms.dll" Guid="3189adb6-8dac-48b0-8a60-3132145849f3" Timestamp="2015-11-06T17:27:19Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/Mono.WebBrowser/4.0.0.0__0738eb9f132ed756/Mono.WebBrowser.dll" Guid="20829702-7642-4443-9849-00ef4e0bca31" Timestamp="2015-11-06T17:27:14Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/Accessibility/4.0.0.0__b03f5f7f11d50a3a/Accessibility.dll" Guid="9e94b9e2-f286-4eb3-9921-b096b131cb2d" Timestamp="2015-11-06T17:27:13Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.DirectoryServices/4.0.0.0__b03f5f7f11d50a3a/System.DirectoryServices.dll" Guid="bc2e1fec-6a16-4670-bcf1-b1ff0afb54dd" Timestamp="2015-11-06T17:27:23Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/Novell.Directory.Ldap/4.0.0.0__0738eb9f132ed756/Novell.Directory.Ldap.dll" Guid="15b25cb9-e1f8-46cb-aef1-bc0a3d4cfd1c" Timestamp="2015-11-06T17:27:22Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/Mono.Data.Sqlite/4.0.0.0__0738eb9f132ed756/Mono.Data.Sqlite.dll" Guid="fca92af3-4eaa-4b46-855c-8a732c484f5b" Timestamp="2015-11-06T17:27:20Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.ComponentModel.DataAnnotations/4.0.0.0__31bf3856ad364e35/System.ComponentModel.DataAnnotations.dll" Guid="bc7be87d-68ea-4af0-87fc-d9804fba0c9a" Timestamp="2015-11-06T17:27:13Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Web.Extensions/4.0.0.0__31bf3856ad364e35/System.Web.Extensions.dll" Guid="8eb558f6-eb3c-4979-a9c3-ee640b84c4f0" Timestamp="2015-11-06T17:27:57Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.ServiceModel/4.0.0.0__b77a5c561934e089/System.ServiceModel.dll" Guid="05f1f621-0d90-45ea-914e-2baf791cd591" Timestamp="2015-11-06T17:27:56Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Runtime.Serialization/4.0.0.0__b77a5c561934e089/System.Runtime.Serialization.dll" Guid="c362be9b-76f6-44a6-a146-3c73906e32db" Timestamp="2015-11-06T17:27:45Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.ServiceModel.Internals/0.0.0.0__b77a5c561934e089/System.ServiceModel.Internals.dll" Guid="d2dba038-ac2f-4365-8214-f60d65f7d525" Timestamp="2015-11-06T17:27:43Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.IdentityModel/4.0.0.0__b77a5c561934e089/System.IdentityModel.dll" Guid="5041d503-6631-408e-8bf6-291d85536d71" Timestamp="2015-11-06T17:27:50Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Messaging/4.0.0.0__b03f5f7f11d50a3a/System.Messaging.dll" Guid="b727eb72-f1e4-43a5-8ced-63aead43bb7f" Timestamp="2015-11-06T17:27:39Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/Mono.Messaging/4.0.0.0__0738eb9f132ed756/Mono.Messaging.dll" Guid="fd19639f-aa89-40f1-8254-d6cc1130f3d5" Timestamp="2015-11-06T17:27:39Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Configuration.Install/4.0.0.0__b03f5f7f11d50a3a/System.Configuration.Install.dll" Guid="a5b2d761-604b-4590-811e-d78c0429beaa" Timestamp="2015-11-06T17:27:36Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.ServiceModel.Activation/4.0.0.0__31bf3856ad364e35/System.ServiceModel.Activation.dll" Guid="e1586147-8a76-4ab3-9f4f-08f297617243" Timestamp="2015-11-06T17:27:54Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.IdentityModel.Selectors/4.0.0.0__b77a5c561934e089/System.IdentityModel.Selectors.dll" Guid="38ec5bfe-0b4b-4a45-8609-d80b31e676bd" Timestamp="2015-11-06T17:27:50Z" />
<LibraryInfo File="/Library/Frameworks/Mono.framework/Versions/4.2.1/lib/mono/gac/System.Data.Linq/4.0.0.0__b77a5c561934e089/System.Data.Linq.dll" Guid="30f84b90-4fda-45cc-ad7e-1c3d36b83d13" Timestamp="2015-11-06T17:27:47Z" />
</Members>
</LibraryCache>

View file

@ -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)

2
.gitignore vendored
View file

@ -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

View file

@ -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"

2
.zshrc
View file

@ -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

7
readme.md Normal file
View file

@ -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.

View file

@ -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)
}