Merge branch 'master' of https://git.jpatrick.io/james/dotfiles
This commit is contained in:
		
						commit
						a8a91d91a4
					
				| 
						 | 
					@ -117,14 +117,14 @@
 | 
				
			||||||
       ;;(haskell +intero) ; a language that's lazier than I am
 | 
					       ;;(haskell +intero) ; a language that's lazier than I am
 | 
				
			||||||
       ;;hy                ; readability of scheme w/ speed of python
 | 
					       ;;hy                ; readability of scheme w/ speed of python
 | 
				
			||||||
       ;;idris             ;
 | 
					       ;;idris             ;
 | 
				
			||||||
       ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
 | 
					       (java +lsp)         ; the poster child for carpal tunnel syndrome
 | 
				
			||||||
       javascript          ; all(hope(abandon(ye(who(enter(here))))))
 | 
					       javascript          ; all(hope(abandon(ye(who(enter(here))))))
 | 
				
			||||||
       ;;julia             ; a better, faster MATLAB
 | 
					       ;;julia             ; a better, faster MATLAB
 | 
				
			||||||
       ;;kotlin            ; a better, slicker Java(Script)
 | 
					       ;;kotlin            ; a better, slicker Java(Script)
 | 
				
			||||||
       ;;latex             ; writing papers in Emacs has never been so fun
 | 
					       ;;latex             ; writing papers in Emacs has never been so fun
 | 
				
			||||||
       ;;ledger            ; an accounting system in Emacs
 | 
					       ;;ledger            ; an accounting system in Emacs
 | 
				
			||||||
       ;;lua               ; one-based indices? one-based indices
 | 
					       ;;lua               ; one-based indices? one-based indices
 | 
				
			||||||
       markdown            ; writing docs for people to ignore
 | 
					       (markdown +grip)    ; writing docs for people to ignore
 | 
				
			||||||
       ;;nim               ; python + lisp at the speed of c
 | 
					       ;;nim               ; python + lisp at the speed of c
 | 
				
			||||||
       ;;nix               ; I hereby declare "nix geht mehr!"
 | 
					       ;;nix               ; I hereby declare "nix geht mehr!"
 | 
				
			||||||
       ;;ocaml             ; an objective camel
 | 
					       ;;ocaml             ; an objective camel
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,148 +1,151 @@
 | 
				
			||||||
