diff --git a/init.lua b/init.lua index 2a7c37d..77a8b1b 100644 --- a/init.lua +++ b/init.lua @@ -1,4 +1,5 @@ require("core.options") require("core.keymaps") +require("core.l-devorak-keymap") require("core.autocmd") require("core.lazy") diff --git a/lazy-lock.json b/lazy-lock.json index 39d2180..be2ead3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -10,8 +10,8 @@ "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, + "github-nvim-theme": { "branch": "main", "commit": "d92e1143e5aaa0d7df28a26dd8ee2102df2cadd8" }, "gitsigns.nvim": { "branch": "main", "commit": "70584ff9aae8078b64430c574079d79620b8f06d" }, - "gruvbox.nvim": { "branch": "main", "commit": "6e4027ae957cddf7b193adfaec4a8f9e03b4555f" }, "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, diff --git a/lua/core/options.lua b/lua/core/options.lua index 4624376..a26bc67 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -24,6 +24,7 @@ set.smarttab = true -- 4 spaces are deleted on backspace -- UI config set.cursorline = true +set.cursorcolumn = true set.termguicolors = true set.colorcolumn = "96" set.number = true -- show absolute number diff --git a/lua/plugins/github-nvim-theme.lua b/lua/plugins/github-nvim-theme.lua new file mode 100644 index 0000000..a032bd4 --- /dev/null +++ b/lua/plugins/github-nvim-theme.lua @@ -0,0 +1,12 @@ +return { + 'projekt0n/github-nvim-theme', + lazy = false, -- make sure we load this during startup if it is your main colorscheme + priority = 1000, -- make sure to load this before all the other start plugins + config = function() + require('github-theme').setup({ + -- ... + }) + + vim.cmd('colorscheme github_dark_high_contrast') + end, +} diff --git a/lua/plugins/gruvbox.lua b/lua/plugins/gruvbox.lua deleted file mode 100644 index e7639a8..0000000 --- a/lua/plugins/gruvbox.lua +++ /dev/null @@ -1,35 +0,0 @@ -local M = { - "ellisonleao/gruvbox.nvim", -} - -M.config = function() - local gruvbox = require("gruvbox") - - -- setup must be called before loading the colorscheme - gruvbox.setup({ - undercurl = true, - underline = true, - bold = true, - italic = { - strings = false, - operators = false, - comments = true, - folds = true, - }, - strikethrough = true, - invert_selection = false, - invert_signs = false, - invert_tabline = false, - invert_intend_guides = false, - inverse = true, -- invert background for search, diffs, statuslines and errors - contrast = "hard", -- can be "hard", "soft" or empty string - palette_overrides = {}, - overrides = {}, - dim_inactive = false, - transparent_mode = false, - }) - - vim.cmd("colorscheme gruvbox") -end - -return M