Skip to content

Commit

Permalink
Changing up the theme
Browse files Browse the repository at this point in the history
Nord theme was causing issues with tree sitter highlights
Was most noticable with org files.
nordtheme/vim#268
  • Loading branch information
JBarlowDev committed Jul 8, 2022
1 parent 2c24738 commit 56f714e
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .config/nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ require('lualine').setup()
require('plugConfig.notes')
--require('plugConfig.neorg')
require('plugConfig.orgmode')

--require('onedark').setup {
-- style = 'dark'
--}
--require('onedark').load()
10 changes: 5 additions & 5 deletions .config/nvim/lua/keymap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ keymap('n', '<Leader>zf', ':lua require("telekasten").find_notes()<CR>', opts)
keymap('n', '<Leader>z', ':lua require("telekasten").panel()<CR>', opts)

-- Neorg Not using default https://github.com/nvim-neorg/neorg/blob/main/lua/neorg/modules/core/keybinds/keybinds.lua
keymap('n', '<Leader>otc', ':Neorg keybind norg core.gtd.base.capture<CR>', opts)
keymap('n', '<Leader>otv', ':Neorg keybind norg core.gtd.base.views<CR>', opts)
keymap('n', '<Leader>ote', ':Neorg keybind norg core.gtd.base.edit<CR>', opts)
keymap('n', '<Leader>ott', ':Neorg keybind norg core.norg.qol.todo_items.todo.task_cycle<CR>', opts)
keymap('n', '<Leader>oo', ':Neorg keybind norg core.norg.esupports.hop.hop-link<CR>', opts)
--keymap('n', '<Leader>otc', ':Neorg keybind norg core.gtd.base.capture<CR>', opts)
--keymap('n', '<Leader>otv', ':Neorg keybind norg core.gtd.base.views<CR>', opts)
--keymap('n', '<Leader>ote', ':Neorg keybind norg core.gtd.base.edit<CR>', opts)
--keymap('n', '<Leader>ott', ':Neorg keybind norg core.norg.qol.todo_items.todo.task_cycle<CR>', opts)
--keymap('n', '<Leader>oo', ':Neorg keybind norg core.norg.esupports.hop.hop-link<CR>', opts)


2 changes: 1 addition & 1 deletion .config/nvim/lua/options.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
vim.cmd "colorscheme nord"
vim.cmd "colorscheme nordfox"
vim.o.number = true
vim.o.relativenumber = true
vim.o.mouse = "a"
Expand Down
3 changes: 2 additions & 1 deletion .config/nvim/lua/plugConfig/treesitter.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
--require('orgmode').setup_ts_grammar()
require('orgmode').setup_ts_grammar()

require'nvim-treesitter.configs'.setup {
ensure_installed = {'lua', 'javascript', 'typescript', 'tsx', 'org'},
Expand All @@ -7,3 +7,4 @@ require'nvim-treesitter.configs'.setup {
additional_vim_regex_highlighting = {'org'}
}
}

3 changes: 3 additions & 0 deletions .config/nvim/lua/plugins.lua
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,8 @@ use "folke/which-key.nvim"

-- Colour Schemes
use 'arcticicestudio/nord-vim'
use 'EdenEast/nightfox.nvim'
--use 'ful1e5/onedark.nvim'
use 'navarasu/onedark.nvim'

end)

0 comments on commit 56f714e

Please sign in to comment.