feat: Moves most configuration

dev-env

@@ -52,12 +52,23 @@ update_files() {
   popd &>/dev/null
 }
 
+copy() {
+  log "removing: $2"
+  if [[ $dry_run == "0" ]]; then
+    rm $2
+  fi
+  log "copying: $1 to $2"
+  if [[ $dry_run == "0" ]]; then
+    cp $1 $2
+  fi
+}
+
 update_files $DEV_ENV/env/.config $XDG_CONFIG_HOME
 update_files $DEV_ENV/env/.local $HOME/.local
 #
 # copy $DEV_ENV/tmux-sessionizer/tmux-sessionizer $HOME/.local/scripts/tmux-sessionizer
-# copy $DEV_ENV/env/.zsh_profile $HOME/.zsh_profile
-# copy $DEV_ENV/env/.zshrc $HOME/.zshrc
+copy $DEV_ENV/env/.zshenv $HOME/.zshenv
+
 # copy $DEV_ENV/env/.xprofile $HOME/.xprofile
 # copy $DEV_ENV/env/.tmux-sessionizer $HOME/.tmux-sessionizer
 # copy $DEV_ENV/dev-env $HOME/.local/scripts/dev-env

go

@@ -1 +0,0 @@
- 

gopass/config

@@ -1,13 +0,0 @@
-[mounts]
-	path = /home/michael/.local/share/gopass/passwordstore
-[recipients]
-	hash = 6a408ace969698b274c7c7580f7b0187e8aab4018ae06c5de895d69ae99b8b44
-[mounts "servers"]
-[recipients "homelab"]
-	hash = e4e019251bcd688aa1691b6b4363a9798593f4aed464afb63d11149ea771b4e0
-[mounts "homelab"]
-[recipients "new-test"]
-	hash = 3199e2acda60d6f17a15882ba11749feda9775cf848554c8f04f12bc84521fd3
-[mounts "new-test"]
-[recipients "servers"]
-	hash = e4e019251bcd688aa1691b6b4363a9798593f4aed464afb63d11149ea771b4e0

gpg-tui/gpg-tui.toml

@@ -1,32 +0,0 @@
-[general]
-  splash = false
-  tick_rate = 250
-  color = "gray"
-  style = "colored"
-  file_explorer = "xplr"
-  detail_level = "minimum"
-  # log_file = "test"
-  # key_bindings = [
-  #   { keys = [ "?" ], command = ":help" },
-  #   { keys = [ "o" ], command = ":options" },
-  #   { keys = [ "n" ], command = ":normal" },
-  #   { keys = [ "v" ], command = ":visual" },
-  #   { keys = [ "c" ], command = ":copy" },
-  #   { keys = [ "p", "C-v" ], command = ":paste" },
-  #   { keys = [ "x" ], command = ":export" },
-  #   { keys = [ "s" ], command = ":set prompt :sign" },
-  #   { keys = [ "e" ], command = ":set prompt :edit" },
-  #   { keys = [ "i" ], command = ":set prompt :import"},
-  #   { keys = [ "f" ], command = ":set prompt :receive" },
-  #   { keys = [ "u" ], command = ":set prompt :send" },
-  #   { keys = [ "g" ], command = ":generate" },
-  #   { keys = [ "d", "backspace" ], command = ":delete" },
-  #   { keys = [ "C-r" ], command = ":refresh" },
-  # ]
-
-[gpg]
-  armor = false
-  homedir = "~/.gnupg"
-  outdir = "~/.gnupg/out"
-  # outfile = "{type}_{query}.{ext}"
-  # default_key = "0xA1B2C3XY"

kitty/kitty.conf

