From 3a9d08eea1bbdcc96d7aab2040b804cfbd10fa67 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 20 Dec 2019 10:13:02 -0500 Subject: [PATCH 1/5] Formatting. --- tridactyl/themes/onedark.css | 193 ++++++++++++++++++----------------- 1 file changed, 98 insertions(+), 95 deletions(-) diff --git a/tridactyl/themes/onedark.css b/tridactyl/themes/onedark.css index e990e5c..d33d4e6 100644 --- a/tridactyl/themes/onedark.css +++ b/tridactyl/themes/onedark.css @@ -1,148 +1,151 @@ -:root { /* Onedark by Chris Kempson (http://chriskempson.com) */ - --base00: #282c34; - --base01: #353b45; - --base02: #3e4451; - --base03: #545862; - --base04: #565c64; - --base05: #abb2bf; - --base06: #b6bdca; - --base07: #c8ccd4; - --base08: #e06c75; - --base09: #d19a66; - --base0A: #e5c07b; - --base0B: #98c379; - --base0C: #56b6c2; - --base0D: #61afef; - --base0E: #c678dd; - --base0F: #be5046; +:root { + /* Onedark by Chris Kempson (http://chriskempson.com) */ + --base00: #282c34; + --base01: #353b45; + --base02: #3e4451; + --base03: #545862; + --base04: #565c64; + --base05: #abb2bf; + --base06: #b6bdca; + --base07: #c8ccd4; + --base08: #e06c75; + --base09: #d19a66; + --base0A: #e5c07b; + --base0B: #98c379; + --base0C: #56b6c2; + --base0D: #61afef; + --base0E: #c678dd; + --base0F: #be5046; - --tridactyl-fg: var(--base06); - --tridactyl-bg: var(--base00); - --tridactyl-url-fg: var(--base0D); - --tridactyl-url-bg: var(--base00); - --tridactyl-highlight-box-bg: var(--base0B); - --tridactyl-highlight-box-fg: var(--base00); + --tridactyl-fg: var(--base06); + --tridactyl-bg: var(--base00); + --tridactyl-url-fg: var(--base0D); + --tridactyl-url-bg: var(--base00); + --tridactyl-highlight-box-bg: var(--base0B); + --tridactyl-highlight-box-fg: var(--base00); - --tridactyl-of-fg: var(--base00); - --tridactyl-of-bg: var(--base0D); + --tridactyl-of-fg: var(--base00); + --tridactyl-of-bg: var(--base0D); - /* Hint character tags */ - --tridactyl-hintspan-fg: var(--base00) !important; - --tridactyl-hintspan-bg: var(--base0A) !important; + /* Hint character tags */ + --tridactyl-hintspan-fg: var(--base00) !important; + --tridactyl-hintspan-bg: var(--base0A) !important; - /* Element Highlights */ - --tridactyl-hint-active-fg: none; - --tridactyl-hint-active-bg: none; - --tridactyl-hint-active-outline: none; - --tridactyl-hint-bg: none; - --tridactyl-hint-outline: none; + /* Element Highlights */ + --tridactyl-hint-active-fg: none; + --tridactyl-hint-active-bg: none; + --tridactyl-hint-active-outline: none; + --tridactyl-hint-bg: none; + --tridactyl-hint-outline: none; } #command-line-holder { - border-top: 1px solid var(--base0B); - color: var(--tridactyl-bg); - order: 1; + border-top: 1px solid var(--base0B); + color: var(--tridactyl-bg); + order: 1; } #tridactyl-colon { - color: var(--base0B); - padding: 0.25rem; + color: var(--base0B); + padding: 0.25rem; } #completions .sectionHeader { - display: none; + display: none; } #tridactyl-input { - background: var(--tridactyl-bg); - color: var(--tridactyl-fg); - font-size: 9pt; - line-height: 1.2; - padding-left: unset; - padding: 0.125rem; - vertical-align: middle; + background: var(--tridactyl-bg); + color: var(--tridactyl-fg); + font-size: 9pt; + line-height: 1.2; + padding-left: unset; + padding: 0.125rem; + vertical-align: middle; } #completions table { - border-spacing: 0; - font-size: 1; - /* font-weight: 200; */ - padding-top: 0; - padding: 0.2rem; - table-layout: fixed; + border-spacing: 0; + font-size: 1; + /* font-weight: 200; */ + padding-top: 0; + padding: 0.2rem; + table-layout: fixed; } #completions > div { - max-height: calc(20 * var(--option-height)); - min-height: calc(10 * var(--option-height)); + max-height: calc(20 * var(--option-height)); + min-height: calc(10 * var(--option-height)); } #completions { - --option-height: 1.4em; - background: var(--tridactyl-bg); - border-top: unset; - color: var(--tridactyl-fg); - font-size: unset; - /* font-weight: 200; */ - overflow: hidden; - width: 100%; + --option-height: 1.4em; + background: var(--tridactyl-bg); + border-top: unset; + color: var(--tridactyl-fg); + font-size: unset; + /* font-weight: 200; */ + overflow: hidden; + width: 100%; } #completions .optionContainer .option { - line-height: 1.4; + line-height: 1.4; } #completions .HistoryCompletionSource table { - border-spacing: 0; - font-size: 9pt; - table-layout: fixed; - width: 100%; + border-spacing: 0; + font-size: 9pt; + table-layout: fixed; + 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 { - width: unset; - font-size: unset; - border-spacing: unset; - table-layout: unset; + width: unset; + font-size: unset; + border-spacing: unset; + table-layout: unset; } #completions table tr .title { - width: 50%; + width: 50%; } #completions table tr { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } #completions .sectionHeader { - display: none; + display: none; } -#cmdline_iframe { position: fixed !important; - box-shadow: rgba(0, 0, 0, 0.5) 20px !important; +#cmdline_iframe { + position: fixed !important; + box-shadow: rgba(0, 0, 0, 0.5) 20px !important; } .TridactylStatusIndicator { - background: var(--tridactyl-bg) !important; - border: 1px var(--tridactyl-bg) solid !important; - color: var(--base0B); - border: unset !important; - bottom: 0 !important; - font-size: 10pt !important; - padding: 0.8ex !important; - position: fixed !important; + background: var(--tridactyl-bg) !important; + border: 1px var(--tridactyl-bg) solid !important; + color: var(--base0B); + border: unset !important; + bottom: 0 !important; + font-size: 10pt !important; + padding: 0.8ex !important; + position: fixed !important; } -.TridactylModeignore{ - background: var(--base0A) !important; - border: 1px var(--base0A) solid !important; - color: var(--tridactyl-of-fg) !important; -} - -.TridactylModenormal{ +.TridactylModeignore { + background: var(--base0A) !important; + border: 1px var(--base0A) solid !important; + color: var(--tridactyl-of-fg) !important; } From dcfa3ee35ab7521a7e8ac80aa3c094e4959c6225 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 20 Dec 2019 10:13:20 -0500 Subject: [PATCH 2/5] Added LSP java support, and switch to using grip. --- emacs/doom.d/init.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emacs/doom.d/init.el b/emacs/doom.d/init.el index b930e67..5b4aa31 100644 --- a/emacs/doom.d/init.el +++ b/emacs/doom.d/init.el @@ -117,14 +117,14 @@ ;;(haskell +intero) ; a language that's lazier than I am ;;hy ; readability of scheme w/ speed of python ;;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)))))) ;;julia ; a better, faster MATLAB ;;kotlin ; a better, slicker Java(Script) ;;latex ; writing papers in Emacs has never been so fun ;;ledger ; an accounting system in Emacs ;;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 ;;nix ; I hereby declare "nix geht mehr!" ;;ocaml ; an objective camel From eca15345cfbaa1633cc0c511e4fdc3f7d8bebd7f Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 20 Dec 2019 10:13:54 -0500 Subject: [PATCH 3/5] Added env specific zsh. --- zsh/environment/host/wok/zshenv | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 zsh/environment/host/wok/zshenv diff --git a/zsh/environment/host/wok/zshenv b/zsh/environment/host/wok/zshenv new file mode 100644 index 0000000..82dcad4 --- /dev/null +++ b/zsh/environment/host/wok/zshenv @@ -0,0 +1,3 @@ +export GOPATH="${HOME}/.go" +PSQLAPP="/Applications/Postgres.app/Contents/Versions/latest" +export PATH="$PATH:${GOPATH}/bin:${PSQLAPP}/bin" From c4164786b4dc4ab9a36771436fe877b37040ca6c Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 20 Dec 2019 10:14:15 -0500 Subject: [PATCH 4/5] Zplug can now install it self better. --- zsh/makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/zsh/makefile b/zsh/makefile index a3582e4..796ea1e 100644 --- a/zsh/makefile +++ b/zsh/makefile @@ -11,6 +11,7 @@ init: ifeq ($(shell [ ! -e $(ZPLUG_DIR) ] $(return_val_truthy) ), true) export ZPLUG_HOME=$(ZPLUG_DIR) \ ; git clone https://github.com/zplug/zplug $(ZPLUG_DIR) \ + ; source ~/.zplug/init.zsh && zplug update --self \ ; $(report) "zplug installed" endif $(mk_link) $(SRC) ~/.zsh From 9a0c16def293edf2fbaa4897a6a555df80d41f55 Mon Sep 17 00:00:00 2001 From: James Patrick Date: Fri, 20 Dec 2019 10:21:50 -0500 Subject: [PATCH 5/5] Inverted SSH_CONNECTION logic that I broke to test. --- zsh/zplug | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh/zplug b/zsh/zplug index 675c719..20f6101 100755 --- a/zsh/zplug +++ b/zsh/zplug @@ -60,7 +60,7 @@ zplug "${ZDIR}/modules/alias/", \ from:local, \ as:plugin -if [ -z "$SSH_CONNECTION" ] ; then +if [ -n "$SSH_CONNECTION" ] ; then zplug "${ZDIR}/modules/prompt/",\ from:local,\ use:uncommon.zsh, \