ElKowar/dots-of-war
1
0
Fork 0
mirror of https://github.com/elkowar/dots-of-war.git synced 2024-12-25 13:42:23 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity

Cleanup and fixes

Browse source
This commit is contained in:
Leon Kowarschick 2023-10-06 14:11:05 +02:00
parent 1d538b249f
commit 5e1361cd92
Signed by: ElKowar
GPG key ID: 72C759DA738DE3A2
12 changed files with 99 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nvim/.config/nvim/fnl/dots/plugins/bufferline.fnl
View file

@ -4,7 +4,8 @@
(al colors dots.colors)
(al bufferline bufferline)
(print (vim.inspect colors))
(vim.cmd "hi link BufferLineTabSeparatorSelected BufferLineSeparatorSelected")
(vim.cmd "hi link BufferLineTabSeparator BufferLineSeparator")
(fn setup []
; :h bufferline-lua-highlights

17
nvim/.config/nvim/fnl/dots/plugins/emmet.fnl
View file

@ -1,8 +1,15 @@
(import-macros m :macros)
(m.al utils dots.utils)
(fn setup []
(set vim.g.user_emmet_mode "n")
(set vim.g.user_emmet_leader_key "<leader>e")
(set vim.g.user_emmet_settings {:javascript.jsx {:extends "jsx"}
:typescript.jsx {:extends "jsx"}}))
[(utils.plugin
:mattn/emmet-vim
{:lazy true
:config setup})]
(set vim.g.user_emmet_mode "n")
(set vim.g.user_emmet_leader_key "<leader>e")
(set vim.g.user_emmet_settings {:javascript.jsx {:extends "jsx"}
:typescript.jsx {:extends "jsx"}})
[]

31
nvim/.config/nvim/fnl/dots/plugins/plugins.fnl
View file

@ -17,10 +17,6 @@
(plugin :norcalli/nvim.lua)
(plugin :kyazdani42/nvim-web-devicons)
(plugin :folke/which-key.nvim)
(plugin :folke/todo-comments.nvim
{:lazy true
:event "VeryLazy"
:config #(require "dots.plugins.todo-comments")})
(plugin :ckipp01/nvim-jenkinsfile-linter
{:dependencies ["nvim-lua/plenary.nvim"]})
(plugin :psliwka/vim-smoothie)
@ -34,11 +30,6 @@
(plugin :tweekmonster/startuptime.vim
{:cmd ["StartupTime"]})
(plugin :folke/zen-mode.nvim
{:config #(require "dots.plugins.zen-mode")
:cmd ["ZenMode"]})
(plugin :folke/twilight.nvim
{:config #(require "dots.plugins.twilight")})
(plugin :moll/vim-bbye
{:lazy true :cmd [:Bdelete :Bwipeout]})
(plugin :petertriho/nvim-scrollbar
@ -111,21 +102,6 @@
{:cmd "CodeActionMenu"
:config #(set vim.g.code_action_menu_show_details false)})
(plugin :folke/trouble.nvim
{:lazy true
:config #(require "dots.plugins.trouble")
:cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]})
; :elkowar/trouble.nvim {:branch "fix_error_on_nil_window"
; :config #(require "dots.plugins.trouble")
; :cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]}
(plugin :simrat39/symbols-outline.nvim
{:lazy true
:cmd ["SymbolsOutline" "SymbolsOutlineClose" "SymbolsOutlineOpen"]
:config #(require "dots.plugins.symbols-outline")})
(plugin :smjonas/inc-rename.nvim
{:config #(setup :inc_rename {:input_buffer_type "dressing"})})
; >>>
@ -146,10 +122,6 @@
{:config #(set vim.g.antifennel_executable "/home/leon/tmp/antifennel/antifennel")})
(plugin :Olical/conjure {:ft ["fennel"]})
(plugin :eraserhd/parinfer-rust {:build "cargo build --release"})
(plugin :lervag/vimtex
{:ft ["latex" "tex"]
:config #(require :dots.plugins.vimtex)})
(plugin :kmonad/kmonad-vim)
(plugin :elkowar/yuck.vim {:ft ["yuck"]})
(plugin :cespare/vim-toml {:ft ["toml"]})
@ -161,9 +133,6 @@
(plugin :leafgarland/typescript-vim {:ft ["typescript" "typescript-react" "javascript"]})
(plugin :HerringtonDarkholme/yats.vim {}) ; typescript syntax highlighting
(plugin :mxw/vim-jsx {})
(plugin :mattn/emmet-vim
{:lazy true
:config #(require "dots.plugins.emmet")})
(plugin :purescript-contrib/purescript-vim {:ft ["purescript"]})
(plugin :derekelkins/agda-vim {:ft ["agda"]})
(plugin :neovimhaskell/haskell-vim { :ft ["haskell"]})

5
nvim/.config/nvim/fnl/dots/plugins/symbols-outline.fnl
View file

@ -1,5 +0,0 @@
(import-macros m :macros)
(local symbols-outline (require :symbols-outline))
; (symbols-outline.setup {:highlight_hovered_item true :show_guides true})
[]

26
nvim/.config/nvim/fnl/dots/plugins/todo-comments.fnl
View file

@ -1,12 +1,20 @@
(import-macros m :macros)
(m.al a aniseed.core)
(m.al a nfnl.core)
(m.al utils dots.utils)
(m.al todo-comments todo-comments)
(todo-comments.setup
{:keywords {:TODO {:icon " "}
:WARN {:icon " " :alt [:WARNING :XXX :!!!]}
:NOTE {:icon " " :alt [:INFO]}
:FIX {:icon " " :alt [:FIXME :BUG :FIXIT :ISSUE :PHIX]}
:PERF {:icon " " :alt [:OPTIM :PERFORMANCE :OPTIMIZE]}
:HACK {:icon " "}}})
[]
(fn setup []
(todo-comments.setup
{:keywords {:TODO {:icon " "}
:WARN {:icon " " :alt [:WARNING :XXX :!!!]}
:NOTE {:icon " " :alt [:INFO]}
:FIX {:icon " " :alt [:FIXME :BUG :FIXIT :ISSUE :PHIX]}
:PERF {:icon " " :alt [:OPTIM :PERFORMANCE :OPTIMIZE]}
:HACK {:icon " "}}}))
[(utils.plugin
:folke/todo-comments.nvim
{:lazy true
:event "VeryLazy"
:config setup})]

3
nvim/.config/nvim/fnl/dots/plugins/treesitter.fnl
View file

@ -2,9 +2,8 @@
(m.al utils dots.utils)
(m.al a nfnl.core)
(fn setup [])
(fn setup1 []
(fn setup []
(local configs (require :nvim-treesitter.configs))
(configs.setup
{:ensure_installed ["rust" "fennel" "commonlisp" "vim" "regex" "lua" "bash" "markdown" "markdown_inline"]

51
nvim/.config/nvim/fnl/dots/plugins/trouble.fnl
View file

@ -1,28 +1,35 @@
(import-macros m :macros)
(m.al utils dots.utils)
(m.al colors dots.colors)
(local trouble (require :trouble))
(m.al trouble trouble)
(trouble.setup
{:icons false
:auto_preview true
:auto_close true
:auto_open false
:auto_jump ["lsp_definitions" "lsp_workspace_diagnostics" "lsp_type_definitions"]
:indent_lines false
:action_keys
{:jump "o"
:jump_close "<CR>"
:close "<esc>"
:cancel "q"
:hover ["a" "K"]}})
(fn setup []
(trouble.setup
{:icons false
:auto_preview true
:auto_close true
:auto_open false
:auto_jump ["lsp_definitions" "lsp_workspace_diagnostics" "lsp_type_definitions"]
:indent_lines false
:action_keys
{:jump "o"
:jump_close "<CR>"
:close "<esc>"
:cancel "q"
:hover ["a" "K"]}})
(utils.highlight "TroubleFoldIcon" {:bg "NONE" :fg colors.bright_orange})
(utils.highlight "TroubleCount" {:bg "NONE" :fg colors.bright_green})
(utils.highlight "TroubleText" {:bg "NONE" :fg colors.light0})
(utils.highlight "TroubleFoldIcon" {:bg "NONE" :fg colors.bright_orange})
(utils.highlight "TroubleCount" {:bg "NONE" :fg colors.bright_green})
(utils.highlight "TroubleText" {:bg "NONE" :fg colors.light0})
(utils.highlight "TroubleSignError" {:bg "NONE" :fg colors.bright_red})
(utils.highlight "TroubleSignWarning" {:bg "NONE" :fg colors.bright_yellow})
(utils.highlight "TroubleSignInformation" {:bg "NONE" :fg colors.bright_aqua})
(utils.highlight "TroubleSignHint" {:bg "NONE" :fg colors.bright_blue}))
[(utils.plugin
:folke/trouble.nvim
{:lazy true
:config setup
:cmd ["Trouble" "TroubleClose" "TroubleRefresh" "TroubleToggle"]})]
(utils.highlight "TroubleSignError" {:bg "NONE" :fg colors.bright_red})
(utils.highlight "TroubleSignWarning" {:bg "NONE" :fg colors.bright_yellow})
(utils.highlight "TroubleSignInformation" {:bg "NONE" :fg colors.bright_aqua})
(utils.highlight "TroubleSignHint" {:bg "NONE" :fg colors.bright_blue})
[]

5
nvim/.config/nvim/fnl/dots/plugins/twilight.fnl
View file

@ -1,5 +0,0 @@
(import-macros m :macros)
(m.al twilight twilight)
(twilight.setup)
[]

73
nvim/.config/nvim/fnl/dots/plugins/vimtex.fnl
View file

@ -1,42 +1,43 @@
(import-macros m :macros)
(m.al utils dots.utils)
(fn setup []
(set vim.g.vimtex_view_method "general")
(set vim.g.vimtex_view_general_viewer "zathura")
(set vim.g.vimtex_view_general_options "--synctex-forward @line:1:@tex @pdf")
;(set vim.g.vimtex_view_general_options "--unique file:@pdf#src:@line@tex")
(set vim.g.vimtex_quickfix_method "pplatex")
(set vim.g.vimtex_quickfix_mode 2)
(set vim.g.vimtex_quickfix_open_on_warning 0)
;(set vim.g.vimtex_quickfix_enabled 0)
(set vim.g.vimtex_compiler_latexmk {:build_dir ""
:callback 1
:continuous 1
:executable "latexmk"
:hooks []
:options ["-verbose"
"-file-line-error"
"-synctex=1"
"-interaction=nonstopmode"
"-shell-escape"]})
(set vim.g.vimtex_view_method "general")
;(set vim.g.vimtex_view_general_viewer "okular")
(set vim.g.vimtex_view_general_viewer "zathura")
(set vim.g.vimtex_view_general_options "--synctex-forward @line:1:@tex @pdf")
;(set vim.g.vimtex_view_general_options "--unique file:@pdf#src:@line@tex")
(set vim.g.vimtex_quickfix_method "pplatex")
(set vim.g.vimtex_quickfix_mode 2)
(set vim.g.vimtex_quickfix_open_on_warning 0)
(set vim.g.vimtex_compiler_latexmk {:build_dir ""
:callback 1
:continuous 1
:executable "latexmk"
:hooks []
:options ["-verbose"
"-file-line-error"
"-synctex=1"
"-interaction=nonstopmode"
"-shell-escape"]})
(set vim.g.vimtex_syntax_custom_cmds
[{:name "scripture" :argstyle "ital"}])
(set vim.g.vimtex_syntax_conceal {:accents 1
:cites 1
:fancy 1
:greek 1
:math_bounds 1
:math_delimiters 1
:math_fracs 1
:math_super_sub 1
:math_symbols 1
:sections 0
:styles 0})
(set vim.g.vimtex_syntax_custom_cmds
[{:name "scripture" :argstyle "ital"}])
(set vim.g.vimtex_syntax_conceal {:accents 1
:cites 1
:fancy 1
:greek 1
:math_bounds 1
:math_delimiters 1
:math_fracs 1
:math_super_sub 1
:math_symbols 1
:sections 0
:styles 0}))
[]
[(utils.plugin
:lervag/vimtex
{:ft ["latex" "tex"]
:config setup})]

8
nvim/.config/nvim/fnl/dots/plugins/zen-mode.fnl
View file

@ -1,8 +0,0 @@
(import-macros m :macros)
(m.al zen-mode zen-mode)
(zen-mode.setup
{:window {:options {:wrap true}}})
[]

0
nvim/.config/nvim/fnl/init.fnl → nvim/.config/nvim/fnl/main.fnl
View file

2
nvim/.config/nvim/init.lua
View file

@ -34,7 +34,7 @@ ensure("Olical", "nfnl", "main")
-- require('nfnl')['compile-all-files']()
require("lua.init")
require("main")
-- ensure("lewis6991", "impatient.nvim", "main")