@@ -1,96 +0,0 @@
-# vim:ft=kitty
-# _  _ _ ___ ___ _   _  ____ ____ _  _ ____
-# |_/  |  |   |   \_/   |    |  | |\ | |___
-# | \_ |  |   |    |   .|___ |__| | \| |
-#
-
-## name:     Catppuccin Kitty Mocha
-## author:   Catppuccin Org
-## license:  MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
-## blurb:    Soothing pastel theme for the high-spirited!
-
-# The basic colors
-foreground              #cdd6f4
-background              #1e1e2e
-selection_foreground    #1e1e2e
-selection_background    #f5e0dc
-
-# Cursor colors
-cursor                  #f5e0dc
-cursor_text_color       #1e1e2e
-
-# URL underline color when hovering with mouse
-url_color               #f5e0dc
-
-# Kitty window border colors
-active_border_color     #b4befe
-inactive_border_color   #6c7086
-bell_border_color       #f9e2af
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground   #11111b
-active_tab_background   #cba6f7
-inactive_tab_foreground #cdd6f4
-inactive_tab_background #181825
-tab_bar_background      #11111b
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #1e1e2e
-mark1_background #b4befe
-mark2_foreground #1e1e2e
-mark2_background #cba6f7
-mark3_foreground #1e1e2e
-mark3_background #74c7ec
-
-# The 16 terminal colors
-
-# black
-color0 #45475a
-color8 #585b70
-
-# red
-color1 #f38ba8
-color9 #f38ba8
-
-# green
-color2  #a6e3a1
-color10 #a6e3a1
-
-# yellow
-color3  #f9e2af
-color11 #f9e2af
-
-# blue
-color4  #89b4fa
-color12 #89b4fa
-
-# magenta
-color5  #f5c2e7
-color13 #f5c2e7
-
-# cyan
-color6  #94e2d5
-color14 #94e2d5
-
-# white
-color7  #bac2de
-color15 #a6adc8
-
-font_family Droid Sans Mono for Powerline Regular
-
-font_size 13.0
-symbol_map U+E0A0-U+E0A3,U+E0C0-U+E0C7 1
-narrow_symbols U+E0A0-U+E0A3,U+E0C0-U+E0C7 1
-
-macos_titlebar_color system
-
-background_opacity 0.9
-
-#hide_window_decorations titlebar-only
-hide_window_decorations no
-confirm_os_window_close 0

nvim/m-housh/after/ftplugin/markdown.lua

@@ -1,20 +0,0 @@
--- Markdown specific key maps.
---
-local todos = require("todo-comments")
-local keywords = { "WARN", "WARNING", "IMPORTANT" }
-
--- Show all the warnings in the quick fix list.
-vim.keymap.set(
-	"n",
-	"<leader>tw",
-	"<CMD>Trouble todo toggle filter = {tag = {WARN, IMPORTANT}}<CR>",
-	{ desc = "[T]odo [W]arnings" }
-)
-
-vim.keymap.set("n", "]w", function()
-	todos.jump_next({ keywords = keywords })
-end, { desc = "Next [W]arning" })
-
-vim.keymap.set("n", "[w", function()
-	todos.jump_prev({ keywords = keywords })
-end, { desc = "Previous [W]arning" })

nvim/m-housh/after/ftplugin/swift.lua

@@ -1,2 +0,0 @@
-vim.opt.tabstop = 2
-vim.opt.shiftwidth = 2

nvim/m-housh/init.lua

@@ -1,22 +0,0 @@
--- Leader needs to be set before loading plugins
-vim.g.mapleader = " "
-vim.g.maplocalleader = " "
-
--- NOTE: Keep settings at the top, otherwise some options don't work well.
---       mainly have had trouble with not using the settings in an `.editorconfig`
---       file for projects.
-
--- Common settings
-require("config.settings")
-
--- Auto commands
-require("config.autocmd")
-
--- Plugins
-require("config.lazy")
-
--- Key maps
-require("config.keymaps")
-
--- Theme (must stay after plugins are loaded)
-require("config.theme")

nvim/m-housh/lua/config/autocmd.lua

@@ -1,58 +0,0 @@
-local defaultGroupOptions = { clear = true }
-local markdownGroup = vim.api.nvim_create_augroup("MyMarkdownGroup", defaultGroupOptions)
-local spellGroup = vim.api.nvim_create_augroup("SpellGroup", defaultGroupOptions)
-local createCmd = vim.api.nvim_create_autocmd
-
--- Spell check
-createCmd("BufEnter", {
-	pattern = { "*.md", "*.markdown", "*.txt", "*.tex" },
-	group = spellGroup,
-	callback = function(_)
-		vim.cmd.setlocal("textwidth=80")
-		vim.cmd.setlocal("spell spelllang=en_us")
-	end,
-})
-
--- Markdown
-createCmd("BufWritePost", {
-	pattern = { "*.md", "*.markdown" },
-	group = markdownGroup,
-	callback = function(_)
-		local cursor = vim.fn.getpos(".")
-		vim.cmd("FormatWrite")
-		vim.fn.setpos(".", cursor)
-	end,
-})
-
--- Go
-createCmd("BufWritePre", {
-	pattern = "*.go",
-	callback = function()
-		require("go.format").goimport()
-	end,
-	group = vim.api.nvim_create_augroup("GoFormat", defaultGroupOptions),
-})
-
--- Leaf
-createCmd({ "BufRead", "BufNewFile" }, {
-	pattern = "*.leaf",
-	callback = function()
-		vim.opt.filetype = "html"
-	end,
-})
-
-vim.api.nvim_exec2(
-	[[
-  autocmd BufNewFile,BufRead /private/**/gopass** setlocal noswapfile nobackup noundofile shada=""
-  ]],
-	{}
-)
-
--- Highlight when yanking.
-createCmd("TextYankPost", {
-	desc = "Highlight when yanking text.",
-	group = vim.api.nvim_create_augroup("highlight-yank", { clear = true }),
-	callback = function()
-		vim.highlight.on_yank()
-	end,
-})

