improvements and font change

README.md

@@ -2,6 +2,7 @@
 
 ## Dependencies
 
+- alacritty
 - zsh
 - homebrew/linuxbrew
 - stow

alacritty/.config/alacritty/alacritty.toml

@@ -0,0 +1,19 @@
+import = ["/home/ink/.config/alacritty/dracula.toml"]
+[font]
+size = 12.0
+
+[font.bold]
+family = "jetbrainsmono nerd font"
+style = "Bold"
+
+[font.bold_italic]
+family = "jetbrainsmono nerd font"
+style = "Bold Italic"
+
+[font.italic]
+family = "jetbrainsmono nerd font"
+style = "Italic"
+
+[font.normal]
+family = "jetbrainsmono nerd font"
+style = "Regular"

alacritty/.config/alacritty/dracula.toml

@@ -0,0 +1,76 @@
+# Dracula theme for Alacritty
+# https://draculatheme.com/alacritty
+#
+# Color palette
+# https://spec.draculatheme.com
+#
+# Instructions
+# https://github.com/alacritty/alacritty/blob/master/extra/man/alacritty.5.scd
+
+[colors.primary]
+
+background = "#282a36"
+foreground = "#f8f8f2"
+bright_foreground = "#ffffff"
+
+[colors.cursor]
+
+text = "#282a36"
+cursor = "#f8f8f2"
+
+[colors.vi_mode_cursor]
+
+text = "CellBackground"
+cursor = "CellForeground"
+
+[colors.selection]
+
+text = "CellForeground"
+background = "#44475a"
+
+[colors.normal]
+
+black = "#21222c"
+red = "#ff5555"
+green = "#50fa7b"
+yellow = "#f1fa8c"
+blue = "#bd93f9"
+magenta = "#ff79c6"
+cyan = "#8be9fd"
+white = "#f8f8f2"
+
+[colors.bright]
+
+black = "#6272a4"
+red = "#ff6e6e"
+green = "#69ff94"
+yellow = "#ffffa5"
+blue = "#d6acff"
+magenta = "#ff92df"
+cyan = "#a4ffff"
+white = "#ffffff"
+
+[colors.search.matches]
+
+foreground = "#44475a"
+background = "#50fa7b"
+
+[colors.search.focused_match]
+
+foreground = "#44475a"
+background = "#ffb86c"
+
+[colors.footer_bar]
+
+background = "#282a36"
+foreground = "#f8f8f2"
+
+[colors.hints.start]
+
+foreground = "#282a36"
+background = "#f1fa8c"
+
+[colors.hints.end]
+
+foreground = "#f1fa8c"
+background = "#282a36"

curl/.curl-format.txt

@@ -0,0 +1,8 @@
+     time_namelookup:  %{time_namelookup}s\n
+        time_connect:  %{time_connect}s\n
+     time_appconnect:  %{time_appconnect}s\n
+    time_pretransfer:  %{time_pretransfer}s\n
+       time_redirect:  %{time_redirect}s\n
+  time_starttransfer:  %{time_starttransfer}s\n
+                     ----------\n
+          time_total:  %{time_total}s\n

nvim/.config/nvim/after/ftplugin/rust.lua

@@ -0,0 +1,21 @@
+local bufnr = vim.api.nvim_get_current_buf()
+vim.keymap.set("n", "<leader>a", function()
+	vim.cmd.RustLsp("codeAction") -- supports rust-analyzer's grouping
+	-- or vim.lsp.buf.codeAction() if you don't want grouping.
+end, { silent = true, buffer = bufnr })
+vim.keymap.set(
+	"n",
+	"K", -- Override Neovim's built-in hover keymap with rustaceanvim's hover actions
+	function()
+		vim.cmd.RustLsp({ "hover", "actions" })
+	end,
+	{ silent = true, buffer = bufnr }
+)
+vim.keymap.set(
+	"n",
+	"<leader>?", -- Override Neovim's built-in hover keymap with rustaceanvim's hover actions
+	function()
+		vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
+	end,
+	{ buffer = bufnr }
+)

nvim/.config/nvim/lua/plugins/completion.lua

