diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index b20b731..ed40a6e 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,6 +1,8 @@ { - "LuaSnip": { "branch": "master", "commit": "c7984d1cca3d8615e4daefc196597872a0b8d590" }, + "LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" }, "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": "44b16d11215dce86f253ce0c30949813c0a90765" }, @@ -8,18 +10,59 @@ "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" }, + "dracula.nvim": { "branch": "main", "commit": "5716b1395b32a5865476dd3314bd8888e5f91532" }, + "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" }, + "friendly-snippets": { "branch": "main", "commit": "5749f093759c29e3694053d048ceb940fe12c3d3" }, "gitsigns.nvim": { "branch": "main", "commit": "a36bc3360d584d39b4fb076d855c4180842d4444" }, + "glow.nvim": { "branch": "main", "commit": "bbd0473d72a45094495ee5600b5577823543eefe" }, "headlines.nvim": { "branch": "master", "commit": "ddef41b2664f0ce25fe76520d708e2dc9dfebd70" }, + "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" }, "lazy.nvim": { "branch": "main", "commit": "4c8b625bc873ca76b76eee0c28c98f1f7148f17f" }, + "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": "c993ca55e3991535bc74cd2d6ef273810d066c84" }, + "mason.nvim": { "branch": "main", "commit": "db58ec7bc9248fb1878172f90cadc825b77564a6" }, + "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": "1f5eafead7e2da58951942d3b2996bd10c43980c" }, + "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, + "neovim": { "branch": "main", "commit": "932adb0d9351186db047302de021bb2976756a07" }, + "nightfox.nvim": { "branch": "main", "commit": "77aa7458d2b725c2d9ff55a18befe1b891ac473e" }, "null-ls.nvim": { "branch": "main", "commit": "bbaf5a96913aa92281f154b08732be2f57021c45" }, + "nvim": { "branch": "main", "commit": "8d02781a638123394f9bc160aad47a9560a113f9" }, "nvim-cmp": { "branch": "main", "commit": "e1f1b40790a8cb7e64091fb12cc5ffe350363aa0" }, + "nvim-dap": { "branch": "master", "commit": "a6d48d23407fbad7a4c1451803b8f34cab31c441" }, + "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, + "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" }, "nvim-lspconfig": { "branch": "master", "commit": "b6b34b9acf84949f0ac1c00747765e62b81fb38d" }, "nvim-mapper": { "branch": "main", "commit": "baad83aad85d420cce24dd60106114421ed59039" }, - "nvim-treesitter": { "branch": "master", "commit": "d49ba798c95398e62321b40041e8ac4654fea251" }, + "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, + "nvim-tree.lua": { "branch": "master", "commit": "3cc698b35b0a67792c61e1726830bb9ecfc4c9f4" }, + "nvim-treesitter": { "branch": "master", "commit": "bad9f5bf5b4af5d97a9cffdc957f1b23dc91d851" }, "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" }, "plenary.nvim": { "branch": "master", "commit": "36aaceb6e93addd20b1b18f94d86aecc552f30c4" }, + "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, + "sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" }, + "starry.nvim": { "branch": "master", "commit": "9c4f8669acb302300e1495d4b1f1e618524a48f4" }, "styler.nvim": { "branch": "main", "commit": "d5b7e43af4fdaa06e4175c84f4f57b633ae7e6ff" }, + "symbols-outline.nvim": { "branch": "master", "commit": "512791925d57a61c545bc303356e8a8f7869763c" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "acf2eade45563803afdd4e9873a8481bc98bd726" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, "telescope-live-grep-args.nvim": { "branch": "master", "commit": "0f75ea809c46af8997c64f49c52e3c641d887885" }, - "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" } + "telescope.nvim": { "branch": "master", "commit": "c1a2af0af69e80e14e6b226d3957a064cd080805" }, + "tmux.nvim": { "branch": "main", "commit": "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9" }, + "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, + "tokyonight.nvim": { "branch": "main", "commit": "fd0a005fd8986ec0d98a1938dc570303e8d8444b" }, + "trouble.nvim": { "branch": "main", "commit": "d99e2abd10808ef91738ce98a5c767e6a51df449" }, + "vim-arduino": { "branch": "master", "commit": "111db616db21d4f925691f1517792953f7671647" }, + "vim-wakatime": { "branch": "master", "commit": "018fa9a80c27ccf2a8967b9e27890372e5c2fb4f" }, + "which-key.nvim": { "branch": "main", "commit": "d871f2b664afd5aed3dc1d1573bef2fb24ce0484" } } \ No newline at end of file diff --git a/nvim/.config/nvim/lua/core/settings.lua b/nvim/.config/nvim/lua/core/settings.lua index 2445331..6771843 100644 --- a/nvim/.config/nvim/lua/core/settings.lua +++ b/nvim/.config/nvim/lua/core/settings.lua @@ -57,7 +57,8 @@ opt.synmaxcol = 240 -- Max column for syntax highlight -- Colorscheme ----------------------------------------------------------- opt.termguicolors = true -- Enable 24-bit RGB colors -cmd[[colorscheme dracula]] +--cmd[[colorscheme dracula]] +cmd[[colorscheme lunaperche]] ----------------------------------------------------------- -- Tabs, indent ----------------------------------------------------------- diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 9d98687..3223c55 100755 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -236,7 +236,7 @@ return { 'lukas-reineke/indent-blankline.nvim', 'folke/lsp-colors.nvim', - 'Mofiqul/dracula.nvim' + 'Mofiqul/dracula.nvim', 'karb94/neoscroll.nvim', -- Allow Popups for Telescope etc diff --git a/tmux/.config/tmux/plugins/.DS_Store b/tmux/.config/tmux/plugins/.DS_Store new file mode 100644 index 0000000..809d590 Binary files /dev/null and b/tmux/.config/tmux/plugins/.DS_Store differ diff --git a/tmux/.config/tmux/plugins/tmux b/tmux/.config/tmux/plugins/tmux new file mode 160000 index 0000000..79068c4 --- /dev/null +++ b/tmux/.config/tmux/plugins/tmux @@ -0,0 +1 @@ +Subproject commit 79068c40b39351f683494e6afbf3ccd6bb6fb086 diff --git a/tmux/.config/tmux/plugins/tmux-continuum b/tmux/.config/tmux/plugins/tmux-continuum new file mode 160000 index 0000000..3e4bc35 --- /dev/null +++ b/tmux/.config/tmux/plugins/tmux-continuum @@ -0,0 +1 @@ +Subproject commit 3e4bc35da41f956c873aea716c97555bf1afce5d diff --git a/tmux/.config/tmux/plugins/tmux-resurrect b/tmux/.config/tmux/plugins/tmux-resurrect new file mode 160000 index 0000000..cff343c --- /dev/null +++ b/tmux/.config/tmux/plugins/tmux-resurrect @@ -0,0 +1 @@ +Subproject commit cff343cf9e81983d3da0c8562b01616f12e8d548 diff --git a/tmux/.config/tmux/plugins/tmux-sensible b/tmux/.config/tmux/plugins/tmux-sensible new file mode 160000 index 0000000..25cb91f --- /dev/null +++ b/tmux/.config/tmux/plugins/tmux-sensible @@ -0,0 +1 @@ +Subproject commit 25cb91f42d020f675bb0a2ce3fbd3a5d96119efa diff --git a/tmux/.config/tmux/plugins/tpm b/tmux/.config/tmux/plugins/tpm new file mode 160000 index 0000000..99469c4 --- /dev/null +++ b/tmux/.config/tmux/plugins/tpm @@ -0,0 +1 @@ +Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946 diff --git a/tmux/.config/tmux/plugins/vim-tmux-navigator b/tmux/.config/tmux/plugins/vim-tmux-navigator new file mode 160000 index 0000000..cdd66d6 --- /dev/null +++ b/tmux/.config/tmux/plugins/vim-tmux-navigator @@ -0,0 +1 @@ +Subproject commit cdd66d6a37d991bba7997d593586fc51a5b37aa8 diff --git a/tmux/.config/tmux/resurrect/last b/tmux/.config/tmux/resurrect/last new file mode 100644 index 0000000..fce6761 --- /dev/null +++ b/tmux/.config/tmux/resurrect/last @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..0faf7c2 --- /dev/null +++ b/tmux/.config/tmux/resurrect/tmux_resurrect_20220311T122826.txt @@ -0,0 +1,16 @@ +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 new file mode 100644 index 0000000..82be09e --- /dev/null +++ b/tmux/.config/tmux/resurrect/tmux_resurrect_20220311T125305.txt @@ -0,0 +1,16 @@ +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 new file mode 100644 index 0000000..d72556c --- /dev/null +++ b/tmux/.config/tmux/resurrect/tmux_resurrect_20220503T131033.txt @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000..aeafe6c --- /dev/null +++ b/tmux/.config/tmux/resurrect/tmux_resurrect_20220707T162109.txt @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..fce6761 --- /dev/null +++ b/tmux/.config/tmux/resurrect/tmux_resurrect_20220913T114203.txt @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..f288afb --- /dev/null +++ b/tmux/.config/tmux/sidebar/directory_widths.txt @@ -0,0 +1,4 @@ +/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 new file mode 100644 index 0000000..d93f016 --- /dev/null +++ b/tmux/.config/tmux/tmux.conf @@ -0,0 +1,46 @@ +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 network-ping cpu-usage time" + +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 + +# Initiazlie TMUX plugin manager - kept at bottom of file +# run '~/.config/tmux/plugins/tpm/tpm' +run '~/.dotfiles/tmux/.config/tmux/plugins/tpm/tpm'