nvim/m-housh/lua/config/keymaps.lua

@@ -1,52 +0,0 @@
-vim.g.mapleader = " "
-vim.g.maplocalleader = " "
-
-local keymap = vim.keymap.set
-local default_options = { noremap = true, silent = true }
-local wk = require("which-key")
-
-local wk_add = function(mode, keymaps)
-	wk.add(keymaps, { mode = mode, silent = true })
-end
-
---------------------------------------------------------------------------------
--- Insert Mode
---------------------------------------------------------------------------------
--- easier escape key mapping
-keymap("i", "jk", "<ESC>", default_options)
-wk_add("i", {
-	{ "<C-s>", "<ESC>:write<CR>a", desc = "[S]ave" },
-})
-
---------------------------------------------------------------------------------
--- Normal Mode
---------------------------------------------------------------------------------
-wk_add("n", {
-	{ "<Left>", ":vertical resize +1<CR>", desc = "Resize Pane Left" },
-	{ "<Right>", ":vertical resize -1<CR>", desc = "Resize Pane Right" },
-	{ "<Up>", "resize -1<CR>", desc = "Resize Pane Up" },
-	{ "<Down>", "resize +1<CR>", desc = "Resize Pane Down" },
-
-	{ "<leader>n", "<CMD>:noh<CR>", desc = "[N]o highlighting" },
-	{ "<leader>s", "<CMD>:set spell!<CR>", desc = "[S]pell check toggle" },
-	{ "<C-s>", "<CMD>:write<CR>", desc = "[S]ave" },
-
-	{ "J", ":move .+1<CR>==", desc = "Move line down" },
-	{ "K", ":move .-2<CR>==", desc = "Move line up" },
-
-	{ "<leader>z", "<CMD>:ZenMode<CR>", desc = "[Z]en Mode" },
-})
-
---------------------------------------------------------------------------------
--- Visual Mode
---------------------------------------------------------------------------------
-
-vim.keymap.set("v", "K", ":move '<-2<CR>gv=gv", { desc = "Move selected block up.", silent = true, noremap = true })
-vim.keymap.set("v", "J", ":move '>+1<CR>gv=gv", { desc = "Move selected block up.", silent = true, noremap = true })
-
--- Toggle term key maps, that get attached when terminal is opened.
-function _G.set_terminal_keymaps()
-	local opts = { buffer = 0 }
-	keymap("t", "<esc>", [[<C-\><C-n>]], opts)
-end
-vim.cmd("autocmd! TermOpen term://* lua set_terminal_keymaps()")

nvim/m-housh/lua/config/lazy.lua

@@ -1,83 +0,0 @@
--- Bootstrap Lazy.
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-	vim.fn.system({
-		"git",
-		"clone",
-		"--filter=blob:none",
-		"https://github.com/folke/lazy.nvim.git",
-		"--branch=stable", -- latest stable release
-		lazypath,
-	})
-end
-vim.opt.rtp:prepend(lazypath)
-
-require("lazy").setup({
-	dev = {
-		path = "~/LocalProjects/plugins",
-		fallback = true,
-	},
-	-- Import all the plugin configs in the 'plugin' directory
-	{ import = "plugins" },
-	-- Plugins that don't have a configuration file.
-	{
-		"folke/zen-mode.nvim",
-		opts = {},
-	},
-	{
-		"christoomey/vim-tmux-navigator",
-		lazy = false,
-	},
-	{ "NoahTheDuke/vim-just", ft = { "just" } },
-	{
-		"chipsenkbeil/distant.nvim",
-		version = "v0.*",
-		event = "VeryLazy",
-	},
-	{
-		"echasnovski/mini.ai",
-		version = "*",
-		config = function()
-			require("mini.ai").setup({})
-		end,
-	},
-	{
-		"vhyrro/luarocks.nvim",
-    enabled = true,
-		priority = 1001, -- this plugin needs to run before anything else
-		opts = {
-			rocks = { "magick" },
-		},
-	},
-	{
-		"folke/lazydev.nvim",
-		ft = "lua", -- only load on lua files
-		opts = {
-			library = {
-				-- See the configuration section for more details
-				-- Load luvit types when the `vim.uv` word is found
-				{ path = "${3rd}/luv/library", words = { "vim%.uv" } },
-			},
-		},
-	},
-	{
-		"MeanderingProgrammer/render-markdown.nvim",
-		-- dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.nvim" }, -- if you use the mini.nvim suite
-		dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.icons" }, -- if you use standalone mini plugins
-		-- dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
-		opts = {},
-	},
-}, {
-	checker = {
-		enabled = true,
-		notify = false,
-	},
-	change_detection = {
-		notify = false,
-	},
-	rocks = {
-		hererocks = true, -- recommended if you do not have global installation of Lua 5.1.
-	},
-})
-
-vim.keymap.set("n", "<leader>ll", "<CMD>Lazy<CR>", { desc = "Open [L]azy" })

