From d2db1381367381bcc2762d3d6e9159e0a95a7d6d Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 17 May 2022 10:37:44 -0500 Subject: [PATCH 1/2] Add font sizes for kitty for screensharing --- common/kitty/kitty.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/kitty/kitty.conf b/common/kitty/kitty.conf index 29976cb..64cb14d 100644 --- a/common/kitty/kitty.conf +++ b/common/kitty/kitty.conf @@ -19,6 +19,10 @@ adjust_line_height 0 window_padding_width 10.0 window_margin_width 0.0 +map ctrl+shift+1 change_font_size all 12.5 +map ctrl+shift+2 change_font_size all 18.5 +map ctrl+shift+3 change_font_size all 26 + map ctrl+shift+equal change_font_size all +0.5 map ctrl+shift+minus change_font_size all -0.5 map shift+insert paste_from_clipboard From ef1305ffc553f8797d751808b19377d56c7dd02d Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 18 May 2022 14:41:00 -0500 Subject: [PATCH 2/2] ElixirLS installation instruction embedded, switch to helix --- common/fish/vars.fish | 5 +- common/helix/config.toml | 5 ++ common/helix/themes/donokai.toml | 89 ++++++++++++++++++++++++++++++++ common/neovim/lua/lsp.lua | 9 ++++ 4 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 common/helix/themes/donokai.toml diff --git a/common/fish/vars.fish b/common/fish/vars.fish index 6514e7f..a6392ba 100644 --- a/common/fish/vars.fish +++ b/common/fish/vars.fish @@ -14,7 +14,10 @@ set --export --universal LESS "-r" set --export --universal MANPAGER 'env MANWIDTH="" nvim --cmd "let g:prosession_on_startup=0" +Man!' -if command --search --quiet nvim +if command --search --quiet hx + set --export --universal EDITOR hx + set --export --universal VISUAL hx +else if command --search --quiet nvim set --export --universal EDITOR nvim set --export --universal VISUAL nvim else if command --search --quiet vim diff --git a/common/helix/config.toml b/common/helix/config.toml index 168f24d..82b1d7c 100644 --- a/common/helix/config.toml +++ b/common/helix/config.toml @@ -1,2 +1,7 @@ +theme = "donokai" + [keys.insert] j = { k = "normal_mode" } + +# [editor] +# mouse = false \ No newline at end of file diff --git a/common/helix/themes/donokai.toml b/common/helix/themes/donokai.toml new file mode 100644 index 0000000..6b71a5a --- /dev/null +++ b/common/helix/themes/donokai.toml @@ -0,0 +1,89 @@ +# Author: Shafkath Shuhan + +"namespace" = { fg = "type" } +"module" = { fg = "type" } + +"type" = { fg = "type" } +"type.builtin" = { fg = "#66D9EF" } +"type.enum.variant" = { fg = "text" } +"constructor" = { fg = "text" } +"variable.other.member" = { fg = "variable" } + +"keyword" = { fg = "keyword" } +"keyword.directive" = { fg = "keyword" } +"keyword.control" = { fg = "keyword" } +"label" = { fg = "keyword" } + +"special" = { fg = "keyword" } +"operator" = { fg = "text" } + +"punctuation" = { fg = "text" } +"punctuation.delimiter" = { fg = "text" } + +"variable" = { fg = "variable" } +"variable.parameter" = { fg = "#fd971f" } +"variable.builtin" = { fg = "keyword" } +"constant" = { fg = "variable" } +"constant.builtin" = { fg = "#ae81ff" } + +"function" = { fg = "fn_declaration" } +"function.builtin" = { fg = "fn_declaration" } +"function.macro" = { fg = "keyword" } +"attribute" = { fg = "fn_declaration" } + +"comment" = { fg = "#88846F" } + +"string" = { fg = "#e6db74" } +"constant.character" = { fg = "#e6db74" } +"string.regexp" = { fg = "regex" } +"constant.numeric" = { fg = "#ae81ff" } +"constant.character.escape" = { fg = "#ae81ff" } + +"diff.plus" = { fg = "#a6e22e" } +"diff.delta" = { fg = "#fd971f" } +"diff.minus" = { fg = "#f92672" } + +# "ui.background" = { fg = "text", bg = "background" } + +"ui.window" = { bg = "widget" } +"ui.popup" = { bg = "widget" } +"ui.help" = { bg = "widget" } +"ui.menu.selected" = { bg = "widget" } + +"ui.cursor" = { fg = "cursor", modifiers = ["reversed"] } +"ui.cursor.primary" = { fg = "cursor", modifiers = ["reversed"] } +"ui.cursor.match" = { fg = "#888888", modifiers = ["reversed"] } + +"ui.selection" = { bg = "#878b91" } +"ui.selection.primary" = { bg = "#575b61" } + +"ui.linenr" = { fg = "#90908a" } +"ui.linenr.selected" = { fg = "#c2c2bf" } + +"ui.statusline" = { fg = "active_text", bg = "#333333" } +"ui.statusline.inactive" = { fg = "active_text", bg = "#222222" } + +"ui.text" = { fg = "text", bg = "background" } +"ui.text.focus" = { fg = "active_text" } + +"warning" = { fg = "#cca700" } +"error" = { fg = "#f48771" } +"info" = { fg = "#75beff" } +"hint" = { fg = "#eeeeeb3" } + +diagnostic = { modifiers = ["underlined"] } + +[palette] +type = "#A6E22E" +keyword = "#F92672" +regex = "#CE9178" +special = "#C586C0" +variable = "#F8F8F2" +fn_declaration = "#A6E22E" + +background = "#111111" +text = "#f8f8f2" +active_text = "#ffffff" +cursor = "#a6a6a6" +inactive_cursor = "#878b91" +widget = "#1e1f1c" diff --git a/common/neovim/lua/lsp.lua b/common/neovim/lua/lsp.lua index 06b1e8d..c37a9a7 100644 --- a/common/neovim/lua/lsp.lua +++ b/common/neovim/lua/lsp.lua @@ -43,6 +43,15 @@ local common_config = { }, } +--[[ + +curl -fLO https://github.com/elixir-lsp/elixir-ls/releases/latest/download/elixir-ls.zip +mkdir -p ~/.local/share/nvim/lsp_servers/elixir +unzip elixir-ls.zip -d ~/.local/share/nvim/lsp_servers/elixir/elixir-ls/ +chmod +x ~/.local/share/nvim/lsp_servers/elixir/elixir-ls/language_server.sh + +]] + local lsp_configs = { gopls = {}, elixirls = {