From 8b13ced13594dadc580760ac89075a1f9976f291 Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Mon, 26 Jun 2023 21:09:20 -0400 Subject: [PATCH] Moved settings and keymaps around. Created a proper nvim-mapper file. Added dracula back in. Emptied the highest level init.lua --- nvim/.config/nvim/init.lua | 144 +----------------- nvim/.config/nvim/lazy-lock.json | 66 ++------ nvim/.config/nvim/lua/core/keymaps.lua | 22 +++ .../{settings/init.lua => core/settings.lua} | 51 +++++-- nvim/.config/nvim/lua/keymaps.lua | 126 --------------- nvim/.config/nvim/lua/plugins/init.lua | 19 ++- nvim/.config/nvim/lua/plugins/null-ls.lua | 2 +- nvim/.config/nvim/lua/plugins/nvim-mapper.lua | 85 +++++++++++ nvim/.config/nvim/spell/en.utf-8.add | 2 + nvim/.config/nvim/spell/en.utf-8.add.spl | Bin 3290 -> 3305 bytes tmux/.config/tmux/plugins/.DS_Store | Bin 10244 -> 0 bytes tmux/.config/tmux/plugins/tmux | 1 - tmux/.config/tmux/plugins/tmux-autoreload | 1 - tmux/.config/tmux/plugins/tmux-colortag | 1 - tmux/.config/tmux/plugins/tmux-continuum | 1 - tmux/.config/tmux/plugins/tmux-fuzzback | 1 - tmux/.config/tmux/plugins/tmux-resurrect | 1 - tmux/.config/tmux/plugins/tmux-sensible | 1 - tmux/.config/tmux/plugins/tpm | 1 - tmux/.config/tmux/plugins/vim-tmux-navigator | 1 - tmux/.config/tmux/resurrect/last | 17 --- .../tmux_resurrect_20220311T122826.txt | 16 -- .../tmux_resurrect_20220311T125305.txt | 16 -- .../tmux_resurrect_20220503T131033.txt | 5 - .../tmux_resurrect_20220707T162109.txt | 3 - .../tmux_resurrect_20220913T114203.txt | 17 --- .../.config/tmux/sidebar/directory_widths.txt | 4 - tmux/.config/tmux/tmux.conf | 50 ------ tmuxinator/.config/tmuxinator/Flask.yml | 9 -- tmuxinator/.config/tmuxinator/Work.yml | 24 --- zsh/.zshrc | 27 ++-- 31 files changed, 185 insertions(+), 529 deletions(-) create mode 100644 nvim/.config/nvim/lua/core/keymaps.lua rename nvim/.config/nvim/lua/{settings/init.lua => core/settings.lua} (70%) mode change 100755 => 100644 delete mode 100644 nvim/.config/nvim/lua/keymaps.lua create mode 100644 nvim/.config/nvim/lua/plugins/nvim-mapper.lua delete mode 100644 tmux/.config/tmux/plugins/.DS_Store delete mode 160000 tmux/.config/tmux/plugins/tmux delete mode 160000 tmux/.config/tmux/plugins/tmux-autoreload delete mode 160000 tmux/.config/tmux/plugins/tmux-colortag delete mode 160000 tmux/.config/tmux/plugins/tmux-continuum delete mode 160000 tmux/.config/tmux/plugins/tmux-fuzzback delete mode 160000 tmux/.config/tmux/plugins/tmux-resurrect delete mode 160000 tmux/.config/tmux/plugins/tmux-sensible delete mode 160000 tmux/.config/tmux/plugins/tpm delete mode 160000 tmux/.config/tmux/plugins/vim-tmux-navigator delete mode 100644 tmux/.config/tmux/resurrect/last delete mode 100644 tmux/.config/tmux/resurrect/tmux_resurrect_20220311T122826.txt delete mode 100644 tmux/.config/tmux/resurrect/tmux_resurrect_20220311T125305.txt delete mode 100644 tmux/.config/tmux/resurrect/tmux_resurrect_20220503T131033.txt delete mode 100644 tmux/.config/tmux/resurrect/tmux_resurrect_20220707T162109.txt delete mode 100644 tmux/.config/tmux/resurrect/tmux_resurrect_20220913T114203.txt delete mode 100644 tmux/.config/tmux/sidebar/directory_widths.txt delete mode 100644 tmux/.config/tmux/tmux.conf delete mode 100644 tmuxinator/.config/tmuxinator/Flask.yml delete mode 100644 tmuxinator/.config/tmuxinator/Work.yml diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 5f6dc5a..bec3261 100755 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -13,147 +13,7 @@ vim.opt.rtp:prepend(lazypath) vim.g.mapleader = ',' vim.g.localmapleader = ',' +require('core/keymaps') +require('core/settings') require('lazy').setup('plugins') -require('keymaps') - --- General Neovim settings and configuration ------------------------------------------------------------ - ------------------------------------------------------------ --- Neovim API aliases ------------------------------------------------------------ -local fn = vim.fn -- Call Vim functions -local cmd = vim.cmd -- Execute Vim commands -local exec = vim.api.nvim_exec -- Execute Vimscript -local g = vim.g -- Global variables -local opt = vim.opt -- Set options (global/buffer/windows-scoped) -local o = vim.o - ------------------------------------------------------------ --- General ------------------------------------------------------------ -g.mapleader = ',' -- Change leader to a comma -opt.mouse = 'a' -- Enable mouse support -opt.clipboard = 'unnamedplus' -- Copy/paste to system clipboard -opt.swapfile = false -- Don't use swapfile -opt.shadafile = "NONE" -opt.shadafile = "" -opt.shell = "/bin/zsh" -opt.updatetime = 200 -opt.cursorline = true -g.markdown_folding = 1 -opt.spell=true -opt.spelllang = 'en_us' -cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]] --- vim.api.nvim_set_hl(0, "ColorColumn", {guibg=lightmagenta}) ------------------------------------------------------------ --- Neovim UI ------------------------------------------------------------ -opt.number = true -- Show line number -opt.relativenumber = true -- Show Current Line with Relative numbers above and below cursor. -opt.showmatch = true -- Highlight matching parenthesis -opt.foldmethod = 'syntax' -- Enable folding (default 'foldmarker') -opt.colorcolumn = '120' -- Line length marker at 80 columns -opt.textwidth = 120 -opt.splitright = true -- Vertical split to the right -opt.splitbelow = true -- Horizontal split to the bottom -opt.ignorecase = true -- Ignore case letters when search -opt.smartcase = true -- Ignore lowercase for the whole pattern -opt.linebreak = true -- Wrap on word boundary -opt.signcolumn = 'yes:2' -- Signs column always on, minimum 2. -opt.wrap = true - ------------------------------------------------------------ --- Memory, CPU ------------------------------------------------------------ -opt.hidden = true -- Enable background buffers -opt.history = 100 -- Remember N lines in historma:y -opt.lazyredraw = true -- Faster scrolling -opt.synmaxcol = 240 -- Max column for syntax highlight ------------------------------------------------------------ --- Colorscheme ------------------------------------------------------------ -opt.termguicolors = true -- Enable 24-bit RGB colors -cmd[[colorscheme dracula]] ------------------------------------------------------------ --- Tabs, indent ------------------------------------------------------------ -opt.expandtab = true -- Use spaces instead of tabs -opt.shiftwidth = 1 -- Shift 4 spaces when tab -opt.tabstop = 1 -- 1 tab == 4 spaces -opt.smartindent = true -- Autoindent new lines ------------------------------------------------------------ --- Glow Settings ------------------------------------------------------------ -g.glow_binary_path = '/bin' -g.glow_border = 'rounded' -g.glow_width = 120 -g.glow_use_pager = true -g.glow_style = 'dark' ------------------------------------------------------------ --- MKDX Settings, mkdx#settings. ------------------------------------------------------------ --- 2 spaces for selected filetypes -cmd [[ - autocmd FileType md,liquid,xml,html,xhtml,css,scss,javascript,lua,yaml setlocal shiftwidth=2 tabstop=8 noexpandtab -]] - - -local disabled_built_ins = { - "netrw", - "netrwPlugin", - "netrwSettings", - "netrwFileHandlers", - "gzip", - "zip", - "zipPlugin", - "tar", - "tarPlugin", - "getscript", - "getscriptPlugin", - "vimball", - "vimballPlugin", - "2html_plugin", - "logipat", - "rrhelper", - "spellfile_plugin", - "matchit" -} - -for _, plugin in pairs(disabled_built_ins) do - vim.g["loaded_" .. plugin] = 1 -end - ---[[ -Deletes all trailing whitespaces in a file if it's not binary nor a diff. -]]-- -function _G.trim_trailing_whitespaces() - if not o.binary and o.filetype ~= 'diff' then - local current_view = fn.winsaveview() - cmd([[keeppatterns %s/\s\+$//e]]) - fn.winrestview(current_view) - end -end - --- see https://github.com/hrsh7th/nvim-cmp/wiki/Menu-Appearance#how-to-add-visual-studio-code-dark-theme-colors-to-the-menu -vim.cmd[[ - highlight! link CmpItemMenu Comment - " gray - highlight! CmpItemAbbrDeprecated guibg=NONE gui=strikethrough guifg=#808080 - " blue - highlight! CmpItemAbbrMatch guibg=NONE guifg=#569CD6 - highlight! CmpItemAbbrMatchFuzzy guibg=NONE guifg=#569CD6 - " light blue - highlight! CmpItemKindVariable guibg=NONE guifg=#9CDCFE - highlight! CmpItemKindInterface guibg=NONE guifg=#9CDCFE - highlight! CmpItemKindText guibg=NONE guifg=#9CDCFE - " pink - highlight! CmpItemKindFunction guibg=NONE guifg=#C586C0 - highlight! CmpItemKindMethod guibg=NONE guifg=#C586C0 - " front - highlight! CmpItemKindKeyword guibg=NONE guifg=#D4D4D4 - highlight! CmpItemKindProperty guibg=NONE guifg=#D4D4D4 - highlight! CmpItemKindUnit guibg=NONE guifg=#D4D4D4 - ]] - diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index b87516e..b20b731 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,67 +1,25 @@ { - "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, + "LuaSnip": { "branch": "master", "commit": "c7984d1cca3d8615e4daefc196597872a0b8d590" }, "alpha-nvim": { "branch": "main", "commit": "9e33db324b8bb7a147bce9ea5496686ee859461d" }, - "auto-hlsearch.nvim": { "branch": "main", "commit": "8f28246d53e9478717ca3b51c8112083fbebd7e3" }, - "barbar.nvim": { "branch": "master", "commit": "b8ca6076f75e49cca1fa0288c080f3d10ec2152c" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-spell": { "branch": "master", "commit": "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "deadcolumn.nvim": { "branch": "master", "commit": "b9b5e237371ae5379e280e4df9ecf62e4bc8d7a5" }, "distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" }, - "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" }, - "friendly-snippets": { "branch": "main", "commit": "b71d1ddc30a10ce0474156f7ee93bc9006d0cd74" }, - "gitsigns.nvim": { "branch": "main", "commit": "4455bb5364d29ff86639dfd5533d4fe4b48192d4" }, - "glow.nvim": { "branch": "main", "commit": "bbd0473d72a45094495ee5600b5577823543eefe" }, + "gitsigns.nvim": { "branch": "main", "commit": "a36bc3360d584d39b4fb076d855c4180842d4444" }, "headlines.nvim": { "branch": "master", "commit": "ddef41b2664f0ce25fe76520d708e2dc9dfebd70" }, - "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" }, - "lazy.nvim": { "branch": "main", "commit": "678179543e0d27650c328d8659f2c2cab4d854ef" }, - "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" }, - "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, - "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" }, - "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" }, - "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" }, - "mini.fuzzy": { "branch": "stable", "commit": "295763d73cbf580c27a4419364c47b09fc82e0f4" }, - "mini.move": { "branch": "main", "commit": "3afd39873eb9171684e554a214c055482444a47d" }, - "mini.pairs": { "branch": "stable", "commit": "963b800d0524eadd297199207011b98684205ada" }, - "mini.surround": { "branch": "main", "commit": "eeaf96562947f75afa51a6266e066529369ca7ef" }, - "mini.trailspace": { "branch": "main", "commit": "c41ab1035d184ff20c1aebd76639320c055afebe" }, - "mkdnflow.nvim": { "branch": "main", "commit": "5a9768fe09c614600fd2881f29c5cedf931f3e36" }, - "moonfly": { "branch": "master", "commit": "8f2b6b97ae5ba1090229c4eb842cbc912d7ffb65" }, - "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, - "neovim": { "branch": "main", "commit": "6b7b38bbb3dac648dbf81f2728ce1101f476f920" }, - "nightfox.nvim": { "branch": "main", "commit": "77aa7458d2b725c2d9ff55a18befe1b891ac473e" }, - "null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" }, - "nvim": { "branch": "main", "commit": "2df7036c5c303c9184869936e40ca18935e4afcb" }, - "nvim-cmp": { "branch": "main", "commit": "09ff53ff579cfa3368f8051b0dbe88406891aabe" }, - "nvim-dap": { "branch": "master", "commit": "7c1d47cf7188fc31acdf951f9eee22da9d479152" }, - "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, - "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" }, - "nvim-lspconfig": { "branch": "master", "commit": "08f1f347c718e945c3b1712ebb68c6834182cf3a" }, + "lazy.nvim": { "branch": "main", "commit": "4c8b625bc873ca76b76eee0c28c98f1f7148f17f" }, + "null-ls.nvim": { "branch": "main", "commit": "bbaf5a96913aa92281f154b08732be2f57021c45" }, + "nvim-cmp": { "branch": "main", "commit": "e1f1b40790a8cb7e64091fb12cc5ffe350363aa0" }, + "nvim-lspconfig": { "branch": "master", "commit": "b6b34b9acf84949f0ac1c00747765e62b81fb38d" }, "nvim-mapper": { "branch": "main", "commit": "baad83aad85d420cce24dd60106114421ed59039" }, - "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, - "nvim-tree.lua": { "branch": "master", "commit": "034511714bacfadc5008e49f73fcef67e5613840" }, - "nvim-treesitter": { "branch": "master", "commit": "f9d701176cb9a3e206a4c690920a8993630c3ec8" }, - "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" }, - "plenary.nvim": { "branch": "master", "commit": "499e0743cf5e8075cd32af68baa3946a1c76adf1" }, - "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" }, - "starry.nvim": { "branch": "master", "commit": "9c4f8669acb302300e1495d4b1f1e618524a48f4" }, - "styler.nvim": { "branch": "main", "commit": "58d0d12191adee41fce7ef20d46d1203efa0d11e" }, - "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "fc70589a93d7bb42f4671ad75c8628a29995bcbe" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, + "nvim-treesitter": { "branch": "master", "commit": "d49ba798c95398e62321b40041e8ac4654fea251" }, + "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" }, + "plenary.nvim": { "branch": "master", "commit": "36aaceb6e93addd20b1b18f94d86aecc552f30c4" }, + "styler.nvim": { "branch": "main", "commit": "d5b7e43af4fdaa06e4175c84f4f57b633ae7e6ff" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "0f75ea809c46af8997c64f49c52e3c641d887885" }, - "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, - "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" }, - "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, - "tokyonight.nvim": { "branch": "main", "commit": "161114bd39b990995e08dbf941f6821afbdcd666" }, - "trouble.nvim": { "branch": "main", "commit": "2af0dd9767526410c88c628f1cbfcb6cf22dd683" }, - "vim-arduino": { "branch": "master", "commit": "b2573b094ec301f2874b7ae3ec0e8806f8fb5e0e" }, - "vim-wakatime": { "branch": "master", "commit": "018fa9a80c27ccf2a8967b9e27890372e5c2fb4f" }, - "which-key.nvim": { "branch": "main", "commit": "e271c28118998c93a14d189af3395812a1aa646c" } + "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" } } \ No newline at end of file diff --git a/nvim/.config/nvim/lua/core/keymaps.lua b/nvim/.config/nvim/lua/core/keymaps.lua new file mode 100644 index 0000000..7543a81 --- /dev/null +++ b/nvim/.config/nvim/lua/core/keymaps.lua @@ -0,0 +1,22 @@ +----------------------------------------------------------- +-- Keymaps of Neovim and installed plugins +----------------------------------------------------------- + +local map = vim.api.nvim_set_keymap +local default_opts = { noremap = true, silent = true } + +-- Fast saving with and s +map('n', 's', ':w', default_opts) +map('n', 'a', ':w|:luafile %', default_opts) +map('n', 'aa', ':w|:luafile % |:PackerSync', default_opts) +map('i', 's', ':w', default_opts) +-- Python Script that saves the file & moves Todos to my Todolist. +map('n', 'sd', ':w|:! python3 ~/Documents/Northpass/Scripts/TodoMD/todo.py %', default_opts) + +-- Neovim Tab Navgation via Vem-Tabline +map('n', 't', ':tabnew', default_opts) +map('n', 'e', ':bnext', default_opts) +map('n', 'w', ':bprev', default_opts) +map('n', 'd', ':bdelete', default_opts) +map('n', 'r', 'vem_move_buffer_right', default_opts) +map('n', 'q', 'vem_move_buffer_left', default_opts) diff --git a/nvim/.config/nvim/lua/settings/init.lua b/nvim/.config/nvim/lua/core/settings.lua old mode 100755 new mode 100644 similarity index 70% rename from nvim/.config/nvim/lua/settings/init.lua rename to nvim/.config/nvim/lua/core/settings.lua index 3feea57..2445331 --- a/nvim/.config/nvim/lua/settings/init.lua +++ b/nvim/.config/nvim/lua/core/settings.lua @@ -1,14 +1,15 @@ +----------------------------------------------------------- -- General Neovim settings and configuration ----------------------------------------------------------- ----------------------------------------------------------- -- Neovim API aliases ----------------------------------------------------------- -local fn = vim.fn -- Call Vim functions -local cmd = vim.cmd -- Execute Vim commands +local fn = vim.fn -- Call Vim functions +local cmd = vim.cmd -- Execute Vim commands local exec = vim.api.nvim_exec -- Execute Vimscript -local g = vim.g -- Global variables -local opt = vim.opt -- Set options (global/buffer/windows-scoped) +local g = vim.g -- Global variables +local opt = vim.opt -- Set options (global/buffer/windows-scoped) local o = vim.o ----------------------------------------------------------- @@ -27,23 +28,22 @@ g.markdown_folding = 1 opt.spell=true opt.spelllang = 'en_us' cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]] -vim.api.nvim_set_hl(0, "ColorColumn", {guibg=lightmagenta}) -o.showtabline = 2 +--vim.api.nvim_set_hl(0, "ColorColumn", {guibg=lightmagenta}) ----------------------------------------------------------- -- Neovim UI ----------------------------------------------------------- opt.number = true -- Show line number opt.relativenumber = true -- Show Current Line with Relative numbers above and below cursor. opt.showmatch = true -- Highlight matching parenthesis -opt.foldmethod = 'syntax' -- Enable folding (default 'foldmarker') -opt.colorcolumn = '100' -- Line length marker at 80 columns -opt.textwidth = 100 +opt.foldmethod = "syntax" -- Enable folding (default 'foldmarker') +opt.cc = '+1,+2,+3' -- Line length marker at 80 columns +opt.tw = 80 opt.splitright = true -- Vertical split to the right opt.splitbelow = true -- Horizontal split to the bottom opt.ignorecase = true -- Ignore case letters when search opt.smartcase = true -- Ignore lowercase for the whole pattern opt.linebreak = true -- Wrap on word boundary -opt.signcolumn = 'yes:2' -- Signs column always on, minimum 2. +opt.signcolumn = 'yes:1' -- Signs column always on, minimum 2. opt.wrap = true ----------------------------------------------------------- @@ -57,21 +57,22 @@ opt.synmaxcol = 240 -- Max column for syntax highlight -- Colorscheme ----------------------------------------------------------- opt.termguicolors = true -- Enable 24-bit RGB colors +cmd[[colorscheme dracula]] ----------------------------------------------------------- -- Tabs, indent ----------------------------------------------------------- opt.expandtab = true -- Use spaces instead of tabs -opt.shiftwidth = 1 -- Shift 4 spaces when tab -opt.tabstop = 1 -- 1 tab == 4 spaces +opt.shiftwidth = 4 -- Shift 4 spaces when tab +opt.tabstop = 4 -- 1 tab == 4 spaces opt.smartindent = true -- Autoindent new lines ----------------------------------------------------------- -- Glow Settings ----------------------------------------------------------- g.glow_binary_path = '/bin' g.glow_border = 'rounded' -g.glow_width = 100 +g.glow_width = 120 g.glow_use_pager = true -g.glow_style = 'light' +g.glow_style = 'dark' ----------------------------------------------------------- -- MKDX Settings, mkdx#settings. ----------------------------------------------------------- @@ -116,3 +117,25 @@ function _G.trim_trailing_whitespaces() fn.winrestview(current_view) end end + +-- see https://github.com/hrsh7th/nvim-cmp/wiki/Menu-Appearance#how-to-add-visual-studio-code-dark-theme-colors-to-the-menu +vim.cmd[[ + highlight! link CmpItemMenu Comment + " gray + highlight! CmpItemAbbrDeprecated guibg=NONE gui=strikethrough guifg=#808080 + " blue + highlight! CmpItemAbbrMatch guibg=NONE guifg=#569CD6 + highlight! CmpItemAbbrMatchFuzzy guibg=NONE guifg=#569CD6 + " light blue + highlight! CmpItemKindVariable guibg=NONE guifg=#9CDCFE + highlight! CmpItemKindInterface guibg=NONE guifg=#9CDCFE + highlight! CmpItemKindText guibg=NONE guifg=#9CDCFE + " pink + highlight! CmpItemKindFunction guibg=NONE guifg=#C586C0 + highlight! CmpItemKindMethod guibg=NONE guifg=#C586C0 + " front + highlight! CmpItemKindKeyword guibg=NONE guifg=#D4D4D4 + highlight! CmpItemKindProperty guibg=NONE guifg=#D4D4D4 + highlight! CmpItemKindUnit guibg=NONE guifg=#D4D4D4 + ]] + diff --git a/nvim/.config/nvim/lua/keymaps.lua b/nvim/.config/nvim/lua/keymaps.lua deleted file mode 100644 index 257d76d..0000000 --- a/nvim/.config/nvim/lua/keymaps.lua +++ /dev/null @@ -1,126 +0,0 @@ ------------------------------------------------------------ - --- Keymaps of Neovim and installed plugins ------------------------------------------------------------ - -local map = vim.api.nvim_set_keymap -local default_opts = { noremap = true, silent = true } - --- Fast saving with and s -map('n', 's', ':w', default_opts) -map('n', 'a', ':w|:luafile %', default_opts) -map('n', 'aa', ':w|:luafile % |:PackerSync', default_opts) -map('i', 's', ':w', default_opts) --- Python Script that saves the file & moves Todos to my Todolist. -map('n', 'sd', ':w|:! python3 ~/Documents/Northpass/Scripts/TodoMD/todo.py %', default_opts) - --- Neovim Tab Navgation via Vem-Tabline -map('n', 't', ':tabnew', default_opts) -map('n', 'e', ':bnext', default_opts) -map('n', 'w', ':bprev', default_opts) -map('n', 'd', ':bdelete', default_opts) -map('n', 'r', 'vem_move_buffer_right', default_opts) -map('n', 'q', 'vem_move_buffer_left', default_opts) - ------------------------------------------------------------ - --- Applications and Plugins shortcuts ------------------------------------------------------------ - ------------------------------------------------------------ - --- Telescope Keymaps ------------------------------------------------------------ - --- For Neovim >= 0.7.0 -Mapper = require("nvim-mapper") -local M = Mapper.map -local default_opts = {noremap=true, silent=true} - --- Sidebar -M('n', 'n', ':SidebarNvimToggle', default_opts, - "Sidebar Toggle", "sidebar-toggle", "Open or Close Sidebar" -) -M('n', 'q', ':SidebarNvimUpdate', default_opts, - "Sidebar Update", "sidebar-update", "Refresh the Sidebar" -) - ---[[ Sidebar Resize -M('n', '=', ':SidebarNvimResize +1', default_opts, - "Sidebar +1", "sidebar-plus1", "Sidebar Bigger by one" -) -M('n', '-', ':SidebarNvimResize -1', default_opts, - "Sidebar -1", "sidebar-minus1", "Sidebar Smaller by one" -) -M('n', '==', ':SidebarNvimResize +10', default_opts, - "Sidebar +10", "sidebar-plus10", "Sidebar Bigger by 10" -) -M('n', '--', ':SidebarNvimResize -10', default_opts, - "Sidebar -10", "sidebar-minus10", "Sidebar Smaller by 10" -)--]] - --- Lazy Git -M('n', 'lg', ":LazyGit", default_opts, - "Lazy Git", "lazy-git", "Show Lazy Git" -) - --- Markdown Preview Toggle -M('n', 'P', ":MarkdownPreview", default_opts, - "Markdown Preview", "md_preview", "Display Markdown preview in browser" -) - --- Telescope Options -M('n', 'ff', ':Telescope find_files', default_opts, - "Find Files", "find-files", "Find Files in Telescope pop-up" -) -M('n', 'fg', ':Telescope live_grep', default_opts, - "Live Grep", "live-grep", "Grep Files in Telescope pop-up" -) -M('n', 'fb', ':Telescope buffers', default_opts, - "Buffers", "buffers", "See Buffers in Telescope pop-up" -) -M('n', 'fe', ":Telescope file_browser", default_opts, - "Telescope Files", "telescope-file-browser", "Find files and directories in telescope" -) - -M('n', '', "@t", default_opts, - "Add Todo", "todo_todo", "Add To-do/Task to the beginning of the line" -) - -M('n', '', "@s", default_opts, - "Add Solutions Engineering", "todo_seng", "Add Solutions Engineering to the beginning of the line" -) - -M('n', '', "@f", default_opts, - "Add Feature", "add_feat", "Add Feature Request tag to the beginning of the line. " -) - -M( 'n', '', "@c", default_opts, - "Replace with Complete", "add_complete", "Replace tag with Complete tag at beginning of the line." - ) - -M('n', '', "@w", default_opts, - "Add Warning/Error", "add_error", "Add Warning/Error tag at the beginning of the line." - ) - -M('n', 'ce', ":TodoTrouble keywords=TODO | :resize +10", default_opts, - "Show Todo Tags", "show_todos", "Show Todo Tags." - ) - -M('n', 'cf', ":TodoTrouble keywords=FEAT", default_opts, - "Show Feature Tags", "show_features", "Show Feature Requests." - ) - -M('n', 'cq', ":TodoTrouble keywords=ERROR, WARN", default_opts, - "Show Warning Tags", "show_warnings", "Show Errors Tags." - ) - -M('n', 'b', ":! black %", default_opts, - "Black Formatting", "black_current_file", "Use Black Formatting on Current File." -) -M('n', 'm', ":! markdownlint -f %", default_opts, - "Markdownlint", "md_lint_format", "Use mdlint Formatting on Current File." -) -M('n', 'r30', ":resize 30", default_opts, - "Resize30", "resize_30", "Resize Window to #30" -) diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index ea7c0c7..9d98687 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -23,11 +23,11 @@ return { { 'neovim/nvim-lspconfig' }, -- Manage all your Keymaps! - { - "gregorias/nvim-mapper", - config = function() require("nvim-mapper").setup{} end, - before = "telescope.nvim" - }, + -- { + -- "gregorias/nvim-mapper", + -- config = function() require("nvim-mapper").setup{} end, + -- before = "telescope.nvim" + -- }, { 'L3MON4D3/LuaSnip', version = "1.2.1", @@ -106,8 +106,11 @@ return { -- Top Right Notify Pop Up 'rcarriga/nvim-notify', --- echasnovski Mini Modules (Selected) - { +------------------------------------------------------------ +-- echasnovski's Minis get a section of their own... +------------------------------------------------------------ + +{ 'echasnovski/mini.comment', version = '*', config = function() require('mini.comment').setup() @@ -157,7 +160,6 @@ return { }, ----------------------------------------------------------- - -- Markdown Plugins ------------------------------------------------------------ @@ -234,6 +236,7 @@ return { 'lukas-reineke/indent-blankline.nvim', 'folke/lsp-colors.nvim', + 'Mofiqul/dracula.nvim' 'karb94/neoscroll.nvim', -- Allow Popups for Telescope etc diff --git a/nvim/.config/nvim/lua/plugins/null-ls.lua b/nvim/.config/nvim/lua/plugins/null-ls.lua index f4c6ca8..e0a69ac 100644 --- a/nvim/.config/nvim/lua/plugins/null-ls.lua +++ b/nvim/.config/nvim/lua/plugins/null-ls.lua @@ -16,7 +16,7 @@ return { -- null_ls.builtins.diagnostics.pylama, null_ls.builtins.formatting.black, -- null_ls.builtins.diagnostics.pylint, - null_ls.builtins.diagnostics.pycodestyle.with({ extra_args = { "--max-line-length=150" }}), + null_ls.builtins.diagnostics.pycodestyle.with({ extra_args = { "--max-line-length=120" }}), }, }) end diff --git a/nvim/.config/nvim/lua/plugins/nvim-mapper.lua b/nvim/.config/nvim/lua/plugins/nvim-mapper.lua new file mode 100644 index 0000000..28ab558 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/nvim-mapper.lua @@ -0,0 +1,85 @@ +-- For Neovim >= 0.7.0 +return { + "gregorias/nvim-mapper", + before = "telescope.nvim", + config = function() + Mapper = require("nvim-mapper") + local M = Mapper.map + local default_opts = {noremap=true, silent=true} + + M('n', 'n', ':SidebarNvimToggle', default_opts, + "Sidebar Toggle", "sidebar-toggle", "Open or Close Sidebar" + ) + M('n', 'q', ':SidebarNvimUpdate', default_opts, + "Sidebar Update", "sidebar-update", "Refresh the Sidebar" + ) + + -- Lazy Git + M('n', 'lg', ":LazyGit", default_opts, + "Lazy Git", "lazy-git", "Show Lazy Git" + ) + + -- Markdown Preview Toggle + M('n', 'P', ":MarkdownPreview", default_opts, + "Markdown Preview", "md_preview", "Display Markdown preview in browser" + ) + + -- Telescope Options + M('n', 'ff', ':Telescope find_files', default_opts, + "Find Files", "find-files", "Find Files in Telescope pop-up" + ) + M('n', 'fg', ':Telescope live_grep', default_opts, + "Live Grep", "live-grep", "Grep Files in Telescope pop-up" + ) + M('n', 'fb', ':Telescope buffers', default_opts, + "Buffers", "buffers", "See Buffers in Telescope pop-up" + ) + M('n', 'fe', ":Telescope file_browser", default_opts, + "Telescope Files", "telescope-file-browser", "Find files and directories in telescope" + ) + + M('n', '', "@t", default_opts, + "Add Todo", "todo_todo", "Add To-do/Task to the beginning of the line" + ) + + M('n', '', "@s", default_opts, + "Add Solutions Engineering", "todo_seng", "Add Solutions Engineering to the beginning of the line" + ) + + M('n', '', "@f", default_opts, + "Add Feature", "add_feat", "Add Feature Request tag to the beginning of the line. " + ) + + M( 'n', '', "@c", default_opts, + "Replace with Complete", "add_complete", "Replace tag with Complete tag at beginning of the line." + ) + + M('n', '', "@w", default_opts, + "Add Warning/Error", "add_error", "Add Warning/Error tag at the beginning of the line." + ) + + M('n', 'ce', ":TodoTrouble keywords=TODO | :resize +10", default_opts, + "Show Todo Tags", "show_todos", "Show Todo Tags." + ) + + M('n', 'cf', ":TodoTrouble keywords=FEAT", default_opts, + "Show Feature Tags", "show_features", "Show Feature Requests." + ) + + M('n', 'cq', ":TodoTrouble keywords=ERROR, WARN", default_opts, + "Show Warning Tags", "show_warnings", "Show Errors Tags." + ) + + M('n', 'b', ":! black %", default_opts, + "Black Formatting", "black_current_file", "Use Black Formatting on Current File." + ) + M('n', 'm', ":! markdownlint -f %", default_opts, + "Markdownlint", "md_lint_format", "Use mdlint Formatting on Current File." + ) + M('n', 'r30', ":resize 30", default_opts, + "Resize30", "resize_30", "Resize Window to #30" + ) + end, + } + + diff --git a/nvim/.config/nvim/spell/en.utf-8.add b/nvim/.config/nvim/spell/en.utf-8.add index 67353c5..0a6eebd 100644 --- a/nvim/.config/nvim/spell/en.utf-8.add +++ b/nvim/.config/nvim/spell/en.utf-8.add @@ -309,3 +309,5 @@ event event MJ Wix +cateogries +cateogries diff --git a/nvim/.config/nvim/spell/en.utf-8.add.spl b/nvim/.config/nvim/spell/en.utf-8.add.spl index 2575be9a6f024c63be089f3ac262cbf75262332c..98db9b63f29da9f54ed61c72e8cf20d2b593a54a 100644 GIT binary patch delta 734 zcmX9+O=uHA6y7)clWu~!2*qMbG}zjJr5Y5K77vP|hk~RcEEHjzY?5jAC+uz_DdwP8 zA&3tzf(P;9Nf4o4#8aV1Poe6mDF_uq5WT1e^}X$7hVRWc?|t7l^Lgs)RQC3b<*4Pj zZt0(*q!wOhpF{SK^nx&IcXikE!x-Pe(Gyk&9B=^?<+6LQmnBsKs6z;n>m>)j!4lMP zPHcmP--WM%0wGq_(*&QW*E4;a_%?9~@2ksZuXcd?cuAW+-U~G+h}+bT2)j&EHY$SF zpI*$R9^TVtVT>;{33)uE7cXpeRY3%>qL?Igi6n+TQ}kFBY3lYg7yo)dON3e$%jhtDCpu@E?-Z8EowqhYPpX^0sl{WewQ%6eA96~-c=!SaArrVPANb1Z%!6(+Htj4PC1Y(`XiTC(4btSjM z`NBA)+?4VeUP^?sYeWd}cWMSYn4f6EG(MattjxDm?qW9rauJaK#LFH(hexXE>}(|J zObMXPeJu`F1XUuoNJx#*unTQUP>pO*wEK_EmBqI=C|{x?sH$k-$1!_5*{R0waGUk H^AY|7BMYie delta 720 zcmX9+O=uHQ5Z-ya*<=%1@dvaRX&P)aAhw1Iik=ju9&#`h30RPA^4fjP{;|7>q~M{R z3SPvy2_6J51uxozROnHJ;H@-B1tAy3gLv@ZK|yD>mwkLQ-}~nK=I!^1{fY6rx9V{y zUAOj6)3T>ukH3JipUMlOxZ5{e&yR2iP9AIaK!OXPY1iC?v!U=WTm^}j#Rq62=)Nhr zU&C0RrNT>nzOZgX05(+#|JLhPxO{-tv2L823L`@XNf#m}>@rPTYYF=P@)9nE_}Hkx z2;UeAj$koUy|mre1reYbCuE{eBr)`v`q>4(qHlB72!>Mn3*YzT!_gI z;az;2c>;SlZx*fNG4!~08$I*J(Pkoq;e#Tk1XdP9d~cRu7QdPmIEQ1|3PqXAmaWlR z8pRmk{p^X_Q%T4Nhi>RoHr-a_N0G8(?T_qDTTFCY24a=Ri7njBUM~)KqcDmLYBw(M zr$%^ui3n}X<))#7=W`tj|14KtD1|z!*iJwx0?MCe*;}FgdE}aUbFo-qN&sEfZSrD8 zyG_K9j4U%6_MuA~)Eyf%qlbsAg)6UY+Lk2GNt!6L;iYq0ZJMHMsc?gv98Q!xVN1QG z(%sD9b8E8vP4SyG6lXEgMA~APCQ6#f7L9HEVijQ@|5#N}IGsORbt2Q2jtU-73Vx}~ zJsXyU(<6QwD(s|-Gk;(&e-j3{lfO9mjvvpXy3e|T{{!vL8F-XtH40mY3!mUWa|fe( diff --git a/tmux/.config/tmux/plugins/.DS_Store b/tmux/.config/tmux/plugins/.DS_Store deleted file mode 100644 index 809d590d38f13e9271fba7177678f3d82e19afb9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 zcmeHMJ!lj`6n?vx$bpF$1F;cwu@XcvjR=BX!le^b(kNIY_d^oAKXMyMc_1i)1Y0Ww zu@D;->?E96D8_UKY}5l$#Kukw5&YiFB=_d_el|rwVJ7Up&CGi{-}lYW=1qvmn_S9| z69q(+#Km@G2)7P}+xdzV-_#t3^$<_Rx$)^-rBsc0x(cU&Q@|TvQ*^5L1DJ(Hn$s&~9UQ10ZVwRLx=fKwo<0O#%l6jF(nXxYl& zQ!h4TTd9)CWQ&z7>XK*Ad{009_;SK-&-ZMv&Wp2w(HVqNYO`NDO0(!cqzWxkfr_xR zl(*2(uM_P5mUvWhbj2DAx_hUWuf+fPdT|qf*LTY?h~sbLKF_%281s6lVg4+t zm64;+!k&88K93^)693OnW1Z$vhnSZBabqkV`mdZ20=`xS z>_@zw?X{ddaJrwrWxKH!&qM=oU2zIH1)Ks-0jGddU>gb~v~R%Y|5M%n|G$klI#;KFQ{aD7z#GU+ zXC{H#oUKRj^I3ak+Aa$m;dA3VC%#{=6dlnd6}=qkFv(W<^K~{Cp(h={{^sl(h2|o diff --git a/tmux/.config/tmux/plugins/tmux b/tmux/.config/tmux/plugins/tmux deleted file mode 160000 index a966029..0000000 --- a/tmux/.config/tmux/plugins/tmux +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a966029b9938badd9ed945b634b917e574c0c322 diff --git a/tmux/.config/tmux/plugins/tmux-autoreload b/tmux/.config/tmux/plugins/tmux-autoreload deleted file mode 160000 index e98aa3b..0000000 --- a/tmux/.config/tmux/plugins/tmux-autoreload +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e98aa3b74cfd5f2df2be2b5d4aa4ddcc843b2eba diff --git a/tmux/.config/tmux/plugins/tmux-colortag b/tmux/.config/tmux/plugins/tmux-colortag deleted file mode 160000 index 72ef717..0000000 --- a/tmux/.config/tmux/plugins/tmux-colortag +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 72ef7174f63dcf8e2809376f8f8a39ca1d910efc diff --git a/tmux/.config/tmux/plugins/tmux-continuum b/tmux/.config/tmux/plugins/tmux-continuum deleted file mode 160000 index fc2f31d..0000000 --- a/tmux/.config/tmux/plugins/tmux-continuum +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fc2f31d79537a5b349f55b74c8ca69abaac1ddbb diff --git a/tmux/.config/tmux/plugins/tmux-fuzzback b/tmux/.config/tmux/plugins/tmux-fuzzback deleted file mode 160000 index 6031244..0000000 --- a/tmux/.config/tmux/plugins/tmux-fuzzback +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6031244ae09e60cfdcb5271a8e7f72cbc8c5c3c3 diff --git a/tmux/.config/tmux/plugins/tmux-resurrect b/tmux/.config/tmux/plugins/tmux-resurrect deleted file mode 160000 index 027960a..0000000 --- a/tmux/.config/tmux/plugins/tmux-resurrect +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 027960ad25895701a8fbc0a1eb4a8cb477452d20 diff --git a/tmux/.config/tmux/plugins/tmux-sensible b/tmux/.config/tmux/plugins/tmux-sensible deleted file mode 160000 index 5d089e4..0000000 --- a/tmux/.config/tmux/plugins/tmux-sensible +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5d089e418efb1a00f47654014ed085deb3d0c878 diff --git a/tmux/.config/tmux/plugins/tpm b/tmux/.config/tmux/plugins/tpm deleted file mode 160000 index 99469c4..0000000 --- a/tmux/.config/tmux/plugins/tpm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 diff --git a/tmux/.config/tmux/plugins/vim-tmux-navigator b/tmux/.config/tmux/plugins/vim-tmux-navigator deleted file mode 160000 index cdd66d6..0000000 --- a/tmux/.config/tmux/plugins/vim-tmux-navigator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cdd66d6a37d991bba7997d593586fc51a5b37aa8 diff --git a/tmux/.config/tmux/resurrect/last b/tmux/.config/tmux/resurrect/last deleted file mode 100644 index fce6761..0000000 --- a/tmux/.config/tmux/resurrect/last +++ /dev/null @@ -1,17 +0,0 @@ -pane 1 0 0 :- 0 :/Users/normrasmussen/Documents/Projects/nvim_plugin_mdtodo/lua/plugin 1 nvim :nvim init.lua -pane 1 1 1 :* 0 :/Users/normrasmussen 1 zsh : -pane 2 0 1 :* 0 :/Users/normrasmussen 1 ssh :ssh norm@192.168.200.11 -pane 2 1 0 :- 0 :/Users/normrasmussen 1 nvim :nvim .tmux.conf -pane Northpass 0 0 : 0 :/Users/normrasmussen/Documents/Northpass 1 nvim :nvim -pane Northpass 1 0 :- 0 :/Users/normrasmussen/Documents/Northpass 1 nvim :nvim -pane Northpass 1 0 :- 1 :/Users/normrasmussen/Documents/Northpass/Timetagger 0 zsh : -pane Northpass 2 1 :* 0 :/Users/normrasmussen/.config/nvim 1 nvim :nvim -pane Northpass 2 1 :* 1 :/Users/normrasmussen/.config/nvim 0 zsh : -window 1 0 :nvim 0 :- b981,106x62,0,0,4 : -window 1 1 :whiptailpy 1 :* b982,106x62,0,0,5 off -window 2 0 :ssh 1 :* cd44,119x57,0,0,7 : -window 2 1 :nvim 0 :- cd45,119x57,0,0,8 : -window Northpass 0 :notes 0 : c13d,115x64,0,0,0 off -window Northpass 1 :templates 0 :- a804,136x64,0,0[136x46,0,0,1,136x17,0,47,3] off -window Northpass 2 :nvim-config 1 :* 4f08,136x64,0,0[136x47,0,0,2,136x16,0,48,6] off -state 2 diff --git a/tmux/.config/tmux/resurrect/tmux_resurrect_20220311T122826.txt b/tmux/.config/tmux/resurrect/tmux_resurrect_20220311T122826.txt deleted file mode 100644 index 0faf7c2..0000000 --- a/tmux/.config/tmux/resurrect/tmux_resurrect_20220311T122826.txt +++ /dev/null @@ -1,16 +0,0 @@ -pane 1 0 0 : 0 :/Users/normrasmussen 1 ssh :ssh norm@192.168.1.12 -pane 1 1 1 :* 0 :/Users/normrasmussen 1 nvim :nvim /Users/normrasmussen/.tmux.conf -pane 1 2 0 :- 0 :/Users/normrasmussen 1 nvim :nvim -pane Northpass 0 1 :* 0 :/Users/normrasmussen/Documents/Northpass/NP_Custom_Templates 0 nvim :nvim -pane Northpass 0 1 :* 1 :/Users/normrasmussen/Documents/Northpass 1 fish :fish -pane Northpass 1 0 : 0 :/Users/normrasmussen/Documents/Northpass/NP_Startpage 1 nvim :nvim -pane Northpass 2 0 :- 0 :/Users/normrasmussen/Documents/Northpass/Google_Scripts 1 fish : -pane Northpass 3 0 : 0 :/Users/normrasmussen/Documents/Northpass 1 fish :fish -window 1 0 :ssh 0 : b902,101x34,0,0,5 : -window 1 1 :tmux.conf 1 :* cd03,143x48,0,0,6 off -window 1 2 :nvim 0 :- cd04,143x48,0,0,7 : -window Northpass 0 :Templates 1 :* 13d7,148x49,0,0[148x34,0,0,0,148x14,0,35,4] off -window Northpass 1 :Start Page 0 : b25e,80x24,0,0,1 off -window Northpass 2 :Google Apps 0 :- d37f,148x49,0,0,2 off -window Northpass 3 :SSH 0 : b260,80x24,0,0,3 off -state 1 diff --git a/tmux/.config/tmux/resurrect/tmux_resurrect_20220311T125305.txt b/tmux/.config/tmux/resurrect/tmux_resurrect_20220311T125305.txt deleted file mode 100644 index 82be09e..0000000 --- a/tmux/.config/tmux/resurrect/tmux_resurrect_20220311T125305.txt +++ /dev/null @@ -1,16 +0,0 @@ -pane 1 0 0 : 0 :/Users/normrasmussen 1 ssh :ssh norm@192.168.1.12 -pane 1 1 1 :* 0 :/Users/normrasmussen 1 nvim :nvim /Users/normrasmussen/.tmux.conf -pane 1 2 0 :- 0 :/Users/normrasmussen 1 ssh :ssh norm@192.168.1.7 -pane Northpass 0 1 :* 0 :/Users/normrasmussen/Documents/Northpass/NP_Custom_Templates 0 nvim :nvim -pane Northpass 0 1 :* 1 :/Users/normrasmussen/Documents/Northpass 1 fish :fish -pane Northpass 1 0 : 0 :/Users/normrasmussen/Documents/Northpass/NP_Startpage 1 nvim :nvim -pane Northpass 2 0 :- 0 :/Users/normrasmussen/Documents/Northpass/Google_Scripts 1 fish : -pane Northpass 3 0 : 0 :/Users/normrasmussen/Documents/Northpass 1 fish :fish -window 1 0 :ssh 0 : b902,101x34,0,0,5 : -window 1 1 :tmux.conf 1 :* cd03,143x48,0,0,6 off -window 1 2 :ssh 0 :- cd04,143x48,0,0,7 : -window Northpass 0 :Templates 1 :* 13d7,148x49,0,0[148x34,0,0,0,148x14,0,35,4] off -window Northpass 1 :Start Page 0 : b25e,80x24,0,0,1 off -window Northpass 2 :Google Apps 0 :- d37f,148x49,0,0,2 off -window Northpass 3 :SSH 0 : b260,80x24,0,0,3 off -state 1 diff --git a/tmux/.config/tmux/resurrect/tmux_resurrect_20220503T131033.txt b/tmux/.config/tmux/resurrect/tmux_resurrect_20220503T131033.txt deleted file mode 100644 index d72556c..0000000 --- a/tmux/.config/tmux/resurrect/tmux_resurrect_20220503T131033.txt +++ /dev/null @@ -1,5 +0,0 @@ -pane 0 0 1 :* 0 :/Users/normrasmussen 1 ssh :ssh norm@192.168.1.3 -pane 0 1 0 :- 0 :/Users/normrasmussen 1 fish : -window 0 0 :ssh 1 :* b09d,98x51,0,0,0 : -window 0 1 :fish 0 :- b09e,98x51,0,0,1 : -state 0 diff --git a/tmux/.config/tmux/resurrect/tmux_resurrect_20220707T162109.txt b/tmux/.config/tmux/resurrect/tmux_resurrect_20220707T162109.txt deleted file mode 100644 index aeafe6c..0000000 --- a/tmux/.config/tmux/resurrect/tmux_resurrect_20220707T162109.txt +++ /dev/null @@ -1,3 +0,0 @@ -pane 0 0 1 :* 0 :/Users/normrasmussen 1 zsh : -window 0 0 :zsh 1 :* bffd,107x54,0,0,0 : -state 0 diff --git a/tmux/.config/tmux/resurrect/tmux_resurrect_20220913T114203.txt b/tmux/.config/tmux/resurrect/tmux_resurrect_20220913T114203.txt deleted file mode 100644 index fce6761..0000000 --- a/tmux/.config/tmux/resurrect/tmux_resurrect_20220913T114203.txt +++ /dev/null @@ -1,17 +0,0 @@ -pane 1 0 0 :- 0 :/Users/normrasmussen/Documents/Projects/nvim_plugin_mdtodo/lua/plugin 1 nvim :nvim init.lua -pane 1 1 1 :* 0 :/Users/normrasmussen 1 zsh : -pane 2 0 1 :* 0 :/Users/normrasmussen 1 ssh :ssh norm@192.168.200.11 -pane 2 1 0 :- 0 :/Users/normrasmussen 1 nvim :nvim .tmux.conf -pane Northpass 0 0 : 0 :/Users/normrasmussen/Documents/Northpass 1 nvim :nvim -pane Northpass 1 0 :- 0 :/Users/normrasmussen/Documents/Northpass 1 nvim :nvim -pane Northpass 1 0 :- 1 :/Users/normrasmussen/Documents/Northpass/Timetagger 0 zsh : -pane Northpass 2 1 :* 0 :/Users/normrasmussen/.config/nvim 1 nvim :nvim -pane Northpass 2 1 :* 1 :/Users/normrasmussen/.config/nvim 0 zsh : -window 1 0 :nvim 0 :- b981,106x62,0,0,4 : -window 1 1 :whiptailpy 1 :* b982,106x62,0,0,5 off -window 2 0 :ssh 1 :* cd44,119x57,0,0,7 : -window 2 1 :nvim 0 :- cd45,119x57,0,0,8 : -window Northpass 0 :notes 0 : c13d,115x64,0,0,0 off -window Northpass 1 :templates 0 :- a804,136x64,0,0[136x46,0,0,1,136x17,0,47,3] off -window Northpass 2 :nvim-config 1 :* 4f08,136x64,0,0[136x47,0,0,2,136x16,0,48,6] off -state 2 diff --git a/tmux/.config/tmux/sidebar/directory_widths.txt b/tmux/.config/tmux/sidebar/directory_widths.txt deleted file mode 100644 index f288afb..0000000 --- a/tmux/.config/tmux/sidebar/directory_widths.txt +++ /dev/null @@ -1,4 +0,0 @@ -/Users/normrasmussen 40 -/Users/normrasmussen/Documents/Liquid_Templates 40 -/Users/normrasmussen/Documents/Liquid_Templates/customer_templates 69 - 40 diff --git a/tmux/.config/tmux/tmux.conf b/tmux/.config/tmux/tmux.conf deleted file mode 100644 index b04fe9a..0000000 --- a/tmux/.config/tmux/tmux.conf +++ /dev/null @@ -1,50 +0,0 @@ -set-environment -g PATH "/opt/homebrew/bin:/bin:/usr/bin" -set-window-option -g mode-keys vi - -# Standard Plugins -set -g @plugin 'tmux-plugins/tpm' -set -g @plugin 'tmux-plugins/tmux-sensible' - -# Continue Session on Startup -set -g @plugin 'tmux-plugins/tmux-resurrect' -set -g @plugin 'tmux-plugins/tmux-continuum' - -# Search your Scrollback using fzf -# set -g @plugin 'roosta/tmux-fuzzback' - -# Allow Focus Events -set -g focus-events on - -# enable mouse support -set-option -g mouse on - -# Vim-Tmux-Navigator plugin/ -set -g @plugin 'christoomey/vim-tmux-navigator' - -# Dracula -set -g @plugin 'dracula/tmux' -set -g @dracula-plugins "git weather network-ping cpu-usage time" - -#set -g @dracula-show-location false -#set -g @dracula-fixed-location "Parsippany, NJ" -#set -g @dracula-show-powerline true -#set -g @dracula-show-flags true -#set -g @dracula-show-left-icon window -#set -g @dracula-border-contrast true -#set -g @dracula-ping-server "overras.duckdns.org" -#set -g @dracula-ping-rate 5 -#set -g @dracula-cpu-usage-label " " -#set -g @dracula-cpu-usage-colors "pink dark_gray" -#set -g @dracula-git-show-current-symbol ✓ -#set -g @dracula-git-show-diff-symbol ! -#set -g @dracula-git-no-repo-message ⊚ -#set -g @dracula-show-timezone false -#set -g @dracula-military-time true - -#run-shell ~/.dotfiles/tmux/.config/tmux/plugins/tmux-continuum/continuum.tmux - -# Autoreload tmux.conf -# set-option -g @plugin 'b0o/tmux-autoreload' -# Initiazlie TMUX plugin manager - kept at bottom of file -# run '~/.config/tmux/plugins/tpm/tpm' -run '~/.dotfiles/tmux/.config/tmux/plugins/tpm/tpm' diff --git a/tmuxinator/.config/tmuxinator/Flask.yml b/tmuxinator/.config/tmuxinator/Flask.yml deleted file mode 100644 index 9041ec1..0000000 --- a/tmuxinator/.config/tmuxinator/Flask.yml +++ /dev/null @@ -1,9 +0,0 @@ -# ~/Documents/Projects/CSM_webapp/ - -name: Flask -root: ~/Documents/Projects/CSM_webapp/ -on_project_start: pyenv activate csmflask -windows: - - flask: - root: ~/Documents/Projects/CSM_webapp/ - layout: e90b,204x63,0,0[204x46,0,0,0,204x16,0,47{36x16,0,47,2,84x16,37,47,3,82x16,122,47,4}] diff --git a/tmuxinator/.config/tmuxinator/Work.yml b/tmuxinator/.config/tmuxinator/Work.yml deleted file mode 100644 index e596a44..0000000 --- a/tmuxinator/.config/tmuxinator/Work.yml +++ /dev/null @@ -1,24 +0,0 @@ -# /Users/normrasmussen/.config/tmuxinator/NvimTemplates.yml - -name: Northpass -root: ~/ -windows: - - notes: - root: ~/Documents/Work/CustomerNotes - panes: - - nvim - - templates: - root: ~/Documents/Work/Custom_Templates/customer_templates/ - panes: - - nvim - - scripts: - root: ~/Documents/Work/Scripts - layout: main-horizontal - panes: - - nvim - - pyenv activate np_scripts - - dots: - root: ~/.config/nvim/ - panes: - - nvim - - tut-tut: tut diff --git a/zsh/.zshrc b/zsh/.zshrc index b2fecce..d6c624a 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -29,22 +29,21 @@ export PYENV_ROOT="$HOME/.pyenv" command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init -)" -alias nvim-minimal="NVIM_APPNAME=Minivim nvim" +# alias nvim-minimal="NVIM_APPNAME=Minivim nvim" # alias nvim-arduino="NVIM_APPNAME=Arduino nvim" -function nvims() { - items=("Main" "Minivim" "Arduinvim") - config=$(printf "%s\n" "${items[@]}" | fzf --prompt=" Neovim Config  " --height=~50% --layout=reverse --border --exit-0) - if [[ -z $config ]]; then - echo "Nothing selected" - return 0 - elif [[ $config == "Main" ]]; then - config="" - fi - NVIM_APPNAME=$config nvim $@ -} - -bindkey -s ^a "nvims\n" +#function nvims() { +# items=("Main" "Minivim" "Arduinvim") +# config=$(printf "%s\n" "${items[@]}" | fzf --prompt=" Neovim Config  " --height=~50% --layout=reverse --border --exit-0) +# if [[ -z $config ]]; then +# echo "Nothing selected" +# return 0 +# elif [[ $config == "Main" ]]; then +# config="" +# fi +# NVIM_APPNAME=$config nvim $@ +#} +#bindkey -s ^a "nvims\n" # source /Users/normrasmussen/.docker/init-zsh.sh || true # Added by Docker Desktop