mirror of
				https://github.com/halfdan/dotfiles.git
				synced 2025-10-31 12:36:12 +00:00 
			
		
		
		
	Update colorscheme, add neorg
This commit is contained in:
		| @@ -21,10 +21,12 @@ | ||||
|   "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" }, | ||||
|   "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, | ||||
|   "lspsaga.nvim": { "branch": "main", "commit": "a751b92b5d765a99fe3a42b9e51c046f81385e15" }, | ||||
|   "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, | ||||
|   "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, | ||||
|   "monokai-pro.nvim": { "branch": "master", "commit": "2bad2a92fe0ff6c8581d33a853a1b17592b83239" }, | ||||
|   "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, | ||||
|   "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, | ||||
|   "neorg": { "branch": "main", "commit": "81ee90cb2d72ac43bfadb7dd276646f34c8f85be" }, | ||||
|   "neorg-telescope": { "branch": "main", "commit": "ddb2556644cae922699a239bbb0fe16e25b084b7" }, | ||||
|   "neotest": { "branch": "master", "commit": "32ff2ac21135a372a42b38ae131e531e64833bd3" }, | ||||
|   "neotest-elixir": { "branch": "master", "commit": "c5067bcc3ec6a0bba7b5694fa15aeb17f16aeb3c" }, | ||||
|   "neotest-rust": { "branch": "main", "commit": "0418811e1e3499b2501593f2e131d02f5e6823d4" }, | ||||
| @@ -36,15 +38,17 @@ | ||||
|   "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, | ||||
|   "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" }, | ||||
|   "nvim-lsp-installer": { "branch": "main", "commit": "17e0bfa5f2c8854d1636fcd036dc8284db136baa" }, | ||||
|   "nvim-lspconfig": { "branch": "master", "commit": "a67bc39aaa4f1e13212c5022a561120846eaef27" }, | ||||
|   "nvim-lspconfig": { "branch": "master", "commit": "ad32182cc4a03c8826a64e9ced68046c575fdb7d" }, | ||||
|   "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, | ||||
|   "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, | ||||
|   "nvim-treesitter": { "branch": "master", "commit": "047ce49ccf9a2dce22e1cf3843bef3b5682a8144" }, | ||||
|   "nvim-treesitter": { "branch": "master", "commit": "3de418e73d5b912096229aaeea8bb7aef5094e0d" }, | ||||
|   "nvim-treesitter-textobjects": { "branch": "master", "commit": "ced6375723b20616282f9f6a1018a63ae19b106a" }, | ||||
|   "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, | ||||
|   "pathlib.nvim": { "branch": "main", "commit": "7a5a6facd29e306bc73a37719fa67c0d2226f852" }, | ||||
|   "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, | ||||
|   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, | ||||
|   "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, | ||||
|   "rose-pine": { "branch": "main", "commit": "cf8de969c49b1d879091ae9048715f4aacd4f9fb" }, | ||||
|   "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" }, | ||||
|   "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, | ||||
|   "smart-open.nvim": { "branch": "0.2.x", "commit": "87626ee8748b9bba22093adec7bb58c63e7214f0" }, | ||||
| @@ -54,7 +58,7 @@ | ||||
|   "telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" }, | ||||
|   "telescope-egrepify.nvim": { "branch": "master", "commit": "a30396791c3f67b8f34d42dfc26db2f868ae9154" }, | ||||
|   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, | ||||
|   "telescope.nvim": { "branch": "master", "commit": "43c47ebc49ba601c7f0d06d65ce61d6aa8e670ab" }, | ||||
|   "telescope.nvim": { "branch": "master", "commit": "68a6d8e8a0a8276ad56dc2a5bc29a4767a8eb5da" }, | ||||
|   "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" }, | ||||
|   "vim-dispatch": { "branch": "master", "commit": "4c695bc052cad2ae6b980aebbe48d046466e27ae" }, | ||||
|   "vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" }, | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| vim.cmd('let g:nvcode_termcolors=256') | ||||
|  | ||||
| vim.cmd('colorscheme monokai-pro-classic') | ||||
| vim.cmd('colorscheme rose-pine') | ||||
|  | ||||
| -- vim.cmd('highlight Normal guibg=NONE ctermbg=NONE')   | ||||
|   | ||||
| @@ -8,7 +8,6 @@ else | ||||
|   vim.notify = require("notify") | ||||
|  | ||||
|   require("halfdan.neogit") | ||||
|   -- require("halfdan.neorg") | ||||
|   -- require('halfdan.globals') | ||||
|   require('halfdan.keymap') | ||||
|   require('halfdan.cmp') | ||||
|   | ||||
| @@ -107,8 +107,40 @@ require("lazy").setup({ | ||||
|  | ||||
|       {'rcarriga/nvim-notify'}, | ||||
|  | ||||
|       -- { "nvim-neorg/neorg" }, | ||||
|       -- {'nvim-neorg/neorg-telescope'}, | ||||
|       { | ||||
|           "nvim-neorg/neorg", | ||||
|           lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default | ||||
|           version = "*", -- Pin Neorg to the latest stable release | ||||
|           config = function() | ||||
|             require('neorg').setup({ | ||||
|               load = { | ||||
|                 ["core.defaults"] = {}, | ||||
|                 ["core.dirman"] = { | ||||
|                   config = { | ||||
|                     workspaces = { | ||||
|                       work = "~/org/work", | ||||
|                       home = "~/org/home", | ||||
|                     }, | ||||
|                     index = "index.norg", | ||||
|                   } | ||||
|                 }, | ||||
|                 ["core.completion"] = { | ||||
|                   config = { | ||||
|                     engine = "nvim-cmp", | ||||
|                   }, | ||||
|                 }, | ||||
|                 ["core.concealer"] = {}, | ||||
|                 ["core.journal"] = { | ||||
|                   config = { | ||||
|                     strategy = "flat", | ||||
|                   }, | ||||
|                 }, | ||||
|                 ["core.integrations.telescope"] = {}, | ||||
|               } | ||||
|             }) | ||||
|         end, | ||||
|       }, | ||||
|       {'nvim-neorg/neorg-telescope'}, | ||||
|  | ||||
|       {'justinmk/vim-sneak'}, | ||||
|  | ||||
| @@ -230,60 +262,8 @@ require("lazy").setup({ | ||||
|     {'tpope/vim-projectionist'}, | ||||
|     -- themes & colorschemes | ||||
|     -- {'gruvbox-community/gruvbox'}, | ||||
|     { "rose-pine/neovim", name = "rose-pine" }, | ||||
|     {'luisiacc/gruvbox-baby'}, | ||||
|     { | ||||
|       'https://github.com/loctvl842/monokai-pro.nvim', | ||||
|       as = 'monokai-pro.nvim', | ||||
|       config = function () | ||||
|         local monokai = require("monokai-pro") | ||||
|         monokai.setup({ | ||||
|           transparent_background = false, | ||||
|           terminal_colors = true, | ||||
|           devicons = true, -- highlight the icons of `nvim-web-devicons` | ||||
|           styles = { | ||||
|             comment = { italic = true }, | ||||
|             keyword = { italic = true }, -- any other keyword | ||||
|             type = { italic = true }, -- (preferred) int, long, char, etc | ||||
|             storageclass = { italic = true }, -- static, register, volatile, etc | ||||
|             structure = { italic = true }, -- struct, union, enum, etc | ||||
|             parameter = { italic = true }, -- parameter pass in function | ||||
|             annotation = { italic = true }, | ||||
|             tag_attribute = { italic = true }, -- attribute of tag in reactjs | ||||
|           }, | ||||
|           filter = "classic", -- classic | octagon | pro | machine | ristretto | spectrum | ||||
|           -- Enable this will disable filter option | ||||
|           day_night = { | ||||
|             enable = false, -- turn off by default | ||||
|             day_filter = "classic", -- classic | octagon | pro | machine | ristretto | spectrum | ||||
|             night_filter = "spectrum", -- classic | octagon | pro | machine | ristretto | spectrum | ||||
|           }, | ||||
|           inc_search = "background", -- underline | background | ||||
|           background_clear = { | ||||
|             "nvim-tree", | ||||
|             "neo-tree", | ||||
|             "bufferline", | ||||
|             "telescope", | ||||
|             "toggleterm", | ||||
|           }, | ||||
|           plugins = { | ||||
|             bufferline = { | ||||
|               underline_selected = false, | ||||
|               underline_visible = false, | ||||
|             }, | ||||
|             indent_blankline = { | ||||
|               context_highlight = "default", -- default | pro | ||||
|               context_start_underline = false, | ||||
|             }, | ||||
|           }, | ||||
|           override = function(c) | ||||
|             return { | ||||
|               ColorColumn = { bg = c.base.dimmed3 }, | ||||
|             } | ||||
|           end, | ||||
|         }) | ||||
|         monokai.load() | ||||
|       end | ||||
|     }, | ||||
|     {'akinsho/bufferline.nvim', version = "*", dependencies = 'nvim-tree/nvim-web-devicons', | ||||
|       keys = { | ||||
|         { "<C-1>", "<Cmd>BufferLineGoToBuffer 1<CR>", desc = "Go to buffer 1" }, | ||||
|   | ||||
| @@ -1,27 +0,0 @@ | ||||
| local neorg = require("neorg") | ||||
|  | ||||
| neorg.setup({ | ||||
|   load = { | ||||
|     ["core.defaults"] = {}, | ||||
|     ["core.dirman"] = { | ||||
|       config = { | ||||
|         workspaces = { | ||||
|           work = "~/org/work", | ||||
|           home = "~/org/home", | ||||
|         } | ||||
|       } | ||||
|     }, | ||||
|     ["core.completion"] = { | ||||
|       config = { | ||||
|         engine = "nvim-cmp", | ||||
|       }, | ||||
|     }, | ||||
|     ["core.concealer"] = {}, | ||||
|     ["core.journal"] = { | ||||
|       config = { | ||||
|         strategy = "flat", | ||||
|       }, | ||||
|     }, | ||||
|     ["core.integrations.telescope"] = {}, | ||||
|   } | ||||
| }) | ||||
		Reference in New Issue
	
	Block a user