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

Reviewed-on: #38

.gitignore

@@ -1 +1,3 @@
 nvim/dot-config/nvim/lazy-lock.json
+nvim/dot-config/nvim/.luarc.json
+tmux/dot-config/tmux/plugins/

nvim/dot-config/nvim/init.lua

@@ -1,19 +0,0 @@
--- Bootstrap lazy.nvim
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
-  local lazyrepo = "https://github.com/folke/lazy.nvim.git"
-  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-  if vim.v.shell_error ~= 0 then
-    vim.api.nvim_echo({
-      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-      { out, "WarningMsg" },
-      { "\nPress any key to exit..." },
-    }, true, {})
-    vim.fn.getchar()
-    os.exit(1)
-  end
-end
-vim.opt.rtp:prepend(lazypath)
-
-require("vim-options")
-require("lazy").setup("plugins")

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

@@ -1,19 +0,0 @@
-return {
-	"romgrk/barbar.nvim",
-	config = function()
-		require("barbar").setup({
-			init = function() vim.g.barbar_auto_setup = false end,
-			dependencies = {
-				'lewis6991/gitsigns.nvim',		-- Optional, for git status signs
-				'nvim-tree/nvim-web-devicons',		-- Optional, for file icons
-			},
-			opts = {
-				
-			},
-			vim.keymap.set('n', '<C-j>', ':BufferPrevious<CR>', {}),
-			vim.keymap.set('n', '<C-k>', ':BufferNext<CR>', {}),
-			vim.keymap.set('n', '<C-h>', ':BufferMovePrevious<CR>', {}),
-			vim.keymap.set('n', '<C-l>', ':BufferMoveNext<CR>', {}),
-		})
-	end
-}

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

@@ -1,10 +0,0 @@
-return {
-	"nvim-lualine/lualine.nvim",
-	config = function()
-		require('lualine').setup({
-			options = {
-				theme = 'palenight'
-			}
-		})
-	end
-}

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

@@ -1,13 +0,0 @@
-return {
-	"nvim-neo-tree/neo-tree.nvim",
-	branch = "v3.x",
-	dependencies = {
-		"nvim-lua/plenary.nvim",
-		"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
-		"MunifTanjim/nui.nvim",
-		-- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
-	},
-	config = function()
-		vim.keymap.set('n', '<leader>fe', ':Neotree filesystem reveal toggle left<CR>', {})
-	end
-}

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

@@ -1,10 +0,0 @@
-return {
-	'nvim-telescope/telescope.nvim',
-	branch = '0.1.x',
-	dependencies = { 'nvim-lua/plenary.nvim' },
-	config = function()
-		local builtin = require('telescope.builtin')
-		vim.keymap.set('n', '<C-p>', builtin.find_files, {})
-		vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
-	end
-}

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

@@ -1,10 +0,0 @@
-return {
- 	"folke/tokyonight.nvim",
- 	lazy = false,
- 	priority = 1000,
- 	opts = {},
-	config = function()
-		vim.cmd.colorscheme "tokyonight-storm"
-	end
-}
-

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

@@ -1,12 +0,0 @@
-return{
-	"nvim-treesitter/nvim-treesitter",
-	build = ":TSUpdate",
-	config = function()
-		local configs = require("nvim-treesitter.configs")
-		configs.setup({
-			ensure_installed = { "c", "cmake", "cpp", "lua", "python", "rust", "toml" },
-			highlight = { enable = true },
-			indent = { enable = true },
-		})
-	end
-}

nvim/dot-config/nvim/lua/vim-options.lua

@@ -1,10 +0,0 @@
-vim.cmd("set shiftwidth=2")
-vim.cmd("set tabstop=2")
-vim.g.mapleader = " "
-vim.wo.relativenumber = true
-vim.wo.number = true
-vim.cmd("set list")
-vim.keymap.set('n', '<C-A-h>', '<C-w>h', {})
-vim.keymap.set('n', '<C-A-j>', '<C-w>j', {})
-vim.keymap.set('n', '<C-A-k>', '<C-w>k', {})
-vim.keymap.set('n', '<C-A-l>', '<C-w>l', {})

starship/dot-config/starship.toml

@@ -13,11 +13,11 @@ $python\
 [](fg:#3d59a1 bg:#414868)\
 $cmd_duration\
 [ ](fg:#414868)\
-\n$character"""
+\n$sudo\
+$character"""
 
 right_format = """
-$status\
+$status
-$sudo\
 """
 
 [character]

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

@@ -0,0 +1,15 @@
+-- Pull in the wezterm API
+local wezterm = require("wezterm")
+
+-- This will hold the configuration
+local config = wezterm.config_builder()
+
+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" }
+
+return config

zsh/dot-zshrc

@@ -3,20 +3,54 @@
 ############### ALIASES ####################
 
 # Load bottom with the proper color scheme
-alias btm="btm --color=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"
+
+# Alias vim to nvim
+alias vim="nvim"
+
 ############### 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)"