From 8b129ecd203491dfa45e6aa8453bbdc8e1656373 Mon Sep 17 00:00:00 2001 From: Juni Kim Date: Sun, 5 Feb 2023 22:49:35 -0500 Subject: [PATCH] gitsigns and zen mode --- after/plugin/gitsigns.lua | 1 + after/plugin/treesitter.lua | 2 +- after/plugin/zenmode.lua | 7 +++++-- lua/junikim/packer.lua | 2 +- lua/junikim/remap.lua | 2 +- lua/junikim/theme.lua | 1 - 6 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 after/plugin/gitsigns.lua diff --git a/after/plugin/gitsigns.lua b/after/plugin/gitsigns.lua new file mode 100644 index 0000000..91fa65b --- /dev/null +++ b/after/plugin/gitsigns.lua @@ -0,0 +1 @@ +require('gitsigns').setup() diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua index e69b2d4..1715929 100644 --- a/after/plugin/treesitter.lua +++ b/after/plugin/treesitter.lua @@ -35,7 +35,7 @@ require 'nvim-treesitter.configs'.setup { highlight = { enable = true, - disable = { "latex", "perl" }, + disable = { "latex", "perl", "htmldjango" }, additional_vim_regex_highlighting = false, }, } diff --git a/after/plugin/zenmode.lua b/after/plugin/zenmode.lua index 3ea3140..15f715d 100644 --- a/after/plugin/zenmode.lua +++ b/after/plugin/zenmode.lua @@ -7,13 +7,16 @@ require("zen-mode").setup { vim.keymap.set("n", "z", function() require("zen-mode").toggle({ window = { - width = .85 -- width will be 85% of the editor width + width = 90 }, on_open = function(win) - vim.wo.relativenumber = false + vim.opt.wrap = true + vim.opt.relativenumber = false end, -- callback where you can add custom code when the Zen window closes on_close = function() + vim.opt.wrap = false + vim.opt.relativenumber = true end, }) end) diff --git a/lua/junikim/packer.lua b/lua/junikim/packer.lua index 92b7148..49e5d67 100644 --- a/lua/junikim/packer.lua +++ b/lua/junikim/packer.lua @@ -22,8 +22,8 @@ return require('packer').startup(function(use) } } - use 'vim-airline/vim-airline-themes' use 'tpope/vim-fugitive' + use 'lewis6991/gitsigns.nvim' use { 'VonHeikemen/lsp-zero.nvim', diff --git a/lua/junikim/remap.lua b/lua/junikim/remap.lua index 5a691d9..a787bc5 100644 --- a/lua/junikim/remap.lua +++ b/lua/junikim/remap.lua @@ -42,7 +42,7 @@ vim.keymap.set("n", "vz", "e ~/.zshrc"); vim.keymap.set("n", "vc", "e ~/.config/nvim"); vim.keymap.set("n", "fmt", function() - vim.lsp.buf.formatting_sync() + vim.lsp.buf.format() end) if os.getenv("TMUX") ~= nil then diff --git a/lua/junikim/theme.lua b/lua/junikim/theme.lua index 5eb0d7c..4728073 100644 --- a/lua/junikim/theme.lua +++ b/lua/junikim/theme.lua @@ -5,7 +5,6 @@ require('catppuccin').setup { local day = 9 local night = 18 local hour = os.date("*t").hour -print("hour" .. hour) local themes = { "catppuccin-macchiato", "catppuccin-mocha" } local theme = 1