Merge branch 'main' into release/v1.3

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

@@ -1,21 +0,0 @@
-return {
-	"nvim-neorg/neorg",
-	lazy = false,
-	version = "*",
-	config = function()
-		require("neorg").setup({
-			load = {
-				["core.defaults"] = {},
-				["core.concealer"] = {},
-				["core.dirman"] = {
-					config = {
-						workspaces = {
-							notes = "~/notes",
-						},
-						default_workspace = "notes",
-					},
-				},
-			},
-		})
-	end,
-}

tmux/dot-config/tmux/tmux.conf

@@ -6,7 +6,9 @@ set -g @plugin 'janoamaral/tokyo-night-tmux'
 
 # Tokyo Night config
 set -g @tokyo-night-tmux_theme 'storm'
-set -g @tokyo-night-tmux_window_id_style fsquare
+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

zsh/dot-zshrc

@@ -3,36 +3,22 @@
 ############### ALIASES ####################
 
 # Load bottom with the proper color scheme
-if command -v btm &>/dev/null; then
-  alias btm="btm --theme=gruvbox"
-fi
+alias btm="btm --theme=gruvbox"
 
 # Remap ls to use lsd
-if command -v lsd &>/dev/null; then
-  alias ls="lsd"
-  # Add alias for la to call lsd -lah
-  alias la="lsd -lah"
-fi
+alias ls="lsd"
+
+# Add alias for la to call lsd -lah
+alias la="lsd -lah"
 
 # Replace cat with bat
-if command -v bat &>/dev/null; then
-  alias cat="bat"
-fi
+alias cat="bat"
 
 # Alias cd to z for zoxide
-if command -v zoxide &>/dev/null; then
-  alias cd="z"
-fi
+alias cd="z"
 
 # Alias vim to nvim
-if command -v nvim &>/dev/null; then
-  alias vim="nvim"
-fi
-
-# Alias for stow --dotfiles
-if command -v stow &>/dev/null; then
-  alias stow.="stow --dotfiles"
-fi
+alias vim="nvim"
 
 ############### END ALIASES ###############
 
@@ -42,9 +28,7 @@ fi
 export PATH=$HOME/.local/bin:$PATH
 
 # Export my local-progs directory to find executables
-if [[ -d "$HOME/local-progs" ]]; then
-  export PATH=$HOME/local-progs/:$PATH
-fi
+export PATH=$HOME/local-progs/:$PATH
 
 # Pre-configure settings for zsh-vi-mode
 function zvm_config() {
@@ -56,25 +40,17 @@ function zvm_config() {
 
 # Add in our fzf integrations for zsh
 # Comment if you don't want the fzf integration
-if command -v fzf &>/dev/null; then 
-  source <(fzf --zsh)
-fi
+source <(fzf --zsh)
 
 # Enable vi mode for zsh
-if [[ -f "$HOME/local-progs/zsh-vi-mode/zsh-vi-mode.plugin.zsh" ]]; then
-  source $HOME/local-progs/zsh-vi-mode/zsh-vi-mode.plugin.zsh
-fi
+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
-if command -v zoxide &>/dev/null; then
-  eval "$(zoxide init zsh)"
-fi
+eval "$(zoxide init zsh)"
 
 # Finally we want to use starship for our prompt
 # (because rust that's why)
-if command -v starship &>/dev/null; then
-  eval "$(starship init zsh)"
-fi
+eval "$(starship init zsh)"