Merge branch 'master' into laptop
This commit is contained in:
		
						commit
						9da7a9a42e
					
				| 
						 | 
					@ -257,7 +257,7 @@ return {
 | 
				
			||||||
            settings = {
 | 
					            settings = {
 | 
				
			||||||
                ltex = {
 | 
					                ltex = {
 | 
				
			||||||
                    enabled = true,
 | 
					                    enabled = true,
 | 
				
			||||||
                    language = "en-US"
 | 
					                    language = "en-GB"
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -21,31 +21,36 @@ return {
 | 
				
			||||||
        workspaces = {
 | 
					        workspaces = {
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                name = "Lumentis",
 | 
					                name = "Lumentis",
 | 
				
			||||||
                path = "~/Workspace/DnD/Lumentis",
 | 
					                path = "~/Workspace/Notes/Lumentis",
 | 
				
			||||||
 | 
					                override = {
 | 
				
			||||||
 | 
					                    daily_notes = {
 | 
				
			||||||
 | 
					                        folder = vim.NIL,
 | 
				
			||||||
 | 
					                    },
 | 
				
			||||||
 | 
					                },
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                name = "Notes",
 | 
					                name = "Lumentis-Players",
 | 
				
			||||||
                path = "~/Workspace/Notes",
 | 
					                path = "~/Workspace/Notes/Lumentis-Players",
 | 
				
			||||||
 | 
					                override = {
 | 
				
			||||||
 | 
					                    daily_notes = {
 | 
				
			||||||
 | 
					                        folder = vim.NIL,
 | 
				
			||||||
 | 
					                    },
 | 
				
			||||||
 | 
					                },
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                name = "PhD-Notes",
 | 
					                name = "Personal",
 | 
				
			||||||
                path = "~/Workspace/University/PhD/Notes",
 | 
					                path = "~/Workspace/Notes/Personal",
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                name = "PhD",
 | 
				
			||||||
 | 
					                path = "~/Workspace/Notes/PhD",
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                name = "DnD",
 | 
					                name = "DnD",
 | 
				
			||||||
                path = "~/Workspace/DnD",
 | 
					                path = "~/Workspace/Notes/DnD",
 | 
				
			||||||
            },
 | 
					                override = {
 | 
				
			||||||
            {
 | 
					                    daily_notes = {
 | 
				
			||||||
                name = "no-vault",
 | 
					                        folder = vim.NIL,
 | 
				
			||||||
                path = function()
 | 
					 | 
				
			||||||
                    -- alternatively use the CWD:
 | 
					 | 
				
			||||||
                    return assert(vim.fn.getcwd())
 | 
					 | 
				
			||||||
                    -- return assert(vim.fs.dirname(vim.api.nvim_buf_get_name(0)))
 | 
					 | 
				
			||||||
                end,
 | 
					 | 
				
			||||||
                overrides = {
 | 
					 | 
				
			||||||
                    notes_subdir = vim.NIL,  -- have to use 'vim.NIL' instead of 'nil'
 | 
					 | 
				
			||||||
                    completion = {
 | 
					 | 
				
			||||||
                        new_notes_location = "current_dir",
 | 
					 | 
				
			||||||
                    },
 | 
					                    },
 | 
				
			||||||
                },
 | 
					                },
 | 
				
			||||||
            },
 | 
					            },
 | 
				
			||||||
| 
						 | 
					@ -65,6 +70,7 @@ return {
 | 
				
			||||||
        {"<cr>", "<cmd>ObsidianLink<cr>", ft = "markdown", mode = "v"},
 | 
					        {"<cr>", "<cmd>ObsidianLink<cr>", ft = "markdown", mode = "v"},
 | 
				
			||||||
        {"<leader>rn", "<cmd>ObsidianRename<cr>", ft = "markdown" },
 | 
					        {"<leader>rn", "<cmd>ObsidianRename<cr>", ft = "markdown" },
 | 
				
			||||||
        {"<leader>l", "i- [ ] ", ft = "markdown"},
 | 
					        {"<leader>l", "i- [ ] ", ft = "markdown"},
 | 
				
			||||||
 | 
					        {"<leader>o", "o- [ ] ", ft = "markdown"},
 | 
				
			||||||
        {"<leader>l", "- [ ] ", ft = "markdown", mode = "i" },
 | 
					        {"<leader>l", "- [ ] ", ft = "markdown", mode = "i" },
 | 
				
			||||||
        {"<leader>jt", "<cmd>ObsidianToday<cr>"},
 | 
					        {"<leader>jt", "<cmd>ObsidianToday<cr>"},
 | 
				
			||||||
        {"<leader>jy", "<cmd>ObsidianYesterday<cr>"},
 | 
					        {"<leader>jy", "<cmd>ObsidianYesterday<cr>"},
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -3,3 +3,4 @@ logits
 | 
				
			||||||
OpenSwarm
 | 
					OpenSwarm
 | 
				
			||||||
Lumentis
 | 
					Lumentis
 | 
				
			||||||
stochasticity
 | 
					stochasticity
 | 
				
			||||||
 | 
					Feywild
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue