Merge pull request 'Release 1.0' (#31) from main into development (#35)

Reviewed-on: #35

nvim/dot-config/nvim/lua/plugins/lsp-config.lua

@@ -11,7 +11,6 @@ return {
 			require("mason-lspconfig").setup({
 				ensure_installed = {
 					"clangd",
-					"cmake",
 					"lua_ls",
 					"pyright",
 					"rust_analyzer",
@@ -28,9 +27,6 @@ return {
 			lspconfig.clangd.setup({
 				capabilities = capabilities
 			})
-			lspconfig.cmake.setup({
-				capabilities = capabilities
-			})
 			lspconfig.lua_ls.setup({
 				capabilities = capabilities
 			})

tmux/dot-config/tmux/tmux.conf

@@ -1,11 +1,21 @@
 set -g prefix ^A
 
-set -g @plugin 'fabioluciano/tmux-tokyo-night'
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'janoamaral/tokyo-night-tmux'
+
+# Tokyo Night config
+set -g @tokyo-night-tmux_theme 'storm'
+set -g @tokyo-night-tmux_show_netspeed 1
+set -g @tokyo-night-tmux_netspeed_iface "wlp4s0"
+set -g @tokyo-night-tmux_window_id_style dsquare
+
+# Set mouse on so that we can scroll with the mouse
+set -g mouse on
+
+# Set status bar to bottom
+set -g status-position bottom
 
-set -g @theme_variation 'moon' 
-set -g @theme_disable_plugins 1
 #set -g @theme_plugin_datetime_format '%a %d %b %Y'
 
 run '~/.tmux/plugins/tpm/tpm'

wezterm/dot-wezterm.lua

@@ -4,11 +4,12 @@ local wezterm = require("wezterm")
 -- This will hold the configuration
 local config = wezterm.config_builder()
 
-config.color_scheme = 'tokyonight_storm'
+config.color_scheme = "tokyonight_storm"
 config.window_background_opacity = 0.95
 config.enable_tab_bar = false
 config.initial_cols = 205
 config.initial_rows = 45
 config.font_size = 10
+config.default_prog = { "tmux", "new-session", "-A", "-s", "main" }
 
 return config

zsh/dot-zshrc

@@ -3,20 +3,51 @@
 ############### ALIASES ####################
 
 # Load bottom with the proper color scheme
-alias btm="btm --theme=gruvbox" 
+alias btm="btm --theme=gruvbox"
 
 # Remap ls to use lsd
 alias ls="lsd"
 
+# Add alias for la to call lsd -lah
+alias la="lsd -lah"
+
 # Replace cat with bat
 alias cat="bat"
 
+# Alias cd to z for zoxide
+alias cd="z"
+
 ############### END ALIASES ###############
 
+############### BEGIN EXPORTS #############
+
+# Exporting $HOME/.local/bin for Zed
+export PATH=$HOME/.local/bin:$PATH
+
+# Export my local-progs directory to find executables
+export PATH=$HOME/local-progs/:$PATH
+
+# Pre-configure settings for zsh-vi-mode
+function zvm_config() {
+	ZVM_CURSOR_STYLE_ENABLED=false
+	ZVM_VI_EDITOR=nvim
+}
+
+############### END EXPORTS ###############
+
 # Add in our fzf integrations for zsh
 # Comment if you don't want the fzf integration
 source <(fzf --zsh)
 
+# Enable vi mode for zsh
+source $HOME/local-progs/zsh-vi-mode/zsh-vi-mode.plugin.zsh
+
+# We want to make sure that autocompletions are loaded
+autoload -Uz compinit && compinit
+
+# Initialize zoxide
+eval "$(zoxide init zsh)"
+
 # Finally we want to use starship for our prompt
 # (because rust that's why)
 eval "$(starship init zsh)"