:root {    /* Onedark by Chris Kempson (http://chriskempson.com) */
 | 
					:root {
 | 
				
			||||||
    --base00: #282c34;
 | 
					  /* Onedark by Chris Kempson (http://chriskempson.com) */
 | 
				
			||||||
    --base01: #353b45;
 | 
					  --base00: #282c34;
 | 
				
			||||||
    --base02: #3e4451;
 | 
					  --base01: #353b45;
 | 
				
			||||||
    --base03: #545862;
 | 
					  --base02: #3e4451;
 | 
				
			||||||
    --base04: #565c64;
 | 
					  --base03: #545862;
 | 
				
			||||||
    --base05: #abb2bf;
 | 
					  --base04: #565c64;
 | 
				
			||||||
    --base06: #b6bdca;
 | 
					  --base05: #abb2bf;
 | 
				
			||||||
    --base07: #c8ccd4;
 | 
					  --base06: #b6bdca;
 | 
				
			||||||
    --base08: #e06c75;
 | 
					  --base07: #c8ccd4;
 | 
				
			||||||
    --base09: #d19a66;
 | 
					  --base08: #e06c75;
 | 
				
			||||||
    --base0A: #e5c07b;
 | 
					  --base09: #d19a66;
 | 
				
			||||||
    --base0B: #98c379;
 | 
					  --base0A: #e5c07b;
 | 
				
			||||||
    --base0C: #56b6c2;
 | 
					  --base0B: #98c379;
 | 
				
			||||||
    --base0D: #61afef;
 | 
					  --base0C: #56b6c2;
 | 
				
			||||||
    --base0E: #c678dd;
 | 
					  --base0D: #61afef;
 | 
				
			||||||
    --base0F: #be5046;
 | 
					  --base0E: #c678dd;
 | 
				
			||||||
 | 
					  --base0F: #be5046;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    --tridactyl-fg: var(--base06);
 | 
					  --tridactyl-fg: var(--base06);
 | 
				
			||||||
    --tridactyl-bg: var(--base00);
 | 
					  --tridactyl-bg: var(--base00);
 | 
				
			||||||
    --tridactyl-url-fg: var(--base0D);
 | 
					  --tridactyl-url-fg: var(--base0D);
 | 
				
			||||||
    --tridactyl-url-bg: var(--base00);
 | 
					  --tridactyl-url-bg: var(--base00);
 | 
				
			||||||
    --tridactyl-highlight-box-bg: var(--base0B);
 | 
					  --tridactyl-highlight-box-bg: var(--base0B);
 | 
				
			||||||
    --tridactyl-highlight-box-fg: var(--base00);
 | 
					  --tridactyl-highlight-box-fg: var(--base00);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    --tridactyl-of-fg: var(--base00);
 | 
					  --tridactyl-of-fg: var(--base00);
 | 
				
			||||||
    --tridactyl-of-bg: var(--base0D);
 | 
					  --tridactyl-of-bg: var(--base0D);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Hint character tags */
 | 
					  /* Hint character tags */
 | 
				
			||||||
    --tridactyl-hintspan-fg: var(--base00) !important;
 | 
					  --tridactyl-hintspan-fg: var(--base00) !important;
 | 
				
			||||||
    --tridactyl-hintspan-bg: var(--base0A) !important;
 | 
					  --tridactyl-hintspan-bg: var(--base0A) !important;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Element Highlights */
 | 
					  /* Element Highlights */
 | 
				
			||||||
    --tridactyl-hint-active-fg: none;
 | 
					  --tridactyl-hint-active-fg: none;
 | 
				
			||||||
    --tridactyl-hint-active-bg: none;
 | 
					  --tridactyl-hint-active-bg: none;
 | 
				
			||||||
    --tridactyl-hint-active-outline: none;
 | 
					  --tridactyl-hint-active-outline: none;
 | 
				
			||||||
    --tridactyl-hint-bg: none;
 | 
					  --tridactyl-hint-bg: none;
 | 
				
			||||||
    --tridactyl-hint-outline: none;
 | 
					  --tridactyl-hint-outline: none;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#command-line-holder {
 | 
					#command-line-holder {
 | 
				
			||||||
    border-top: 1px solid var(--base0B);
 | 
					  border-top: 1px solid var(--base0B);
 | 
				
			||||||
    color: var(--tridactyl-bg);
 | 
					  color: var(--tridactyl-bg);
 | 
				
			||||||
    order: 1;
 | 
					  order: 1;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#tridactyl-colon {
 | 
					#tridactyl-colon {
 | 
				
			||||||
    color: var(--base0B);
 | 
					  color: var(--base0B);
 | 
				
			||||||
    padding: 0.25rem;
 | 
					  padding: 0.25rem;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#completions .sectionHeader {
 | 
					#completions .sectionHeader {
 | 
				
			||||||
    display: none;
 | 
					  display: none;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#tridactyl-input {
 | 
					#tridactyl-input {
 | 
				
			||||||
    background: var(--tridactyl-bg);
 | 
					  background: var(--tridactyl-bg);
 | 
				
			||||||
    color: var(--tridactyl-fg);
 | 
					  color: var(--tridactyl-fg);
 | 
				
			||||||
    font-size: 9pt;
 | 
					  font-size: 9pt;
 | 
				
			||||||
    line-height: 1.2;
 | 
					  line-height: 1.2;
 | 
				
			||||||
    padding-left: unset;
 | 
					  padding-left: unset;
 | 
				
			||||||
    padding: 0.125rem;
 | 
					  padding: 0.125rem;
 | 
				
			||||||
    vertical-align: middle;
 | 
					  vertical-align: middle;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#completions table {
 | 
					#completions table {
 | 
				
			||||||
    border-spacing: 0;
 | 
					  border-spacing: 0;
 | 
				
			||||||
    font-size: 1;
 | 
					  font-size: 1;
 | 
				
			||||||
    /* font-weight: 200; */
 | 
					  /* font-weight: 200; */
 | 
				
			||||||
    padding-top: 0;
 | 
					  padding-top: 0;
 | 
				
			||||||
    padding: 0.2rem;
 | 
					  padding: 0.2rem;
 | 
				
			||||||
    table-layout: fixed;
 | 
					  table-layout: fixed;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#completions > div {
 | 
					#completions > div {
 | 
				
			||||||
    max-height: calc(20 * var(--option-height));
 | 
					  max-height: calc(20 * var(--option-height));
 | 
				
			||||||
    min-height: calc(10 * var(--option-height));
 | 
					  min-height: calc(10 * var(--option-height));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#completions {
 | 
					#completions {
 | 
				
			||||||
    --option-height: 1.4em;
 | 
					  --option-height: 1.4em;
 | 
				
			||||||
    background: var(--tridactyl-bg);
 | 
					  background: var(--tridactyl-bg);
 | 
				
			||||||
    border-top: unset;
 | 
					  border-top: unset;
 | 
				
			||||||
    color: var(--tridactyl-fg);
 | 
					  color: var(--tridactyl-fg);
 | 
				
			||||||
    font-size: unset;
 | 
					  font-size: unset;
 | 
				
			||||||
    /* font-weight: 200; */
 | 
					  /* font-weight: 200; */
 | 
				
			||||||
    overflow: hidden;
 | 
					  overflow: hidden;
 | 
				
			||||||
    width: 100%;
 | 
					  width: 100%;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#completions .optionContainer .option {
 | 
					#completions .optionContainer .option {
 | 
				
			||||||
    line-height: 1.4;
 | 
					  line-height: 1.4;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#completions .HistoryCompletionSource table {
 | 
					#completions .HistoryCompletionSource table {
 | 
				
			||||||
    border-spacing: 0;
 | 
					  border-spacing: 0;
 | 
				
			||||||
    font-size: 9pt;
 | 
					  font-size: 9pt;
 | 
				
			||||||
    table-layout: fixed;
 | 
					  table-layout: fixed;
 | 
				
			||||||
    width: 100%;
 | 
					  width: 100%;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#completions table tr td.prefix,#completions table tr td.privatewindow,#completions table tr td.container,#completions table tr td.icon {    display: none;
 | 
					#completions table tr td.prefix,
 | 
				
			||||||
 | 
					#completions table tr td.privatewindow,
 | 
				
			||||||
 | 
					#completions table tr td.container,
 | 
				
			||||||
 | 
					#completions table tr td.icon {
 | 
				
			||||||
 | 
					  display: none;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#completions .BufferCompletionSource table {
 | 
					#completions .BufferCompletionSource table {
 | 
				
			||||||
    width: unset;
 | 
					  width: unset;
 | 
				
			||||||
    font-size: unset;
 | 
					  font-size: unset;
 | 
				
			||||||
    border-spacing: unset;
 | 
					  border-spacing: unset;
 | 
				
			||||||
    table-layout: unset;
 | 
					  table-layout: unset;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#completions table tr .title {
 | 
					#completions table tr .title {
 | 
				
			||||||
    width: 50%;
 | 
					  width: 50%;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#completions table tr {
 | 
					#completions table tr {
 | 
				
			||||||
    white-space: nowrap;
 | 
					  white-space: nowrap;
 | 
				
			||||||
    overflow: hidden;
 | 
					  overflow: hidden;
 | 
				
			||||||
    text-overflow: ellipsis;
 | 
					  text-overflow: ellipsis;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#completions .sectionHeader {
 | 
					#completions .sectionHeader {
 | 
				
			||||||
    display: none;
 | 
					  display: none;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#cmdline_iframe {    position: fixed !important;
 | 
					#cmdline_iframe {
 | 
				
			||||||
    box-shadow: rgba(0, 0, 0, 0.5) 20px !important;
 | 
					  position: fixed !important;
 | 
				
			||||||
 | 
					  box-shadow: rgba(0, 0, 0, 0.5) 20px !important;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.TridactylStatusIndicator {
 | 
					.TridactylStatusIndicator {
 | 
				
			||||||
    background: var(--tridactyl-bg) !important;
 | 
					  background: var(--tridactyl-bg) !important;
 | 
				
			||||||
    border: 1px var(--tridactyl-bg) solid !important;
 | 
					  border: 1px var(--tridactyl-bg) solid !important;
 | 
				
			||||||
    color:  var(--base0B);
 | 
					  color: var(--base0B);
 | 
				
			||||||
    border: unset !important;
 | 
					  border: unset !important;
 | 
				
			||||||
    bottom: 0 !important;
 | 
					  bottom: 0 !important;
 | 
				
			||||||
    font-size: 10pt !important;
 | 
					  font-size: 10pt !important;
 | 
				
			||||||
    padding: 0.8ex !important;
 | 
					  padding: 0.8ex !important;
 | 
				
			||||||
    position: fixed !important;
 | 
					  position: fixed !important;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.TridactylModeignore{
 | 
					.TridactylModeignore {
 | 
				
			||||||
    background: var(--base0A) !important;
 | 
					  background: var(--base0A) !important;
 | 
				
			||||||
    border: 1px var(--base0A) solid !important;
 | 
					  border: 1px var(--base0A) solid !important;
 | 
				
			||||||
    color:  var(--tridactyl-of-fg) !important;
 | 
					  color: var(--tridactyl-of-fg) !important;
 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
.TridactylModenormal{
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										3
									
								
								zsh/environment/host/wok/zshenv
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								zsh/environment/host/wok/zshenv
									
									
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,3 @@
 | 
				
			||||||
 | 
					export GOPATH="${HOME}/.go"
 | 
				
			||||||
 | 
					PSQLAPP="/Applications/Postgres.app/Contents/Versions/latest"
 | 
				
			||||||
 | 
					export PATH="$PATH:${GOPATH}/bin:${PSQLAPP}/bin"
 | 
				
			||||||
| 
						 | 
					@ -11,6 +11,7 @@ init:
 | 
				
			||||||
ifeq ($(shell [ ! -e $(ZPLUG_DIR) ] $(return_val_truthy) ), true)
 | 
					ifeq ($(shell [ ! -e $(ZPLUG_DIR) ] $(return_val_truthy) ), true)
 | 
				
			||||||
	export ZPLUG_HOME=$(ZPLUG_DIR) \
 | 
						export ZPLUG_HOME=$(ZPLUG_DIR) \
 | 
				
			||||||
  ; git clone https://github.com/zplug/zplug $(ZPLUG_DIR) \
 | 
					  ; git clone https://github.com/zplug/zplug $(ZPLUG_DIR) \
 | 
				
			||||||
 | 
					  ; source ~/.zplug/init.zsh && zplug update --self \
 | 
				
			||||||
  ; $(report) "zplug installed"
 | 
					  ; $(report) "zplug installed"
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
	$(mk_link) $(SRC) ~/.zsh
 | 
						$(mk_link) $(SRC) ~/.zsh
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -60,7 +60,7 @@ zplug "${ZDIR}/modules/alias/", \
 | 
				
			||||||
      from:local, \
 | 
					      from:local, \
 | 
				
			||||||
      as:plugin
 | 
					      as:plugin
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if [ -z "$SSH_CONNECTION" ] ; then
 | 
					if [ -n "$SSH_CONNECTION" ] ; then
 | 
				
			||||||
      zplug "${ZDIR}/modules/prompt/",\
 | 
					      zplug "${ZDIR}/modules/prompt/",\
 | 
				
			||||||
            from:local,\
 | 
					            from:local,\
 | 
				
			||||||
            use:uncommon.zsh, \
 | 
					            use:uncommon.zsh, \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user