Merge remote-tracking branch 'upstream/master'

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

common/helix/config.toml

@@ -1,4 +1,7 @@
-theme = "bogster"
+theme = "donokai"
 
 [keys.insert]
-j = { k = "normal_mode" }
+j = { k = "normal_mode" }
+
+# [editor]
+# mouse = false

common/helix/themes/donokai.toml

@@ -0,0 +1,89 @@
+# Author: Shafkath Shuhan <shafkathshuhannyc@gmail.com>
+
+"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"

common/kitty/kitty.conf

@@ -21,6 +21,10 @@ window_margin_width 0.0
 
 enabled_layouts tall:bias=50;full_size=1;mirrored=true
 
+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

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 = {