Add accomodations for local rc changes

config/bash/.bashrc

@@ -27,6 +27,9 @@ shopt -s checkhash
 shopt -s cdspell
 shopt -s dirspell
 
+# set local env variables
+[ -r "~/.local/.env" ] && source "~/.local/.env"
+
 # ls options
 ls --version &> /dev/null
 if [ "$? " -eq 0 ]; then
@@ -62,6 +65,19 @@ alias tmlsc="tmux lsc"
 alias tmks="tmux kill-session -t" # kill one session
 alias tmka="tmux kill-server" # aka killall
 
+# edit rc
+alias brc="$EDITOR ~/.bashrc"
+alias lbrc="$EDITOR ~/.local/.bashrc"
+alias lenv="$EDITOR ~/.local/.env"
+alias vrc="$EDITOR ~/.vim/vimrc"
+alias lvrc="$EDITOR ~/.local/.vimrc"
+alias nvrc="$EDITOR ~/.config/nvim/init.lua"
+alias nvrcd="$EDITOR ~/.config/nvim/"
+alias lnvrc="$EDITOR ~/.local/.nvimrc"
+alias tmrc="$EDITOR ~/.tmux.conf"
+alias ltmrc="$EDITOR ~/.local/.tmux.conf"
+alias gitrc="$EDITOR ~/.gitconfig"
+
 # python
 # python3 is python unless python is already python3
 if ! command -v python &> /dev/null && command -v python3 &> /dev/null;  then
@@ -364,7 +380,7 @@ esac
 [ -d "$HOME/.local/bin" ] && appendpath "$HOME/.local/bin"
 [ -d "$HOME/.local/scripts" ] && appendpath "$HOME/.local/scripts"
 
-# local rc
+# local rc (overwrite)
 [ -r "$HOME/.local/.bashrc" ] && source "$HOME/.local/.bashrc"
 
 # fzf

config/nvim/.config/nvim/init.lua

@@ -8,3 +8,6 @@ require('config.platform_specific') -- platform specific settings (Win32, Mac, L
 -- plugin configurations
 require('config.lazy')              -- nvim plugins
 require('plugin-config')            -- plugin specific configurations
+
+-- local config
+require('config.local')

config/nvim/.config/nvim/lua/config/lazy.lua

@@ -18,7 +18,6 @@ vim.opt.rtp:prepend(lazypath)
 -- Setup lazy.nvim
 require("lazy").setup({
   spec = {
-    -- import your plugins
     {
       -- * vanilla vim plugins * --
       -- normal mode keybinds
@@ -55,9 +54,13 @@ require("lazy").setup({
       'hrsh7th/cmp-buffer',
       'hrsh7th/cmp-path',
       'hrsh7th/cmp-cmdline',
-      'L3MON4D3/LuaSnip',
       'hrsh7th/nvim-cmp',
-      'mattn/emmet-vim',
+      'L3MON4D3/LuaSnip',
+
+      -- formatting
+      'stevearc/conform.nvim',
+
+      -- treesitter
       'nvim-treesitter/nvim-treesitter',
       'j-hui/fidget.nvim',
 

config/nvim/.config/nvim/lua/config/local.lua

@@ -0,0 +1,3 @@
+-- source local rc file
+local local_rc = vim.fn.expand("~/.local/.nvimrc")
+if (vim.fn.filereadable(local_rc)) then vim.cmd.source(local_rc) end

config/nvim/.config/nvim/lua/config/settings.lua

@@ -20,9 +20,9 @@ vim.opt.smartcase = true
 -- indent
 vim.opt.autoindent = true
 vim.opt.expandtab = true
-vim.opt.shiftwidth = 4
+vim.opt.shiftwidth = 2
-vim.opt.tabstop = 4
+vim.opt.tabstop = 2
-vim.opt.softtabstop = 0
+vim.opt.softtabstop = 2
 
 -- buffer behaviour
 vim.opt.autoread = true

config/nvim/.config/nvim/lua/plugin-config/colorscheme.lua

@@ -2,10 +2,10 @@
 -- local ok, _ = pcall(vim.cmd, 'colorscheme tokyonight-storm')
 -- local ok, _ = pcall(vim.cmd, 'colorscheme tokyonight-night')
 -- local ok, _ = pcall(vim.cmd, 'colorscheme tokyonight-moon')
-
+-- local ok, _ = pcall(vim.cmd, 'colorscheme nightfly')
-local ok, _ = pcall(vim.cmd, 'colorscheme nightfly')
 -- local ok, _ = pcall(vim.cmd, 'colorscheme ayu-dark')
+-- local ok, _ = pcall(vim.cmd, 'colorscheme wildcharm')
 
-if not ok then
+-- if not ok then
-  vim.cmd 'colorscheme default' -- if the above fails, then use default
+--   vim.cmd 'colorscheme default' -- if the above fails, then use default
-end
+-- end