mirror of
https://github.com/elkowar/dots-of-war.git
synced 2024-11-06 03:12:24 +00:00
actually fix stuff
This commit is contained in:
elkowar
parent
bcdb805f70
commit
22676e233e
25 changed files with 109 additions and 106 deletions
|
|
@ -1,4 +1,4 @@
|
|||
(module colors
|
||||
(module dots.colors
|
||||
{}
|
||||
{:dark0_hard "#1d2021"
|
||||
:dark0 "#282828"
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
(module help-thingy
|
||||
{autoload {utils utils
|
||||
(module dots.help-thingy
|
||||
{autoload {utils dots.utils
|
||||
a aniseed.core
|
||||
str aniseed.string
|
||||
popup popup
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
(module keybinds
|
||||
(module dots.keybinds
|
||||
{autoload {a aniseed.core
|
||||
nvim aniseed.nvim
|
||||
utils utils
|
||||
utils dots.utils
|
||||
wk which-key
|
||||
treesitter-selection nvim-treesitter.incremental_selection}
|
||||
require-macros [macros]})
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
(module plugins
|
||||
(module dots.plugins
|
||||
{require-macros [macros]})
|
||||
|
||||
|
||||
(packer-use
|
||||
"/home/leon/coding/projects/nvim-gehzu" {}
|
||||
:elkowar/kmonad.vim {}
|
||||
|
|
@ -13,16 +12,13 @@
|
|||
(set vim.g.gruvbox_plugin_hi_groups 1)
|
||||
(vim.cmd "colorscheme gruvbox8"))}
|
||||
|
||||
;:gruvbox-community/gruvbox {:opt false
|
||||
;:config #(vim.cmd "colorscheme gruvbox")}
|
||||
|
||||
:nvim-telescope/telescope.nvim {:mod "plugins.telescope"
|
||||
:nvim-telescope/telescope.nvim {:mod "dots.plugins.telescope"
|
||||
:cmd ["Telescope"]
|
||||
:requires [:nvim-lua/popup.nvim :nvim-lua/plenary.nvim]}
|
||||
|
||||
:kyazdani42/nvim-web-devicons {}
|
||||
|
||||
:nvim-treesitter/nvim-treesitter {:mod "plugins.treesitter"
|
||||
:nvim-treesitter/nvim-treesitter {:mod "dots.plugins.treesitter"
|
||||
:event ["BufEnter"]
|
||||
:run ":TSUpdate"}
|
||||
:JoosepAlviste/nvim-ts-context-commentstring {:event ["BufEnter"]
|
||||
|
|
@ -34,8 +30,6 @@
|
|||
|
||||
|
||||
:jiangmiao/auto-pairs {}
|
||||
|
||||
; :code-biscuits/nvim-biscuits {} ; show opening line after closing curly
|
||||
|
||||
:folke/which-key.nvim {}
|
||||
|
||||
|
|
@ -43,31 +37,25 @@
|
|||
;:gennaro-tedesco/nvim-jqx {:ft ["json"]}
|
||||
|
||||
:Olical/aniseed {:branch "develop"}; :tag "v3.16.0"}
|
||||
;:Olical/aniseed {}; :tag "v3.16.0"}
|
||||
|
||||
; general purpose lua wrappers for nvim stuff
|
||||
:norcalli/nvim.lua {}
|
||||
|
||||
;:glepnir/galaxyline.nvim {:mod "plugins.galaxyline"
|
||||
;:after "gruvbox"}
|
||||
:Famiu/feline.nvim {:mod "dots.plugins.feline"}
|
||||
|
||||
:Famiu/feline.nvim {:mod "plugins.feline"}
|
||||
;:after "gruvbox"}
|
||||
|
||||
;:gwimm/lililine.nvim {:after "gruvbox"
|
||||
;:mod "plugins.lililine"}
|
||||
|
||||
:akinsho/nvim-bufferline.lua {:mod "plugins.bufferline"}
|
||||
;:romgrk/barbar.nvim {:mod "plugins.barbar"}
|
||||
:akinsho/nvim-bufferline.lua {:mod "dots.plugins.bufferline"}
|
||||
;:romgrk/barbar.nvim {:mod "dots.plugins.barbar"}
|
||||
|
||||
:sindrets/diffview.nvim {:cmd ["DiffviewOpen" "DiffviewToggleFiles"]
|
||||
:mod "plugins.diffview"}
|
||||
:mod "dots.plugins.diffview"}
|
||||
:tweekmonster/startuptime.vim {:cmd ["StartupTime"]}
|
||||
:tpope/vim-repeat {}
|
||||
|
||||
:junegunn/goyo.vim {:cmd "Goyo"}
|
||||
|
||||
:lewis6991/gitsigns.nvim {:after ["vim-gruvbox8"]
|
||||
:mod "plugins.gitsigns"}
|
||||
:mod "dots.plugins.gitsigns"}
|
||||
|
||||
|
||||
:tpope/vim-fugitive {}
|
||||
|
|
@ -86,7 +74,7 @@
|
|||
:iamcco/markdown-preview.nvim {:run vim.fn.mkdp#util#install}
|
||||
|
||||
;:mfussenegger/nvim-dap {:opt true
|
||||
;:mod "plugins.nvim-dap"}
|
||||
;:mod "dots.plugins.nvim-dap"}
|
||||
;:nvim-telescope/telescope-dap.nvim {:opt true
|
||||
;:requires [:mfussenegger/nvim-dap
|
||||
;:nvim-telescope/telescope.nvim]}
|
||||
|
|
@ -94,25 +82,27 @@
|
|||
; code-related ----------------------------------------- <<<
|
||||
|
||||
: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"]}
|
||||
:simrat39/symbols-outline.nvim {:mod "plugins.symbols-outline"}
|
||||
:simrat39/symbols-outline.nvim {:mod "dots.plugins.symbols-outline"}
|
||||
:neovim/nvim-lspconfig {}
|
||||
|
||||
;:hrsh7th/nvim-compe {:mod "plugins.compe"}
|
||||
;:hrsh7th/nvim-compe {:mod "dots.plugins.compe"}
|
||||
:/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 {}
|
||||
:tami5/compe-conjure {:requires [:Olical/conjure]}
|
||||
|
||||
:ciaranm/detectindent {:mod "plugins.detect-indent"}
|
||||
:ciaranm/detectindent {:mod "dots.plugins.detect-indent"}
|
||||
:pechorin/any-jump.vim {}
|
||||
:justinmk/vim-sneak {:mod "plugins.sneak"}
|
||||
:justinmk/vim-sneak {:mod "dots.plugins.sneak"}
|
||||
:psliwka/vim-smoothie {}
|
||||
:editorconfig/editorconfig-vim {}
|
||||
:tommcdo/vim-exchange {}
|
||||
|
|
@ -128,14 +118,14 @@
|
|||
|
||||
: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
|
||||
:ianks/vim-tsx {}
|
||||
:leafgarland/typescript-vim {}
|
||||
;:sheerun/vim-polyglot {:event [:BufEnter]} ; Syntax highlighting for most languages
|
||||
:HerringtonDarkholme/yats.vim {} ; typescript syntax highlighting
|
||||
:mxw/vim-jsx {}
|
||||
:mattn/emmet-vim {:mod "plugins.emmet"}
|
||||
:mattn/emmet-vim {:mod "dots.plugins.emmet"}
|
||||
|
||||
:purescript-contrib/purescript-vim {}
|
||||
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
(module plugins.bufferline
|
||||
(module dots.plugins.bufferline
|
||||
{autoload {a aniseed.core
|
||||
nvim aniseed.nvim
|
||||
utils utils
|
||||
bufferline bufferline
|
||||
colors colors}})
|
||||
utils dots.utils
|
||||
colors dots.colors
|
||||
bufferline bufferline}})
|
||||
|
||||
; :h bufferline-lua-highlights
|
||||
(let [selected {:gui "" :guibg colors.neutral_aqua :guifg colors.dark0}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
(module plugins.compe
|
||||
{autoload {utils utils
|
||||
(module dots.plugins.compe
|
||||
{autoload {utils dots.utils
|
||||
compe compe}})
|
||||
|
||||
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
(module plugins.detect-indent)
|
||||
(module dots.plugins.detect-indent
|
||||
{})
|
||||
|
||||
(vim.cmd "autocmd! BufReadPost * :DetectIndent")
|
||||
(set vim.g.detectindent_preferred_expandtab 1)
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
(module plugins.diffview
|
||||
(module dots.plugins.diffview
|
||||
{autoload {diffview diffview
|
||||
cb diffview.config}})
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
(module plugins.emmet)
|
||||
(module dots.plugins.emmet {})
|
||||
|
||||
(set vim.g.user_emmet_mode "n")
|
||||
(set vim.g.user_emmet_leader_key "<leader>e")
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
(module utils
|
||||
{autoload {a aniseed.core
|
||||
nvim aniseed.nvim
|
||||
utils utils
|
||||
str aniseed.string
|
||||
colors colors
|
||||
view aniseed.view
|
||||
feline feline
|
||||
feline-git feline.providers.git
|
||||
feline-lsp feline.providers.lsp}
|
||||
require-macros [macros]})
|
||||
(module dots.plugins.feline
|
||||
{autoload {a aniseed.core
|
||||
nvim aniseed.nvim
|
||||
utils dots.utils
|
||||
str aniseed.string
|
||||
colors dots.colors
|
||||
view aniseed.view
|
||||
feline feline
|
||||
feline-git feline.providers.git
|
||||
feline-lsp feline.providers.lsp}
|
||||
require-macros [macros]})
|
||||
|
||||
|
||||
(local modes
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
(module plugins.galaxyline
|
||||
(module dots.plugins.galaxyline
|
||||
{autoload {a aniseed.core
|
||||
str aniseed.string
|
||||
nvim aniseed.nvim
|
||||
utils utils
|
||||
colors colors
|
||||
utils dots.utils
|
||||
colors dots.colors
|
||||
|
||||
galaxyline galaxyline
|
||||
gl-condition galaxyline.condition
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
(module plugins.gitsigns
|
||||
{require {utils utils
|
||||
colors colors
|
||||
gitsigns gitsigns}})
|
||||
(module dots.plugins.gitsigns
|
||||
{autoload {utils dots.utils
|
||||
colors dots.colors
|
||||
gitsigns gitsigns}})
|
||||
|
||||
; https://github.com/lewis6991/gitsigns.nvim
|
||||
(gitsigns.setup
|
||||
(gitsigns.setup
|
||||
{:signs {:add {:text "▍"}
|
||||
:change {:text "▍"}
|
||||
:delete {:text "▍"}
|
||||
|
|
@ -15,9 +15,19 @@
|
|||
:current_line_blame false
|
||||
:update_debounce 100})
|
||||
|
||||
(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})
|
||||
|
||||
(vim.cmd
|
||||
(..
|
||||
"
|
||||
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")
|
||||
;(vim.cmd "highlight GitSignsAdd guibg='NONE' guifg='#ff2200'")
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
(module plugins.lililine
|
||||
(module dots.plugins.lililine
|
||||
{autoload {a aniseed.core
|
||||
str aniseed.string
|
||||
nvim aniseed.nvim
|
||||
utils utils
|
||||
colors colors
|
||||
utils dots.utils
|
||||
colors dots.colors
|
||||
line lililine}
|
||||
|
||||
require-macros [macros]})
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
(module plugins.lsp
|
||||
(module dots.plugins.lsp
|
||||
{autoload {a aniseed.core
|
||||
lsp lspconfig
|
||||
lsp-configs lspconfig.configs
|
||||
utils utils}
|
||||
utils dots.utils}
|
||||
|
||||
require-macros [macros]})
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
(module plugins.lspsaga
|
||||
{autoload {utils utils
|
||||
colors colors
|
||||
(module dots.plugins.lspsaga
|
||||
{autoload {utils dots.utils
|
||||
colors dots.colors}
|
||||
|
||||
saga lspsaga}})
|
||||
require {saga lspsaga}})
|
||||
|
||||
|
||||
(saga.init_lsp_saga
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
(module plugins.nvim-colorizer
|
||||
(module dots.plugins.nvim-colorizer
|
||||
{autoload {colorizer colorizer}})
|
||||
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
(module plugins.nvim-dap
|
||||
{:require {a aniseed.core
|
||||
utils utils
|
||||
dap dap}})
|
||||
(module dots.plugins.nvim-dap
|
||||
{autoload {a aniseed.core
|
||||
utils dots.utils
|
||||
dap dap}})
|
||||
|
||||
|
||||
(set dap.adapters.cpp
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
(module plugins.sneak
|
||||
{require {utils utils}})
|
||||
(module dots.plugins.sneak
|
||||
{autoload {utils dots.utils}})
|
||||
|
||||
|
||||
(set vim.g.sneak#label 1)
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
(module plugins.symbols-outline
|
||||
(module dots.plugins.symbols-outline
|
||||
{require {symbols-outline symbols-outline}})
|
||||
|
||||
(symbols-outline.setup {:highlight_hovered_item true :show_guides true})
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
(module plugins.telescope
|
||||
{autoload {utils utils
|
||||
(module dots.plugins.telescope
|
||||
{autoload {utils dots.utils
|
||||
telescope telescope
|
||||
actions telescope.actions}})
|
||||
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
(module plugins.treesitter
|
||||
{autoload {a aniseed.core}
|
||||
(module dots.plugins.treesitter
|
||||
{autoload {utils dots.utils
|
||||
a aniseed.core}
|
||||
require {configs nvim-treesitter.configs}
|
||||
require-macros [macros]})
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
(module plugins.trouble
|
||||
{autoload {utils utils
|
||||
colors colors}
|
||||
(module dots.plugins.trouble
|
||||
{autoload {utils dots.utils
|
||||
colors dots.colors}
|
||||
require {trouble trouble}})
|
||||
|
||||
(trouble.setup
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
(module smart-compe-conjure
|
||||
{autoload {utils utils
|
||||
(module dots.smart-compe-conjure
|
||||
{autoload {utils dots.utils
|
||||
a aniseed.core
|
||||
str aniseed.string
|
||||
view aniseed.view
|
||||
popup popup
|
||||
compe compe
|
||||
help help-thingy}
|
||||
help dots.help-thingy}
|
||||
require-macros [macros]})
|
||||
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
(module utils
|
||||
{require {a aniseed.core
|
||||
nvim aniseed.nvim
|
||||
str aniseed.string}
|
||||
(module dots.utils
|
||||
{autoload {a aniseed.core
|
||||
nvim aniseed.nvim
|
||||
str aniseed.string}
|
||||
require-macros [macros]})
|
||||
|
||||
(defn plugin-installed? [name]
|
||||
|
|
@ -104,6 +104,10 @@
|
|||
(surround-if-present " gui='"colset.gui"'")))))
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
(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"
|
||||
(let [segments (str.split path "/")]
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
(module init
|
||||
{require {utils utils
|
||||
{autoload {utils dots.utils
|
||||
nvim aniseed.nvim
|
||||
a aniseed.core
|
||||
str aniseed.string
|
||||
colors colors}
|
||||
colors dots.colors}
|
||||
require-macros [macros]})
|
||||
|
||||
(macro make-errors-epic [f]
|
||||
|
|
@ -13,11 +13,10 @@
|
|||
(when (vim.fn.has "termguicolors")
|
||||
(se termguicolors true))
|
||||
|
||||
(make-errors-epic (require "dots.plugins"))
|
||||
|
||||
(make-errors-epic (require "plugins"))
|
||||
|
||||
(make-errors-epic (require "plugins.lsp"))
|
||||
(make-errors-epic (require "keybinds"))
|
||||
(make-errors-epic (require "dots.plugins.lsp"))
|
||||
(make-errors-epic (require "dots.keybinds"))
|
||||
|
||||
|
||||
;(se runtimepath (.. vim.o.runtimepath ",/home/leon/coding/projects/kbd-vim"))
|
||||
|
|
@ -165,8 +164,6 @@
|
|||
|
||||
; foldend
|
||||
|
||||
|
||||
|
||||
(vim.cmd
|
||||
"command! -nargs=1 L :lua print(vim.inspect(<args>))")
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue