From cc6754014aa56a0f4d7b6450b66e52971361d9af Mon Sep 17 00:00:00 2001 From: elkowar <5300871+elkowar@users.noreply.github.com> Date: Fri, 30 Apr 2021 18:23:38 +0200 Subject: [PATCH] asdf --- files/.config/nvim/fnl/init.fnl | 29 ++++++++++++++++++++++++++--- files/.config/nvim/plugins.lua | 8 +++++--- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/files/.config/nvim/fnl/init.fnl b/files/.config/nvim/fnl/init.fnl index 608c45b..4e2b609 100644 --- a/files/.config/nvim/fnl/init.fnl +++ b/files/.config/nvim/fnl/init.fnl @@ -5,6 +5,7 @@ kb keybinds utils utils nvim-treesitter-configs nvim-treesitter.configs} + ;gitsigns gitsigns} require-macros [macros]}) (require "plugins.telescope") @@ -12,14 +13,17 @@ (require "plugins.galaxyline") (require "plugins.bufferline") +(local colors (utils.colors)) + ;(set nvim.g.conjure#client#fennel#aniseed#aniseed_module_prefix "aniseed.") (nvim-treesitter-configs.setup { :ensure_installed "all" :highlight { :enable true - :disable ["fennel"] } - :indent { :enable true } + :disable ["fennel"]} + :indent { :enable true + :disable ["lua"]} :incremental_selection { :enable true @@ -34,7 +38,26 @@ :context_commentstring { :enable true}}) -; " :: and _ as space ------------------------------------------------------------------- <<<<< + +; gitsigns.nvim - inactive due to weird issue with keybinds not being removable <<<<< +; https://github.com/lewis6991/gitsigns.nvim +;(gitsigns.setup + ;{ :signs { :add {:text "▍"} + ;:change {:text "▍"} + ;:delete {:text "▍"} + ;:topdelete {:text "▍"} + ;:changedelete {:text "▍"}}} + ;{ :keymaps { :noremap true :buffer true} + ;:current_line_blame false}) + +;(utils.highlight "GitSignsAdd" {:bg "NONE" :fg colors.bright_aqua}) +;(utils.highlight "GitSignsDelete" {:bg "NONE" :fg colors.neutral_red}) +;(utils.highlight "GitSignsChange" {:bg "NONE" :fg colors.bright_blue}) + +; >>>>> + + +; " :: and _ as space ------------------------------------------------------------------- <<<<<}) (var remapped-space nil) (fn _G.RebindShit [newKey] (set remapped-space {:old (vim.fn.maparg : :i) diff --git a/files/.config/nvim/plugins.lua b/files/.config/nvim/plugins.lua index dbac70d..6db36d7 100644 --- a/files/.config/nvim/plugins.lua +++ b/files/.config/nvim/plugins.lua @@ -15,11 +15,11 @@ require("packer").startup(function(use) use_rocks "rtsisyk/fun" + use 'pwntester/octo.nvim' + use "p00f/nvim-ts-rainbow" use "romgrk/nvim-treesitter-context" - use 'JoosepAlviste/nvim-ts-context-commentstring' - use { "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" @@ -59,7 +59,9 @@ require("packer").startup(function(use) cmd = "Goyo", } - use "mhinz/vim-signify" + use "mhinz/vim-signify" + --use "lewis6991/gitsigns.nvim" + use "tpope/vim-fugitive" use "preservim/nerdcommenter" use "glepnir/galaxyline.nvim"