Merge pull request 'Changed tmux theme to tokyonight storm' (#28) from tmux-theme-storm into main

Reviewed-on: #28

.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/lua/plugins/barbar.lua

@@ -0,0 +1,19 @@
+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/completions.lua

@@ -0,0 +1,52 @@
+return {
+	{
+		"hrsh7th/cmp-nvim-lsp",
+	},
+	{
+		"L3MON4D3/LuaSnip",
+		dependencies = {
+			"saadparwaiz1/cmp_luasnip",
+			"rafamadriz/friendly-snippets",
+		},
+	},
+	{
+		"hrsh7th/nvim-cmp",
+		config = function()
+			local cmp = require("cmp")
+			require("luasnip.loaders.from_vscode").lazy_load()
+
+			cmp.setup({
+				snippet = {
+					-- REQUIRED - you must specify a snippet engine
+					expand = function(args)
+						-- vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+						require("luasnip").lsp_expand(args.body) -- For `luasnip` users.
+						-- require('snippy').expand_snippet(args.body) -- For `snippy` users.
+						-- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+						-- vim.snippet.expand(args.body) -- For native neovim snippets (Neovim v0.10+)
+					end,
+				},
+				window = {
+					completion = cmp.config.window.bordered(),
+					documentation = cmp.config.window.bordered(),
+				},
+				mapping = cmp.mapping.preset.insert({
+					["<C-b>"] = cmp.mapping.scroll_docs(-4),
+					["<C-f>"] = cmp.mapping.scroll_docs(4),
+					["<C-Space>"] = cmp.mapping.complete(),
+					["<C-e>"] = cmp.mapping.abort(),
+					["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+				}),
+				sources = cmp.config.sources({
+					{ name = 'nvim_lsp' },
+					-- { name = 'vsnip' }, -- For vsnip users.
+					{ name = "luasnip" }, -- For luasnip users.
+					-- { name = 'ultisnips' }, -- For ultisnips users.
+					-- { name = 'snippy' }, -- For snippy users.
+				}, {
+					{ name = "buffer" },
+				}),
+			})
+		end,
+	},
+}

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

@@ -0,0 +1,48 @@
+return {
+	{
+		"williamboman/mason.nvim",
+		config = function()
+			require("mason").setup()
+		end,
+	},
+	{
+		"williamboman/mason-lspconfig.nvim",
+		config = function()
+			require("mason-lspconfig").setup({
+				ensure_installed = {
+					"clangd",
+					"lua_ls",
+					"pyright",
+					"rust_analyzer",
+					"taplo",
+				},
+			})
+		end,
+	},
+	{
+		"neovim/nvim-lspconfig",
+		config = function()
+			local capabilities = require("cmp_nvim_lsp").default_capabilities()
+			local lspconfig = require("lspconfig")
+			lspconfig.clangd.setup({
+				capabilities = capabilities
+			})
+			lspconfig.lua_ls.setup({
+				capabilities = capabilities
+			})
+			lspconfig.pyright.setup({
+				capabilities = capabilities
+			})
+			lspconfig.rust_analyzer.setup({
+				capabilities = capabilities
+			})
+			lspconfig.taplo.setup({
+				capabilities = capabilities
+			})
+
+			vim.keymap.set("n", "K", vim.lsp.buf.hover, {})
+			vim.keymap.set("n", "gd", vim.lsp.buf.definition, {})
+			vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, {})
+		end,
+	},
+}

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

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

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

@@ -0,0 +1,11 @@
+return {
+	"MeanderingProgrammer/render-markdown.nvim",
+	config = function ()
+		require("render-markdown").setup({
+			dependencies = {
+				'nvim-treesitter/nvim-treesitter',
+				'nvim-tree/nvim-web-devicons',
+			},
+		})
+	end
+}

nvim/dot-config/nvim/lua/plugins/none-ls.lua

@@ -0,0 +1,19 @@
+return {
+	"nvimtools/none-ls.nvim",
+	config = function()
+		local null_ls = require("null-ls")
+
+		null_ls.setup({
+			sources = {
+				null_ls.builtins.formatting.black,
+				null_ls.builtins.formatting.clang_format,
+				null_ls.builtins.formatting.gersemi,
+				null_ls.builtins.formatting.stylua,
+				null_ls.builtins.diagnostics.cpplint,
+				null_ls.builtins.diagnostics.pylint,
+			},
+		})
+
+		vim.keymap.set("n", "<leader>gf", vim.lsp.buf.format, {})
+	end,
+}

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

@@ -1,9 +1,43 @@
 return {
-	'nvim-telescope/telescope.nvim', tag = '0.1.8',
+	{
+		'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-telescope/telescope-ui-select.nvim',
+		config = function ()
+			-- This is your opts table
+			require("telescope").setup {
+				extensions = {
+					["ui-select"] = {
+						require("telescope.themes").get_dropdown {
+							-- even more opts
+						}
+						-- pseudo code / specification for writing custom displays, like the one
+						-- for "codeactions"
+						-- specific_opts = {
+						--   [kind] = {
+						--     make_indexed = function(items) -> indexed_items, width,
+						--     make_displayer = function(widths) -> displayer
+						--     make_display = function(displayer) -> function(e)
+						--     make_ordinal = function(e) -> string
+						--   },
+						--   -- for example to disable the custom builtin "codeactions" display
+						--      do the following
+						--   codeactions = false,
+						-- }
+					}
+				}
+			}
+			-- To get ui-select loaded and working with telescope, you need to call
+			-- load_extension, somewhere after setup function:
+			require("telescope").load_extension("ui-select")
+		end
+	}
 }

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

@@ -4,7 +4,8 @@ return{
 	config = function()
 		local configs = require("nvim-treesitter.configs")
 		configs.setup({
-			ensure_installed = { "c", "cmake", "cpp", "lua", "python", "rust", "toml" },
+			ensure_installed = { "c", "cmake", "cpp", "lua", "markdown", "markdown_inline", "python", "rust", "toml" },
+			auto_install = true,
 			highlight = { enable = true },
 			indent = { enable = true },
 		})

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

@@ -4,4 +4,7 @@ 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

@@ -4,7 +4,7 @@ set -g @plugin 'fabioluciano/tmux-tokyo-night'
 set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 
-set -g @theme_variation 'moon' 
+set -g @theme_variation 'storm' 
 set -g @theme_disable_plugins 1
 #set -g @theme_plugin_datetime_format '%a %d %b %Y'
 

wezterm/dot-wezterm.lua

@@ -0,0 +1,14 @@
+-- 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
+
+return config

zsh/dot-zshrc

@@ -3,16 +3,23 @@
 ############### 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"
 
 ############### END ALIASES ###############
 
+# Add in our fzf integrations for zsh
+# Comment if you don't want the fzf integration
+source <(fzf --zsh)
+
 # Finally we want to use starship for our prompt
 # (because rust that's why)
 eval "$(starship init zsh)"