diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 5b16c9a..3fbfd3e 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -13,22 +13,22 @@ "cmp-under-comparator": { "branch": "master", "commit": "6857f10272c3cfe930cece2afa2406e1385bfef8" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "deadcolumn.nvim": { "branch": "master", "commit": "b9b5e237371ae5379e280e4df9ecf62e4bc8d7a5" }, - "diffview.nvim": { "branch": "main", "commit": "e91110d2a7f8e2f667666aba6ea089ff823f8748" }, + "diffview.nvim": { "branch": "main", "commit": "500d8b2013812e05ab87db83a8d22319986519f2" }, "distant.nvim": { "branch": "v0.2", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" }, "dracula.nvim": { "branch": "main", "commit": "9fe831e685a76e1a1898a694623b33247c4d036c" }, "f-string-toggle.nvim": { "branch": "main", "commit": "eeaa03be94a0d248aabbb39c29369e97398d9e08" }, "feline.nvim": { "branch": "master", "commit": "d48b6f92c6ccdd6654c956f437be49ea160b5b0c" }, "friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" }, - "gitsigns.nvim": { "branch": "main", "commit": "5d73da785a3c05fd63ac31769079db05169a6ec7" }, + "gitsigns.nvim": { "branch": "main", "commit": "bae45ef449d8811061cc940459e70e883a3aa83a" }, "glow.nvim": { "branch": "main", "commit": "8942dfb05794f436af4fbc90a34393f1fd36f361" }, "headlines.nvim": { "branch": "master", "commit": "74a083a3c32a08be24f7dfcc6f448ecf47857f46" }, "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, "lsp-colors.nvim": { "branch": "main", "commit": "2bbe7541747fd339bdd8923fc45631a09bb4f1e5" }, - "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, + "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" }, - "mason.nvim": { "branch": "main", "commit": "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f" }, + "mason.nvim": { "branch": "main", "commit": "74eac861b013786bf231b204b4ba9a7d380f4bd9" }, "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" }, "mini.fuzzy": { "branch": "stable", "commit": "295763d73cbf580c27a4419364c47b09fc82e0f4" }, "mini.move": { "branch": "main", "commit": "3afd39873eb9171684e554a214c055482444a47d" }, @@ -36,23 +36,24 @@ "mini.surround": { "branch": "main", "commit": "eeaf96562947f75afa51a6266e066529369ca7ef" }, "mini.trailspace": { "branch": "main", "commit": "c41ab1035d184ff20c1aebd76639320c055afebe" }, "mkdnflow.nvim": { "branch": "main", "commit": "a728a3533bb57502fdfd6fdb4e5839fc87430edc" }, - "moonfly": { "branch": "master", "commit": "b978252d794ab2670a9fb8e43c8a1587fb72ce1a" }, - "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, + "moonfly": { "branch": "master", "commit": "fc2bb33f847de9a63c49472adb1ef870b2b7f8a1" }, + "neorg": { "branch": "main", "commit": "66e5a4e4ed7645590ac8388abdedb8f840b88f0d" }, + "neoscroll.nvim": { "branch": "master", "commit": "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb" }, "neovim": { "branch": "main", "commit": "e29002cbee4854a9c8c4b148d8a52fae3176070f" }, "nightfox.nvim": { "branch": "main", "commit": "a48f6d9a0273101df76eb25d2f5477baa277f935" }, "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" }, "numb.nvim": { "branch": "master", "commit": "2c89245d1185e02fec1494c45bc765a38b6b40b3" }, - "nvim": { "branch": "main", "commit": "057c34f849cf21059487d849e2f3b3efcd4ee0eb" }, - "nvim-cmp": { "branch": "main", "commit": "c4e491a87eeacf0408902c32f031d802c7eafce8" }, + "nvim": { "branch": "main", "commit": "490078b1593c6609e6a50ad5001e7902ea601824" }, + "nvim-cmp": { "branch": "main", "commit": "3b9f28061a67b19cadc13946de981426a6425e4a" }, "nvim-dap": { "branch": "master", "commit": "1c63f37f95cd4fb54512898168138d9a75d1516a" }, "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" }, "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, - "nvim-lspconfig": { "branch": "master", "commit": "a59d74e12340242c0735666fb2e91afdbe6f2496" }, + "nvim-lspconfig": { "branch": "master", "commit": "7c73a4dc44c3d62ee79ab9f03ba313251c0388d4" }, "nvim-mapper": { "branch": "main", "commit": "baad83aad85d420cce24dd60106114421ed59039" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, - "nvim-tree.lua": { "branch": "master", "commit": "0a89dcb464b433d2d7b97a8f15d0b608c718dc13" }, - "nvim-treesitter": { "branch": "master", "commit": "4c4d586a05e236d8199ab6faab8cb733a9b5bd24" }, - "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" }, + "nvim-tree.lua": { "branch": "master", "commit": "904f95cd9db31d1800998fa428e78e418a50181d" }, + "nvim-treesitter": { "branch": "master", "commit": "d92bfe2cbd86a9c10d814e38ecbe2fb7442da209" }, + "nvim-web-devicons": { "branch": "master", "commit": "ab899311f8ae00a47eae8e0879506cead8eb1561" }, "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "sidebar.nvim": { "branch": "main", "commit": "990ce5f562c9125283ccac5473235b1a56fea6dc" }, diff --git a/nvim/.config/nvim/lua/core/settings.lua b/nvim/.config/nvim/lua/core/settings.lua index 6184678..5d7d9d7 100644 --- a/nvim/.config/nvim/lua/core/settings.lua +++ b/nvim/.config/nvim/lua/core/settings.lua @@ -24,7 +24,7 @@ opt.shadafile = "" opt.shell = "/bin/zsh" opt.updatetime = 200 opt.cursorline = true ---g.markdown_folding = 1 +g.markdown_folding = 1 opt.spell=true opt.spelllang = 'en_us' cmd [[ autocmd BufWritePre * :%s/\s\+$//e ]] @@ -37,7 +37,7 @@ opt.relativenumber = true -- Show Current Line with Relative numbers above opt.showmatch = true -- Highlight matching parenthesis opt.foldmethod = "syntax" -- Enable folding (default 'foldmarker') opt.cc = '+1,+2,+3' -- Line length marker at 80 columns ---opt.tw = 80 +opt.tw = 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 diff --git a/nvim/.config/nvim/lua/plugins/neorg.lua b/nvim/.config/nvim/lua/plugins/neorg.lua new file mode 100644 index 0000000..4e1d1c0 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/neorg.lua @@ -0,0 +1,27 @@ + return { + "nvim-neorg/neorg", + build = ":Neorg sync-parsers", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + require("neorg").setup { + load = { + ["core.defaults"] = {}, + ["core.concealer"] = {}, + ["core.integrations.nvim-cmp"] = {}, + ["core.integrations.treesitter"] = {}, + ["core.completion"] = { + config = { + engine = "nvim-cmp" + }, + }, + ["core.dirman"] = { + config = { + workspaces = { + customer_notes = "~/Documents/Work/Customer_Notes/", + }, + }, + }, + }, + } + end, + } diff --git a/nvim/.config/nvim/lua/plugins/nvim-cmp.lua b/nvim/.config/nvim/lua/plugins/nvim-cmp.lua index d219cc2..2f8d18d 100644 --- a/nvim/.config/nvim/lua/plugins/nvim-cmp.lua +++ b/nvim/.config/nvim/lua/plugins/nvim-cmp.lua @@ -80,7 +80,7 @@ return { { name = 'path' }, { name = 'nvim_lsp_signature_help' }, { name = 'buffer', keyword_length = 3 }, - -- { name = 'zsh' }, + { name = 'neorg' }, }, formatting = { fields = {'menu', 'abbr', 'kind'}, diff --git a/nvim/.config/nvim/spell/en.utf-8.add b/nvim/.config/nvim/spell/en.utf-8.add index 9f5e449..f92542c 100644 --- a/nvim/.config/nvim/spell/en.utf-8.add +++ b/nvim/.config/nvim/spell/en.utf-8.add @@ -314,3 +314,4 @@ cateogries Glassdoor accomodate Ines +distrcits diff --git a/nvim/.config/nvim/spell/en.utf-8.add.spl b/nvim/.config/nvim/spell/en.utf-8.add.spl index 880578d..1b8c3b9 100644 Binary files a/nvim/.config/nvim/spell/en.utf-8.add.spl and b/nvim/.config/nvim/spell/en.utf-8.add.spl differ diff --git a/tmuxp/Work.yaml b/tmuxp/Work.yaml index 68fe05e..970527e 100644 --- a/tmuxp/Work.yaml +++ b/tmuxp/Work.yaml @@ -1,35 +1,54 @@ session_name: Northpass windows: -- layout: 5e82,204x63,0,0,32 +- layout: c39e,229x45,0,0,1 options: {} panes: - focus: 'true' - shell_command: nvim - start_directory: /Users/normrasmussen/Documents/Work/CustomerNotes + shell_command: zsh + start_directory: /Users/normrasmussen/Documents/Work window_name: notes -- layout: 5e83,204x63,0,0,33 +- focus: 'true' + layout: c39f,229x45,0,0,2 options: {} panes: - focus: 'true' - shell_command: nvim - start_directory: /Users/normrasmussen/Documents/Work/Custom_Templates/customer_templates + shell_command: Python + start_directory: /Users/normrasmussen/.dotfiles/tmuxp window_name: templates -- focus: 'true' - layout: de7c,150x56,0,0[150x44,0,0,34,150x11,0,45,35] +- layout: 40b3,229x45,0,0[229x42,0,0,3,229x2,0,43,4] options: {} panes: - - shell_command: - - cd /Users/normrasmussen/Documents/Work/Scripts - - nvim - focus: 'true' shell_command: + - cd /Users/normrasmussen/Documents/Work/Scripts/GoogleScripts/Luminate_API_Exam + - zsh + - shell_command: - cd /Users/normrasmussen/Documents/Work/Scripts/API_Tests - - Python + - zsh window_name: scripts -- layout: 5e86,204x63,0,0,36 +- layout: c3c2,196x45,0,0,5 options: {} panes: - focus: 'true' - shell_command: nvim - start_directory: /Users/normrasmussen/.dotfiles/nvim/.config/nvim + shell_command: zsh + start_directory: /Users/normrasmussen/.dotfiles window_name: dots +- layout: 60a9,229x45,0,0[229x42,0,0,6,229x2,0,43,18] + options: {} + panes: + - focus: 'true' + shell_command: zsh + - zsh + start_directory: /Users/normrasmussen/Documents/Projects/nginx_docs + window_name: nginx +- layout: 0ceb,229x45,0,0{115x45,0,0,11,113x45,116,0,14} + options: {} + panes: + - focus: 'true' + shell_command: + - cd /Users/normrasmussen/Documents/Projects + - zsh + - shell_command: + - cd /Users/normrasmussen + - zsh + window_name: zsh