summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lua/core/init.lua6
-rw-r--r--lua/plugins/colorscheme.lua85
-rw-r--r--lua/plugins/lualine.lua4
3 files changed, 48 insertions, 47 deletions
diff --git a/lua/core/init.lua b/lua/core/init.lua
index a84627f..05a3bb5 100644
--- a/lua/core/init.lua
+++ b/lua/core/init.lua
@@ -1,5 +1,6 @@
vim.g.mapleader = " "
vim.opt.encoding = "utf-8"
+vim.opt.termguicolors = true
vim.opt.wildmenu = true -- Show mathes with tab-completion
vim.opt.number = true
vim.opt.relativenumber = true
@@ -18,8 +19,9 @@ vim.opt.spelllang = "fr" -- why does french exist...
vim.api.nvim_set_keymap("n", "Y", "y$", {}) -- What should have been `Y`
vim.api.nvim_set_keymap("t", "<Esc>", "<C-\\><C-n>", {}) -- terminal mode Esc
-vim.keymap.set("v", "<s-l>", ":m '>+1<cr>gv=gv")
-vim.keymap.set("v", "<s-h>", ":m '<-2<cr>gv=gv")
+-- TODO: turn this into a plugin? (count + single undo)
+vim.keymap.set("v", "<s-j>", ":m '>+1<cr>gv=gv")
+vim.keymap.set("v", "<s-k>", ":m '<-2<cr>gv=gv")
-- Netrw preferences when not using lf
vim.g.netrw_liststyle = 3
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
index 60e4fbf..0a2e1f7 100644
--- a/lua/plugins/colorscheme.lua
+++ b/lua/plugins/colorscheme.lua
@@ -1,49 +1,48 @@
return {
+ {
+ "nvim-treesitter/nvim-treesitter",
+ build = ":TSUpdate",
+ config = function()
+ local configs = require("nvim-treesitter.configs")
+ ---@diagnostic disable-next-line: missing-fields
+ configs.setup({
+ -- List of languages in-> :h
+ ensure_installed = {
+ "c",
+ "go",
+ "bash",
+ "lua",
+ "python",
+ "vim",
+ "vimdoc",
+ "gitignore",
+ "mermaid",
+ "markdown",
+ "rnoweb",
+ "r",
+ "rust",
+ "dockerfile",
+ "graphql",
+ "yaml",
+ "json",
+ "xml",
+ "sxhkdrc",
+ "zathurarc",
+ },
+ ignore_install = {
+ "javascript",
+ "typescript",
+ },
+ sync_install = false,
+ highlight = { enable = true },
+ indent = { enable = false },
+ additional_vim_regex_highlighting = false,
+ })
+ end,
+ },
{ -- No nonsense, very stoic
"aktersnurra/no-clown-fiesta.nvim",
- dependencies = {
- {
- "nvim-treesitter/nvim-treesitter",
- build = ":TSUpdate",
- config = function()
- local configs = require("nvim-treesitter.configs")
- ---@diagnostic disable-next-line: missing-fields
- configs.setup({
- -- List of languages in-> :h
- ensure_installed = {
- "c",
- "go",
- "bash",
- "lua",
- "python",
- "vim",
- "vimdoc",
- "gitignore",
- "mermaid",
- "markdown",
- "rnoweb",
- "r",
- "rust",
- "dockerfile",
- "graphql",
- "yaml",
- "json",
- "xml",
- "sxhkdrc",
- "zathurarc",
- },
- ignore_install = {
- "javascript",
- "typescript",
- },
- sync_install = false,
- highlight = { enable = true },
- indent = { enable = false },
- additional_vim_regex_highlighting = false,
- })
- end,
- },
- },
+ dependencies = "nvim-treesitter/nvim-treesitter",
lazy = false,
priority = 1000,
config = function()
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
index ca6d853..84b126a 100644
--- a/lua/plugins/lualine.lua
+++ b/lua/plugins/lualine.lua
@@ -47,8 +47,8 @@ return {
},
},
lualine_b = { "branch" },
- lualine_c = { filepath },
- lualine_x = {},
+ lualine_c = {},
+ lualine_x = { filepath },
lualine_y = { "filetype" },
lualine_z = { "location" },
},