@@ -37,7 +37,7 @@ return {
 			-- 'enter' for mappings similar to 'super-tab' but with 'enter' to accept
 			-- See the full "keymap" documentation for information on defining your own keymap.
 			keymap = {
-				preset = "enter",
+				preset = "super-tab",
 			},
 
 			completion = {
@@ -223,11 +223,11 @@ return {
 		opts = {
 			servers = {
 				-- brew install rust-analyzer
-				rust_analyzer = {
-					settings = {
-						["rust-analyzer"] = {},
-					},
-				},
+				-- rust_analyzer = {
+				-- 	settings = {
+				-- 		["rust-analyzer"] = {},
+				-- 	},
+				-- },
 				-- brew install bash-language-server
 				bashls = {},
 				--	lua_ls = {
@@ -257,4 +257,30 @@ return {
 			end
 		end,
 	},
+	{
+		"mrcjkb/rustaceanvim",
+		version = "^5", -- Recommended
+		lazy = false, -- This plugin is already lazy
+		config = function()
+			vim.g.rustaceanvim = {
+				tools = {
+					float_win_config = {
+						border = {
+							{ "╭", "FloatBorder" },
+							{ "─", "FloatBorder" },
+							{ "╮", "FloatBorder" },
+							{ "│", "FloatBorder" },
+							{ "╯", "FloatBorder" },
+							{ "─", "FloatBorder" },
+							{ "╰", "FloatBorder" },
+							{ "│", "FloatBorder" },
+						},
+						max_width = nil,
+						max_height = nil,
+						auto_focus = true,
+					},
+				},
+			}
+		end,
+	},
 }

tmux/.tmux.conf

@@ -4,39 +4,8 @@ set -g @plugin 'tmux-plugins/tmux-sensible'
 
 set -g @plugin 'tmux-plugins/tmux-resurrect'
 set -g @plugin 'tmux-plugins/tmux-continuum'
+set -g @plugin 'tmux-plugins/tmux-open'
 
-set -g @continuum-boot 'on'
-
-set -g @continuum-boot-options 'iterm,fullscreen'
-
-set -g @plugin 'dracula/tmux'
-
-# set -Fg 'status-format[1]' '#{status-format[0]}'
-# set -g 'status-format[0]' ''
-# set -g status 2
-
-set -g @dracula-plugins "git weather time battery"
-set -g @dracula-show-fahrenheit false
-set -g @dracula-fixed-location "Madrid"
-set -g @dracula-show-powerline false
-set -g @dracula-transparent-powerline-bg true
-set -g @dracula-military-time true
-set -g @dracula-day-month true
-
-set -g @plugin 'ofirgall/tmux-window-name'
-set -g @tmux_window_name_substitute_sets "[('.+bash', 'bash')]"
-set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh']"
-set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
-set -g @tmux_window_name_use_tilde "True"
-set -g @tmux_window_name_max_name_len "100"
-# set-option -g default-shell $SHELL
-# set -g default-command "$SHELL -i"
-
-# Other examples:
-# set -g @plugin 'github_username/plugin_name'
-# set -g @plugin 'github_username/plugin_name#branch'
-# set -g @plugin 'git@github.com:user/plugin'
-# set -g @plugin 'git@bitbucket.com:user/plugin'
 bind r source-file ~/.tmux.conf \; display "Reloaded!" # Reload with ctrl-r
 set -sg escape-time 1 # quicker responses
 
@@ -63,8 +32,48 @@ bind-key -n C-S-Right swap-window -t +1\; select-window -t +1
 
 setw -g mode-keys vi
 
+set-option -g default-shell $SHELL
+set -g default-command "$SHELL -i"
+
+set-option -sa terminal-features ',alacritty:RGB'
+set-option -ga terminal-features ",alacritty:usstyle"
+set-option -ga terminal-overrides ',alacritty:Tc'
+set -g default-terminal "alacritty"
+
+set -g @plugin 'dracula/tmux'
+
+set -g @resurrect-capture-pane-contents 'on'
+set -g @resurrect-dir '~/.tmux/resurrect/'
+
+set -g @continuum-save-interval '15'
+set -g @continuum-restore 'on'
+set -g @continuum-boot 'on'
+
+### tmux-resurrect
+set -g @resurrect-save 'S'     # prefix + Shift-s - save
+set -g @resurrect-restore 'R'  # prefix + Shift-r - restore
+# for neovim
+set -g @resurrect-strategy-nvim 'session'
+
+set -g @continuum-boot-options 'alacritty,fullscreen'
+
+set -g @dracula-plugins "git weather time battery"
+set -g @dracula-show-fahrenheit false
+set -g @dracula-fixed-location "Madrid"
+set -g @dracula-show-powerline false
+set -g @dracula-transparent-powerline-bg true
+set -g @dracula-military-time true
+set -g @dracula-day-month true
+
+set -g @plugin 'ofirgall/tmux-window-name'
+set -g @tmux_window_name_substitute_sets "[('.+bash', 'bash')]"
+set -g @tmux_window_name_shells "['bash', 'fish', 'sh', 'zsh']"
+set -g @tmux_window_dir_programs "['nvim', 'vim', 'vi', 'git']"
+set -g @tmux_window_name_use_tilde "True"
+set -g @tmux_window_name_max_name_len "100"
+
 # decide whether we're in a Vim process
- is_vim="~/.is_vim.sh '#{pane_tty}'"
+is_vim="~/.is_vim.sh '#{pane_tty}'"
 
 
 bind-key -n 'S-Left' if-shell "$is_vim" 'send-keys S-Left' 'select-pane -L'

zsh/.zsh_aliases

@@ -23,7 +23,6 @@ for index ({1..9}) alias "c$index"="cd +${index}"; unset index
 # alias tgg="aws-vault exec feedzai-main -d 8h -- terragrunt graph-dependencies"
 
 alias idot='dot -Tsvg -Goverlap=scale -Grankdir=RL -Gbgcolor="#282a36" -Ncolor="#f8f8f2" -Ecolor="#f8f8f2" -Nfontcolor="#f8f8f2" -Gfontname="PragmataPro Mono Liga Regular" -Gfontsize=13 -Nfontname="PragmataPro" -Nfontsize=13 -Nshape=box -Earrowhead=normal'
-alias icat="kitty +kitten icat"
 
 alias curltime="curl -w \"@$HOME/.curl-format.txt\" -o /dev/null -s "
 

zsh/.zshrc

@@ -8,6 +8,8 @@ setopt HIST_IGNORE_SPACE         # Do not record an event starting with a space.
 unsetopt HIST_SAVE_NO_DUPS         # Do not write a duplicate event to the history file.
 setopt SHARE_HISTORY             # Share history between all sessions.
 
+bindkey '^R' history-incremental-search-backward
+
 setopt AUTO_PUSHD           # Push the current directory visited on the stack.
 setopt PUSHD_IGNORE_DUPS    # Do not store duplicates in the stack.
 setopt PUSHD_SILENT         # Do not print the directory stack after pushd or popd.