nvim/m-housh/lua/config/settings.lua

@@ -1,66 +0,0 @@
-local o = vim.opt
-local wo = vim.wo
-local fn = vim.fn
-
-vim.cmd.set("inccommand=split")
-o.filetype = "on"
-o.updatetime = 500 -- faster completion
-o.timeoutlen = 800 -- time to wait for a mapped sequence to complete (in milliseconds)
-o.ttimeoutlen = 300 -- Time in milliseconds to wait for a key code sequence to complete
-o.backup = false -- creates a backup file
-o.swapfile = false -- enable/disable swap file creation
-o.dir = fn.stdpath("data") .. "/swp" -- swap file directory
-o.undofile = false -- enable/disable undo file creation
-o.undodir = fn.stdpath("data") .. "/undodir" -- set undo directory
-o.history = 500 -- Use the 'history' option to set the number of lines from command mode that are remembered.
-o.hidden = true -- required to keep multiple buffers and open multiple buffers
-o.clipboard = "unnamedplus" -- allows neovim to access the system clipboard
-o.fileencoding = "utf-8" -- the encoding written to a file
-o.conceallevel = 0 -- so that `` is visible in markdown files
-o.number = true -- set numbered lines
-o.relativenumber = true -- set relative numbered lines
-o.cmdheight = 1 -- space for displaying messages/commands
-o.showmode = false -- we don't need to see things like -- INSERT -- anymore
-o.showtabline = 2 -- always show tabs
-o.laststatus = 2 --  The value of this option influences when the last window will have a status line (2 always)
-o.smartcase = true -- smart case
-o.smartindent = true -- make indenting smarter again
-o.splitbelow = true -- force all horizontal splits to go below current window
-o.splitright = true -- force all vertical splits to go to the right of current window
-o.autoindent = true -- turn on auto indent.
-o.expandtab = true -- convert tabs to spaces
-o.smarttab = true -- turn on smart tab
-o.shiftwidth = 2 -- the number of spaces inserted for each indentation
-o.tabstop = 2 -- how many columns a tab counts for
-o.termguicolors = true -- set term gui colors (most terminals support this)
-o.cursorline = true -- highlight the current line
-o.scrolloff = 20 -- Minimal number of screen lines to keep above and below the cursor
-o.sidescrolloff = 5 -- The minimal number of columns to scroll horizontally
-o.hlsearch = false -- highlight all matches on previous search pattern
-o.ignorecase = true -- ignore case in search patterns
-o.foldenable = false -- disable folding; enable with zi
-o.foldmethod = "expr"
-o.foldexpr = "nvim_treesitter#foldexpr()"
--- o.listchars = "eol:¬,tab:>·,trail:~,extends:>,precedes:<"
-o.listchars = "eol:¬,tab:>·,trail:~,extends:>,precedes:<,space:␣"
-o.shortmess = o.shortmess + "c" -- prevent "pattern not found" messages
-wo.colorcolumn = "99999"
-o.wildmode = "full"
-o.lazyredraw = false -- do not redraw screen while running macros
-o.grepprg = "rg --hidden --vimgrep --smart-case --"
-o.completeopt = { "menu", "menuone", "noselect", "noinsert" } -- A comma separated list of options for Insert mode completion
-o.wildignorecase = true -- When set case is ignored when completing file names and directories
-o.wildignore = [[
-.git,.hg,.svn
-*.aux,*.out,*.toc
-*.o,*.obj,*.exe,*.dll,*.manifest,*.rbc,*.class
-*.ai,*.bmp,*.gif,*.ico,*.jpg,*.jpeg,*.png,*.psd,*.webp
-*.avi,*.divx,*.mp4,*.webm,*.mov,*.m2ts,*.mkv,*.vob,*.mpg,*.mpeg
-*.mp3,*.oga,*.ogg,*.wav,*.flac
-*.eot,*.otf,*.ttf,*.woff
-*.doc,*.pdf,*.cbr,*.cbz
-*.zip,*.tar.gz,*.tar.bz2,*.rar,*.tar.xz,*.kgb
-*.swp,.lock,.DS_Store,._*
-*/tmp/*,*.so,*.swp,*.zip,**/node_modules/**,**/target/**,**.terraform/**"
-]]
-o.viminfo = "" -- disable viminfo from copying information from current session, for security.

nvim/m-housh/lua/config/theme.lua

@@ -1,4 +0,0 @@
--- Nightfox
---require('nightfox').load('terrafox')
-vim.cmd.colorscheme "catppuccin"
-