actually fix stuff

This commit is contained in:
elkowar 2021-05-18 15:50:39 +02:00
parent bcdb805f70
commit 22676e233e
No known key found for this signature in database
GPG key ID: E321AD71B1D1F27F
25 changed files with 109 additions and 106 deletions

View file

@ -1,4 +1,4 @@
(module colors (module dots.colors
{} {}
{:dark0_hard "#1d2021" {:dark0_hard "#1d2021"
:dark0 "#282828" :dark0 "#282828"

View file

@ -1,5 +1,5 @@
(module help-thingy (module dots.help-thingy
{autoload {utils utils {autoload {utils dots.utils
a aniseed.core a aniseed.core
str aniseed.string str aniseed.string
popup popup popup popup

View file

@ -1,7 +1,7 @@
(module keybinds (module dots.keybinds
{autoload {a aniseed.core {autoload {a aniseed.core
nvim aniseed.nvim nvim aniseed.nvim
utils utils utils dots.utils
wk which-key wk which-key
treesitter-selection nvim-treesitter.incremental_selection} treesitter-selection nvim-treesitter.incremental_selection}
require-macros [macros]}) require-macros [macros]})

View file

@ -1,7 +1,6 @@
(module plugins (module dots.plugins
{require-macros [macros]}) {require-macros [macros]})
(packer-use (packer-use
"/home/leon/coding/projects/nvim-gehzu" {} "/home/leon/coding/projects/nvim-gehzu" {}
:elkowar/kmonad.vim {} :elkowar/kmonad.vim {}
@ -13,16 +12,13 @@
(set vim.g.gruvbox_plugin_hi_groups 1) (set vim.g.gruvbox_plugin_hi_groups 1)
(vim.cmd "colorscheme gruvbox8"))} (vim.cmd "colorscheme gruvbox8"))}
;:gruvbox-community/gruvbox {:opt false :nvim-telescope/telescope.nvim {:mod "dots.plugins.telescope"
;:config #(vim.cmd "colorscheme gruvbox")}
:nvim-telescope/telescope.nvim {:mod "plugins.telescope"
:cmd ["Telescope"] :cmd ["Telescope"]
:requires [:nvim-lua/popup.nvim :nvim-lua/plenary.nvim]} :requires [:nvim-lua/popup.nvim :nvim-lua/plenary.nvim]}
:kyazdani42/nvim-web-devicons {} :kyazdani42/nvim-web-devicons {}
:nvim-treesitter/nvim-treesitter {:mod "plugins.treesitter" :nvim-treesitter/nvim-treesitter {:mod "dots.plugins.treesitter"
:event ["BufEnter"] :event ["BufEnter"]
:run ":TSUpdate"} :run ":TSUpdate"}
:JoosepAlviste/nvim-ts-context-commentstring {:event ["BufEnter"] :JoosepAlviste/nvim-ts-context-commentstring {:event ["BufEnter"]
@ -34,8 +30,6 @@
:jiangmiao/auto-pairs {} :jiangmiao/auto-pairs {}
; :code-biscuits/nvim-biscuits {} ; show opening line after closing curly
:folke/which-key.nvim {} :folke/which-key.nvim {}
@ -43,31 +37,25 @@
;:gennaro-tedesco/nvim-jqx {:ft ["json"]} ;:gennaro-tedesco/nvim-jqx {:ft ["json"]}
:Olical/aniseed {:branch "develop"}; :tag "v3.16.0"} :Olical/aniseed {:branch "develop"}; :tag "v3.16.0"}
;:Olical/aniseed {}; :tag "v3.16.0"}
; general purpose lua wrappers for nvim stuff ; general purpose lua wrappers for nvim stuff
:norcalli/nvim.lua {} :norcalli/nvim.lua {}
;:glepnir/galaxyline.nvim {:mod "plugins.galaxyline" :Famiu/feline.nvim {:mod "dots.plugins.feline"}
;:after "gruvbox"}
:Famiu/feline.nvim {:mod "plugins.feline"} :akinsho/nvim-bufferline.lua {:mod "dots.plugins.bufferline"}
;:after "gruvbox"} ;:romgrk/barbar.nvim {:mod "dots.plugins.barbar"}
;:gwimm/lililine.nvim {:after "gruvbox"
;:mod "plugins.lililine"}
:akinsho/nvim-bufferline.lua {:mod "plugins.bufferline"}
;:romgrk/barbar.nvim {:mod "plugins.barbar"}
:sindrets/diffview.nvim {:cmd ["DiffviewOpen" "DiffviewToggleFiles"] :sindrets/diffview.nvim {:cmd ["DiffviewOpen" "DiffviewToggleFiles"]
:mod "plugins.diffview"} :mod "dots.plugins.diffview"}
:tweekmonster/startuptime.vim {:cmd ["StartupTime"]} :tweekmonster/startuptime.vim {:cmd ["StartupTime"]}
:tpope/vim-repeat {} :tpope/vim-repeat {}
:junegunn/goyo.vim {:cmd "Goyo"} :junegunn/goyo.vim {:cmd "Goyo"}
:lewis6991/gitsigns.nvim {:after ["vim-gruvbox8"] :lewis6991/gitsigns.nvim {:after ["vim-gruvbox8"]
:mod "plugins.gitsigns"} :mod "dots.plugins.gitsigns"}
:tpope/vim-fugitive {} :tpope/vim-fugitive {}
@ -86,7 +74,7 @@
:iamcco/markdown-preview.nvim {:run vim.fn.mkdp#util#install} :iamcco/markdown-preview.nvim {:run vim.fn.mkdp#util#install}
;:mfussenegger/nvim-dap {:opt true ;:mfussenegger/nvim-dap {:opt true
;:mod "plugins.nvim-dap"} ;:mod "dots.plugins.nvim-dap"}
;:nvim-telescope/telescope-dap.nvim {:opt true ;:nvim-telescope/telescope-dap.nvim {:opt true
;:requires [:mfussenegger/nvim-dap ;:requires [:mfussenegger/nvim-dap
;:nvim-telescope/telescope.nvim]} ;:nvim-telescope/telescope.nvim]}
@ -94,25 +82,27 @@
; code-related ----------------------------------------- <<< ; code-related ----------------------------------------- <<<
:ray-x/lsp_signature.nvim {:events [:BufEnter]} :ray-x/lsp_signature.nvim {:events [:BufEnter]}
:folke/lsp-trouble.nvim {:mod "plugins.trouble" :folke/lsp-trouble.nvim {:mod "dots.plugins.trouble"
:cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]} :cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]}
:simrat39/symbols-outline.nvim {:mod "plugins.symbols-outline"} :simrat39/symbols-outline.nvim {:mod "dots.plugins.symbols-outline"}
:neovim/nvim-lspconfig {} :neovim/nvim-lspconfig {}
;:hrsh7th/nvim-compe {:mod "plugins.compe"} ;:hrsh7th/nvim-compe {:mod "dots.plugins.compe"}
:/home/leon/coding/prs/nvim-compe {:event [:BufEnter] :/home/leon/coding/prs/nvim-compe {:event [:BufEnter]
:mod "plugins.compe"} :mod "dots.plugins.compe"}
:glepnir/lspsaga.nvim {:mod "plugins.lspsaga"}
:glepnir/lspsaga.nvim {:after "vim-gruvbox8"
:mod "dots.plugins.lspsaga"}
:Olical/conjure {} :Olical/conjure {}
:tami5/compe-conjure {:requires [:Olical/conjure]} :tami5/compe-conjure {:requires [:Olical/conjure]}
:ciaranm/detectindent {:mod "plugins.detect-indent"} :ciaranm/detectindent {:mod "dots.plugins.detect-indent"}
:pechorin/any-jump.vim {} :pechorin/any-jump.vim {}
:justinmk/vim-sneak {:mod "plugins.sneak"} :justinmk/vim-sneak {:mod "dots.plugins.sneak"}
:psliwka/vim-smoothie {} :psliwka/vim-smoothie {}
:editorconfig/editorconfig-vim {} :editorconfig/editorconfig-vim {}
:tommcdo/vim-exchange {} :tommcdo/vim-exchange {}
@ -128,14 +118,14 @@
:kevinoid/vim-jsonc {} :kevinoid/vim-jsonc {}
:norcalli/nvim-colorizer.lua {:mod "plugins.nvim-colorizer"} :norcalli/nvim-colorizer.lua {:mod "dots.plugins.nvim-colorizer"}
:pangloss/vim-javascript {} ; syntax highlighting JS :pangloss/vim-javascript {} ; syntax highlighting JS
:ianks/vim-tsx {} :ianks/vim-tsx {}
:leafgarland/typescript-vim {} :leafgarland/typescript-vim {}
;:sheerun/vim-polyglot {:event [:BufEnter]} ; Syntax highlighting for most languages ;:sheerun/vim-polyglot {:event [:BufEnter]} ; Syntax highlighting for most languages
:HerringtonDarkholme/yats.vim {} ; typescript syntax highlighting :HerringtonDarkholme/yats.vim {} ; typescript syntax highlighting
:mxw/vim-jsx {} :mxw/vim-jsx {}
:mattn/emmet-vim {:mod "plugins.emmet"} :mattn/emmet-vim {:mod "dots.plugins.emmet"}
:purescript-contrib/purescript-vim {} :purescript-contrib/purescript-vim {}

View file

@ -1,9 +1,9 @@
(module plugins.bufferline (module dots.plugins.bufferline
{autoload {a aniseed.core {autoload {a aniseed.core
nvim aniseed.nvim nvim aniseed.nvim
utils utils utils dots.utils
bufferline bufferline colors dots.colors
colors colors}}) bufferline bufferline}})
; :h bufferline-lua-highlights ; :h bufferline-lua-highlights
(let [selected {:gui "" :guibg colors.neutral_aqua :guifg colors.dark0} (let [selected {:gui "" :guibg colors.neutral_aqua :guifg colors.dark0}

View file

@ -1,5 +1,5 @@
(module plugins.compe (module dots.plugins.compe
{autoload {utils utils {autoload {utils dots.utils
compe compe}}) compe compe}})

View file

@ -1,4 +1,5 @@
(module plugins.detect-indent) (module dots.plugins.detect-indent
{})
(vim.cmd "autocmd! BufReadPost * :DetectIndent") (vim.cmd "autocmd! BufReadPost * :DetectIndent")
(set vim.g.detectindent_preferred_expandtab 1) (set vim.g.detectindent_preferred_expandtab 1)

View file

@ -1,4 +1,4 @@
(module plugins.diffview (module dots.plugins.diffview
{autoload {diffview diffview {autoload {diffview diffview
cb diffview.config}}) cb diffview.config}})

View file

@ -1,4 +1,4 @@
(module plugins.emmet) (module dots.plugins.emmet {})
(set vim.g.user_emmet_mode "n") (set vim.g.user_emmet_mode "n")
(set vim.g.user_emmet_leader_key "<leader>e") (set vim.g.user_emmet_leader_key "<leader>e")

View file

@ -1,14 +1,14 @@
(module utils (module dots.plugins.feline
{autoload {a aniseed.core {autoload {a aniseed.core
nvim aniseed.nvim nvim aniseed.nvim
utils utils utils dots.utils
str aniseed.string str aniseed.string
colors colors colors dots.colors
view aniseed.view view aniseed.view
feline feline feline feline
feline-git feline.providers.git feline-git feline.providers.git
feline-lsp feline.providers.lsp} feline-lsp feline.providers.lsp}
require-macros [macros]}) require-macros [macros]})
(local modes (local modes

View file

@ -1,9 +1,9 @@
(module plugins.galaxyline (module dots.plugins.galaxyline
{autoload {a aniseed.core {autoload {a aniseed.core
str aniseed.string str aniseed.string
nvim aniseed.nvim nvim aniseed.nvim
utils utils utils dots.utils
colors colors colors dots.colors
galaxyline galaxyline galaxyline galaxyline
gl-condition galaxyline.condition gl-condition galaxyline.condition

View file

@ -1,10 +1,10 @@
(module plugins.gitsigns (module dots.plugins.gitsigns
{require {utils utils {autoload {utils dots.utils
colors colors colors dots.colors
gitsigns gitsigns}}) gitsigns gitsigns}})
; https://github.com/lewis6991/gitsigns.nvim ; https://github.com/lewis6991/gitsigns.nvim
(gitsigns.setup (gitsigns.setup
{:signs {:add {:text "▍"} {:signs {:add {:text "▍"}
:change {:text "▍"} :change {:text "▍"}
:delete {:text "▍"} :delete {:text "▍"}
@ -15,9 +15,19 @@
:current_line_blame false :current_line_blame false
:update_debounce 100}) :update_debounce 100})
(utils.highlight :GitSignsAdd {:bg "NONE" :fg colors.bright_aqua})
(utils.highlight :GitSignsDelete {:bg "NONE" :fg colors.neutral_red}) (vim.cmd
(utils.highlight :GitSignsChange {:bg "NONE" :fg colors.bright_blue}) (..
"
augroup gitsignsHighlight
autocmd ColorScheme * :hi! GitSignsAdd gui='NONE' guibg='NONE' guifg='" colors.bright_aqua "'
autocmd ColorScheme * :hi! GitSignsDelete gui='NONE' guibg='NONE' guifg='" colors.neutral_red "'
autocmd ColorScheme * :hi! GitSignsChange gui='NONE' guibg='NONE' guifg='" colors.bright_blue "'
augroup END
"))
;(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})
;(print "This is right before setting and then printing the highlight group") ;(print "This is right before setting and then printing the highlight group")
;(vim.cmd "highlight GitSignsAdd guibg='NONE' guifg='#ff2200'") ;(vim.cmd "highlight GitSignsAdd guibg='NONE' guifg='#ff2200'")

View file

@ -1,9 +1,9 @@
(module plugins.lililine (module dots.plugins.lililine
{autoload {a aniseed.core {autoload {a aniseed.core
str aniseed.string str aniseed.string
nvim aniseed.nvim nvim aniseed.nvim
utils utils utils dots.utils
colors colors colors dots.colors
line lililine} line lililine}
require-macros [macros]}) require-macros [macros]})

View file

@ -1,8 +1,8 @@
(module plugins.lsp (module dots.plugins.lsp
{autoload {a aniseed.core {autoload {a aniseed.core
lsp lspconfig lsp lspconfig
lsp-configs lspconfig.configs lsp-configs lspconfig.configs
utils utils} utils dots.utils}
require-macros [macros]}) require-macros [macros]})

View file

@ -1,8 +1,8 @@
(module plugins.lspsaga (module dots.plugins.lspsaga
{autoload {utils utils {autoload {utils dots.utils
colors colors colors dots.colors}
saga lspsaga}}) require {saga lspsaga}})
(saga.init_lsp_saga (saga.init_lsp_saga

View file

@ -1,4 +1,4 @@
(module plugins.nvim-colorizer (module dots.plugins.nvim-colorizer
{autoload {colorizer colorizer}}) {autoload {colorizer colorizer}})

View file

@ -1,7 +1,7 @@
(module plugins.nvim-dap (module dots.plugins.nvim-dap
{:require {a aniseed.core {autoload {a aniseed.core
utils utils utils dots.utils
dap dap}}) dap dap}})
(set dap.adapters.cpp (set dap.adapters.cpp

View file

@ -1,5 +1,5 @@
(module plugins.sneak (module dots.plugins.sneak
{require {utils utils}}) {autoload {utils dots.utils}})
(set vim.g.sneak#label 1) (set vim.g.sneak#label 1)

View file

@ -1,4 +1,4 @@
(module plugins.symbols-outline (module dots.plugins.symbols-outline
{require {symbols-outline symbols-outline}}) {require {symbols-outline symbols-outline}})
(symbols-outline.setup {:highlight_hovered_item true :show_guides true}) (symbols-outline.setup {:highlight_hovered_item true :show_guides true})

View file

@ -1,5 +1,5 @@
(module plugins.telescope (module dots.plugins.telescope
{autoload {utils utils {autoload {utils dots.utils
telescope telescope telescope telescope
actions telescope.actions}}) actions telescope.actions}})

View file

@ -1,5 +1,6 @@
(module plugins.treesitter (module dots.plugins.treesitter
{autoload {a aniseed.core} {autoload {utils dots.utils
a aniseed.core}
require {configs nvim-treesitter.configs} require {configs nvim-treesitter.configs}
require-macros [macros]}) require-macros [macros]})

View file

@ -1,6 +1,6 @@
(module plugins.trouble (module dots.plugins.trouble
{autoload {utils utils {autoload {utils dots.utils
colors colors} colors dots.colors}
require {trouble trouble}}) require {trouble trouble}})
(trouble.setup (trouble.setup

View file

@ -1,11 +1,11 @@
(module smart-compe-conjure (module dots.smart-compe-conjure
{autoload {utils utils {autoload {utils dots.utils
a aniseed.core a aniseed.core
str aniseed.string str aniseed.string
view aniseed.view view aniseed.view
popup popup popup popup
compe compe compe compe
help help-thingy} help dots.help-thingy}
require-macros [macros]}) require-macros [macros]})

View file

@ -1,7 +1,7 @@
(module utils (module dots.utils
{require {a aniseed.core {autoload {a aniseed.core
nvim aniseed.nvim nvim aniseed.nvim
str aniseed.string} str aniseed.string}
require-macros [macros]}) require-macros [macros]})
(defn plugin-installed? [name] (defn plugin-installed? [name]
@ -104,6 +104,10 @@
(surround-if-present " gui='"colset.gui"'"))))) (surround-if-present " gui='"colset.gui"'")))))
(defn shorten-path [path seg-length shorten-after] (defn shorten-path [path seg-length shorten-after]
"shorten a filepath by truncating the segments to n characters, if the path exceeds a given length" "shorten a filepath by truncating the segments to n characters, if the path exceeds a given length"
(let [segments (str.split path "/")] (let [segments (str.split path "/")]

View file

@ -1,9 +1,9 @@
(module init (module init
{require {utils utils {autoload {utils dots.utils
nvim aniseed.nvim nvim aniseed.nvim
a aniseed.core a aniseed.core
str aniseed.string str aniseed.string
colors colors} colors dots.colors}
require-macros [macros]}) require-macros [macros]})
(macro make-errors-epic [f] (macro make-errors-epic [f]
@ -13,11 +13,10 @@
(when (vim.fn.has "termguicolors") (when (vim.fn.has "termguicolors")
(se termguicolors true)) (se termguicolors true))
(make-errors-epic (require "dots.plugins"))
(make-errors-epic (require "plugins")) (make-errors-epic (require "dots.plugins.lsp"))
(make-errors-epic (require "dots.keybinds"))
(make-errors-epic (require "plugins.lsp"))
(make-errors-epic (require "keybinds"))
;(se runtimepath (.. vim.o.runtimepath ",/home/leon/coding/projects/kbd-vim")) ;(se runtimepath (.. vim.o.runtimepath ",/home/leon/coding/projects/kbd-vim"))
@ -165,8 +164,6 @@
; foldend ; foldend
(vim.cmd (vim.cmd
"command! -nargs=1 L :lua print(vim.inspect(<args>))") "command! -nargs=1 L :lua print(vim.inspect(<args>))")