v3
This commit is contained in:
parent
1776bc8edc
commit
ea1d352822
16 changed files with 328 additions and 315 deletions
|
|
@ -3,8 +3,8 @@
|
||||||
(local espresso (require :catppuccin))
|
(local espresso (require :catppuccin))
|
||||||
|
|
||||||
(local color_overrides
|
(local color_overrides
|
||||||
{ :macchiato
|
{ :macchiato
|
||||||
{ :rosewater :#F5B8AB
|
{ :rosewater :#F5B8AB
|
||||||
:flamingo :#F29D9D
|
:flamingo :#F29D9D
|
||||||
:pink :#AD6FF7
|
:pink :#AD6FF7
|
||||||
:mauve :#FF8F40
|
:mauve :#FF8F40
|
||||||
|
|
@ -32,32 +32,36 @@
|
||||||
:crust :#191926 } })
|
:crust :#191926 } })
|
||||||
|
|
||||||
(local integrations
|
(local integrations
|
||||||
{ :cmp true
|
{ :cmp true
|
||||||
:gitsigns true
|
:gitsigns true
|
||||||
:treesitter true
|
:treesitter true
|
||||||
|
|
||||||
:telescope
|
:telescope
|
||||||
{ :enabled true
|
{ :enabled true
|
||||||
:style :nvchad }
|
:style :nvchad }
|
||||||
|
|
||||||
:mini
|
:mini
|
||||||
{ :enabled true} })
|
{ :enabled true} })
|
||||||
|
|
||||||
|
|
||||||
(espresso.setup
|
(espresso.setup
|
||||||
{ :flavour :macchiato
|
{ :flavour :macchiato
|
||||||
:color_overrides color_overrides
|
:color_overrides color_overrides
|
||||||
:integrations integrations })
|
:integrations integrations })
|
||||||
|
|
||||||
|
|
||||||
(set! background :dark)
|
(set! background :dark)
|
||||||
(exec! [colorscheme catppuccin])
|
(exec! [colorscheme catppuccin])
|
||||||
|
|
||||||
|
(vim.api.nvim_set_hl 0 :Normal {:bg :none})
|
||||||
|
(vim.api.nvim_set_hl 0 :NormalFloat {:bg :none})
|
||||||
|
(vim.api.nvim_set_hl 0 :FloatBorder {:bg :none})
|
||||||
|
(vim.api.nvim_set_hl 0 :Pmenu {:bg :none})
|
||||||
|
|
||||||
|
|
||||||
; (local highlight_overrides
|
; (local highlight_overrides
|
||||||
; { :all
|
; { :all
|
||||||
; (fn [colors]
|
; (fn [colors]
|
||||||
; :CurSearch { :bg colors.sky }
|
; :CurSearch { :bg colors.sky }
|
||||||
; :IncSearch { :bg colors.sky }
|
; :IncSearch { :bg colors.sky }
|
||||||
; :CursorLineNr { :fg colors.blue :style [:bold] }
|
; :CursorLineNr { :fg colors.blue :style [:bold] }
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
|
|
||||||
(g! mapleader " ")
|
(g! mapleader " ")
|
||||||
|
|
||||||
|
(map! [n :noremap] :<leader>gd "<cmd>lua vim.lsp.buf.hover()<CR>")
|
||||||
; trim those bastards
|
; trim those bastards
|
||||||
(map! [n :noremap] :<leader>tw "<cmd>lua MiniTrailspace.trim()<CR>")
|
(map! [n :noremap] :<leader>tw "<cmd>lua MiniTrailspace.trim()<CR>")
|
||||||
|
|
||||||
|
|
@ -16,6 +17,7 @@
|
||||||
(map! [n :noremap] :<leader>fk "<cmd>Telescope keymaps<CR>")
|
(map! [n :noremap] :<leader>fk "<cmd>Telescope keymaps<CR>")
|
||||||
|
|
||||||
(map! [n :noremap] :<leader>tt "<cmd>terminal<CR>")
|
(map! [n :noremap] :<leader>tt "<cmd>terminal<CR>")
|
||||||
|
(map! [t :noremap] :<Esc> "<C-\\><C-n>")
|
||||||
(map! [n :noremap] :<C-Space> "<cmd>bprev<CR>")
|
(map! [n :noremap] :<C-Space> "<cmd>bprev<CR>")
|
||||||
|
|
||||||
; remap keys so that they dont skip camelCase
|
; remap keys so that they dont skip camelCase
|
||||||
|
|
|
||||||
|
|
@ -1,31 +1,31 @@
|
||||||
(import-macros {: set! : g! : exec!} :hibiscus.vim)
|
(import-macros {: set! : g! : exec!} :hibiscus.vim)
|
||||||
|
|
||||||
(set! number true) ; enable line number
|
(set! number true) ; enable line number
|
||||||
(set! relativenumber true) ; enable relative line number
|
(set! relativenumber true) ; enable relative line number
|
||||||
(set! undofile true) ; persistent undo
|
(set! undofile true) ; persistent undo
|
||||||
(set! backup false) ; disable backup
|
(set! backup false) ; disable backup
|
||||||
(set! autowrite true) ; auto write buffer when it's not focused
|
(set! autowrite true) ; auto write buffer when it's not focused
|
||||||
(set! ignorecase true) ; case insensitive on search..
|
(set! ignorecase true) ; case insensitive on search..
|
||||||
(set! list true) ; display listchars
|
(set! list true) ; display listchars
|
||||||
(set! smartindent false) ; smarter indentation
|
(set! smartindent false) ; smarter indentation
|
||||||
(set! splitright true) ; split right instead of left
|
(set! splitright true) ; split right instead of left
|
||||||
(set! splitkeep :screen) ; stabilize split
|
(set! splitkeep :screen) ; stabilize split
|
||||||
(set! startofline false) ; don't go to the start of the line when moving to another file
|
(set! startofline false) ; don't go to the start of the line when moving to another file
|
||||||
(set! swapfile false) ; disable swapfile
|
(set! swapfile false) ; disable swapfile
|
||||||
(set! termguicolors true) ; true colours for better experience
|
(set! termguicolors true) ; true colours for better experience
|
||||||
(set! wrap false) ; don't wrap lines
|
(set! wrap false) ; don't wrap lines
|
||||||
(set! backupcopy :yes) ; fix weirdness for stuff that replaces the entire file when hot reloading
|
(set! backupcopy :yes) ; fix weirdness for stuff that replaces the entire file when hot reloading
|
||||||
|
|
||||||
(set! smarttab false)
|
(set! smarttab false)
|
||||||
(set! tabstop 4)
|
(set! tabstop 4)
|
||||||
(set! softtabstop 4)
|
(set! softtabstop 4)
|
||||||
(set! shiftwidth 4)
|
(set! shiftwidth 4)
|
||||||
(set! expandtab false)
|
(set! expandtab true)
|
||||||
|
|
||||||
(set! compatible false) ; disable compatibility with old vi
|
(set! compatible false) ; disable compatibility with old vi
|
||||||
(set! showmatch true) ; show matches while searching for text
|
(set! showmatch true) ; show matches while searching for text
|
||||||
(set! hlsearch true) ; highlight text that has been searched
|
(set! hlsearch true) ; highlight text that has been searched
|
||||||
(set! incsearch true) ; incramentally search
|
(set! incsearch true) ; incramentally search
|
||||||
(set! autoindent true)
|
(set! autoindent true)
|
||||||
(set! wildmode "longest,list")
|
(set! wildmode "longest,list")
|
||||||
(set! inccommand :split)
|
(set! inccommand :split)
|
||||||
|
|
@ -34,7 +34,7 @@
|
||||||
|
|
||||||
(set! mouse :v)
|
(set! mouse :v)
|
||||||
(set! mouse :a)
|
(set! mouse :a)
|
||||||
; (set! clipboard :unnamedplus) ; use system clipboard
|
(set! clipboard :unnamedplus) ; use system clipboard
|
||||||
(set! ttyfast true)
|
(set! ttyfast true)
|
||||||
(set! cursorline true)
|
(set! cursorline true)
|
||||||
(set! splitbelow true)
|
(set! splitbelow true)
|
||||||
|
|
@ -49,33 +49,33 @@
|
||||||
|
|
||||||
; Skip loading of following neovim builtins
|
; Skip loading of following neovim builtins
|
||||||
(local default_plugins {
|
(local default_plugins {
|
||||||
:2html_plugin
|
:2html_plugin
|
||||||
:getscript
|
:getscript
|
||||||
:getscriptPlugin
|
:getscriptPlugin
|
||||||
:gzip
|
:gzip
|
||||||
:logipat
|
:logipat
|
||||||
:netrw
|
:netrw
|
||||||
:netrwPlugin
|
:netrwPlugin
|
||||||
:netrwSettings
|
:netrwSettings
|
||||||
:netrwFileHandlers
|
:netrwFileHandlers
|
||||||
:matchit
|
:matchit
|
||||||
:tar
|
:tar
|
||||||
:tarPlugin
|
:tarPlugin
|
||||||
:rrhelper
|
:rrhelper
|
||||||
:spellfile_plugin
|
:spellfile_plugin
|
||||||
:vimball
|
:vimball
|
||||||
:vimballPlugin
|
:vimballPlugin
|
||||||
:zip
|
:zip
|
||||||
:zipPlugin
|
:zipPlugin
|
||||||
:tutor
|
:tutor
|
||||||
:rplugin
|
:rplugin
|
||||||
:syntax
|
:syntax
|
||||||
:synmenu
|
:synmenu
|
||||||
:optwin
|
:optwin
|
||||||
:compiler
|
:compiler
|
||||||
:bugreport
|
:bugreport
|
||||||
:ftplugin })
|
:ftplugin })
|
||||||
|
|
||||||
(each [_ plug (ipairs default_plugins)]
|
(each [_ plug (ipairs default_plugins)]
|
||||||
(g! (.. :loaded plug) 1))
|
(g! (.. :loaded plug) 1))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,25 +1,25 @@
|
||||||
(local plug (require :nvim-web-devicons))
|
(local plug (require :nvim-web-devicons))
|
||||||
|
|
||||||
(plug.setup [
|
(plug.setup [
|
||||||
:strict true
|
:strict true
|
||||||
:default true
|
:default true
|
||||||
:color_icons true
|
:color_icons true
|
||||||
|
|
||||||
:override
|
:override
|
||||||
[ :zsh
|
[ :zsh
|
||||||
[ :icon ""
|
[ :icon ""
|
||||||
:color "#428850"
|
:color "#428850"
|
||||||
:cterm_color "65"
|
:cterm_color "65"
|
||||||
:name "zsh" ]]
|
:name "zsh" ]]
|
||||||
|
|
||||||
:override_by_filename
|
:override_by_filename
|
||||||
[ :.gitignore
|
[ :.gitignore
|
||||||
[ :icon ""
|
[ :icon ""
|
||||||
:color "#f1502f"
|
:color "#f1502f"
|
||||||
:name "gitignore" ]]
|
:name "gitignore" ]]
|
||||||
|
|
||||||
:override_by_extension
|
:override_by_extension
|
||||||
[ :log
|
[ :log
|
||||||
[ :icon ""
|
[ :icon ""
|
||||||
:color "#81e043"
|
:color "#81e043"
|
||||||
:name "Log" ]] ])
|
:name "Log" ]] ])
|
||||||
|
|
|
||||||
|
|
@ -1,40 +1,40 @@
|
||||||
(local gitsigns (require :gitsigns))
|
(local gitsigns (require :gitsigns))
|
||||||
|
|
||||||
(gitsigns.setup {
|
(gitsigns.setup {
|
||||||
:signs
|
:signs
|
||||||
{ :add {:text :▍}
|
{ :add {:text :▍}
|
||||||
:change {:text :▍}
|
:change {:text :▍}
|
||||||
:delete {:text :▍}
|
:delete {:text :▍}
|
||||||
:topdelete {:text :▍}
|
:topdelete {:text :▍}
|
||||||
:changedelete {:text :▍}
|
:changedelete {:text :▍}
|
||||||
:untracked {:text :▍} }
|
:untracked {:text :▍} }
|
||||||
|
|
||||||
:signcolumn true
|
:signcolumn true
|
||||||
:numhl false
|
:numhl false
|
||||||
:linehl false
|
:linehl false
|
||||||
:word_diff false
|
:word_diff false
|
||||||
|
|
||||||
:watch_gitdir { :follow_files true }
|
:watch_gitdir { :follow_files true }
|
||||||
|
|
||||||
|
|
||||||
:attach_to_untracked true
|
:attach_to_untracked true
|
||||||
:current_line_blame false
|
:current_line_blame false
|
||||||
|
|
||||||
:current_line_blame_opts
|
:current_line_blame_opts
|
||||||
{ :virt_text true
|
{ :virt_text true
|
||||||
:virt_text_pos :eol
|
:virt_text_pos :eol
|
||||||
:delay 1000
|
:delay 1000
|
||||||
:ignore_whitespace false }
|
:ignore_whitespace false }
|
||||||
|
|
||||||
:current_line_blame_formatter "<author>, <author_time:%Y-%m-%d> - <summary>"
|
:current_line_blame_formatter "<author>, <author_time:%Y-%m-%d> - <summary>"
|
||||||
:sign_priority 6
|
:sign_priority 6
|
||||||
:update_debounce 100
|
:update_debounce 100
|
||||||
:status_formatter nil
|
:status_formatter nil
|
||||||
:max_file_length 40000
|
:max_file_length 40000
|
||||||
|
|
||||||
:preview_config
|
:preview_config
|
||||||
{ :border :single
|
{ :border :single
|
||||||
:style :minimal
|
:style :minimal
|
||||||
:relative :cursor
|
:relative :cursor
|
||||||
:row 0
|
:row 0
|
||||||
:col 1 } })
|
:col 1 } })
|
||||||
|
|
|
||||||
|
|
@ -1,27 +1,27 @@
|
||||||
(local hlchunk (require :hlchunk))
|
(local hlchunk (require :hlchunk))
|
||||||
|
|
||||||
(hlchunk.setup {
|
(hlchunk.setup {
|
||||||
:indent {
|
:indent {
|
||||||
:enable true
|
:enable true
|
||||||
:chars [ "." "." "." "." ]
|
:chars [ "." "." "." "." ]
|
||||||
|
|
||||||
:style
|
:style
|
||||||
{ :#888888
|
{ :#888888
|
||||||
:#666666
|
:#666666
|
||||||
:#444444
|
:#444444
|
||||||
:#333333
|
:#333333
|
||||||
:#333333
|
:#333333
|
||||||
:#333333
|
:#333333
|
||||||
:#333333
|
:#333333
|
||||||
:#333333 } }
|
:#333333 } }
|
||||||
|
|
||||||
:blank { :enable false }
|
:blank { :enable false }
|
||||||
|
|
||||||
:chunk { :enable false }
|
:chunk { :enable false }
|
||||||
|
|
||||||
:line_num {
|
:line_num {
|
||||||
:enable false
|
:enable false
|
||||||
:style :#ADBC9F
|
:style :#ADBC9F
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -1,35 +1,35 @@
|
||||||
(local incline (require :incline))
|
(local incline (require :incline))
|
||||||
|
|
||||||
(incline.setup
|
(incline.setup
|
||||||
{ :highlight
|
{ :highlight
|
||||||
{ :groups
|
{ :groups
|
||||||
{ :InclineNormal
|
{ :InclineNormal
|
||||||
{ :default true
|
{ :default true
|
||||||
:group :lualine_a_normal }
|
:group :lualine_a_normal }
|
||||||
|
|
||||||
:InclineNormalNC
|
:InclineNormalNC
|
||||||
{ :default true
|
{ :default true
|
||||||
:group :Comment } }}
|
:group :Comment } }}
|
||||||
:window
|
:window
|
||||||
{ :margin
|
{ :margin
|
||||||
{ :vertical 0
|
{ :vertical 0
|
||||||
:horizontal 1 }}
|
:horizontal 1 }}
|
||||||
; :render
|
; :render
|
||||||
; (fn [props]
|
; (fn [props]
|
||||||
; (let
|
; (let
|
||||||
; [
|
; [
|
||||||
; filename (vim.fn.fnamemodify (vim.api.nvim_buf_get_name props.buf) ::t)
|
; filename (vim.fn.fnamemodify (vim.api.nvim_buf_get_name props.buf) ::t)
|
||||||
; [icon color] (require :nvim-web-devicons).get_icon_color filename
|
; [icon color] (require :nvim-web-devicons).get_icon_color filename
|
||||||
; ]
|
; ]
|
||||||
;
|
;
|
||||||
; ([
|
; ([
|
||||||
; { icon
|
; { icon
|
||||||
; { :guifg color } }
|
; { :guifg color } }
|
||||||
;
|
;
|
||||||
; [(if icon " " "")]
|
; [(if icon " " "")]
|
||||||
;
|
;
|
||||||
; [filename] ]) ))
|
; [filename] ]) ))
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
; render = function(props)
|
; render = function(props)
|
||||||
|
|
|
||||||
|
|
@ -4,12 +4,12 @@
|
||||||
(require (modul :lazy))
|
(require (modul :lazy))
|
||||||
(require (modul :devicons))
|
(require (modul :devicons))
|
||||||
(require (modul :gitsigns))
|
(require (modul :gitsigns))
|
||||||
(require (modul :harpoon))
|
; (require (modul :harpoon))
|
||||||
(require (modul :lsp-zero))
|
(require (modul :lsp-zero))
|
||||||
(require (modul :lualine))
|
(require (modul :lualine))
|
||||||
(require (modul :mini))
|
(require (modul :mini))
|
||||||
(require (modul :telescope))
|
(require (modul :telescope))
|
||||||
(require (modul :treesitter))
|
(require (modul :treesitter))
|
||||||
(require (modul :wilder))
|
; (require (modul :wilder))
|
||||||
(require (modul :incline))
|
(require (modul :incline))
|
||||||
(require (modul :colorizer))
|
(require (modul :colorizer))
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
(local lazypath (.. (vim.fn.stdpath :data) :/lazy/lazy.nvim))
|
(local lazypath (.. (vim.fn.stdpath :data) :/lazy/lazy.nvim))
|
||||||
|
|
||||||
(if (not (vim.loop.fs_stat lazypath))
|
(if (not (vim.loop.fs_stat lazypath))
|
||||||
(vim.fn.system
|
(vim.fn.system
|
||||||
[:git :clone :--filter=blob:none :https://github.com/folke/lazy.nvim.git :--branch=stable lazypath]))
|
[:git :clone :--filter=blob:none :https://github.com/folke/lazy.nvim.git :--branch=stable lazypath]))
|
||||||
|
|
||||||
(vim.opt.rtp:prepend lazypath)
|
(vim.opt.rtp:prepend lazypath)
|
||||||
|
|
||||||
|
|
@ -10,67 +10,67 @@
|
||||||
(local plug 1)
|
(local plug 1)
|
||||||
|
|
||||||
(local plugins [
|
(local plugins [
|
||||||
:ThePrimeagen/vim-be-good
|
:ThePrimeagen/vim-be-good
|
||||||
|
|
||||||
:udayvir-singh/tangerine.nvim
|
:udayvir-singh/tangerine.nvim
|
||||||
:udayvir-singh/hibiscus.nvim
|
:udayvir-singh/hibiscus.nvim
|
||||||
|
|
||||||
:lambdalisue/nerdfont.vim
|
:lambdalisue/nerdfont.vim
|
||||||
|
|
||||||
{ plug :catppuccin/nvim
|
{ plug :catppuccin/nvim
|
||||||
:name :catppuccin
|
:name :catppuccin
|
||||||
:priority 1000 }
|
:priority 1000 }
|
||||||
|
|
||||||
:gelguy/wilder.nvim
|
:gelguy/wilder.nvim
|
||||||
:bkad/camelcasemotion
|
:bkad/camelcasemotion
|
||||||
:lewis6991/gitsigns.nvim
|
:lewis6991/gitsigns.nvim
|
||||||
|
|
||||||
{ plug :b0o/incline.nvim
|
{ plug :b0o/incline.nvim
|
||||||
:event [:BufReadPre] }
|
:event [:BufReadPre] }
|
||||||
|
|
||||||
:echasnovski/mini.nvim
|
:echasnovski/mini.nvim
|
||||||
:brenoprata10/nvim-highlight-colors
|
:brenoprata10/nvim-highlight-colors
|
||||||
|
|
||||||
{ plug :svampkorg/moody.nvim
|
{ plug :svampkorg/moody.nvim
|
||||||
:event [:ModeChanged :BufWinEnter :WinEnter]
|
:event [:ModeChanged :BufWinEnter :WinEnter]
|
||||||
:opts [] }
|
:opts [] }
|
||||||
|
|
||||||
{ plug :nvim-telescope/telescope-fzf-native.nvim
|
{ plug :nvim-telescope/telescope-fzf-native.nvim
|
||||||
:build :make }
|
:build :make }
|
||||||
|
|
||||||
{ plug :nvim-telescope/telescope.nvim
|
{ plug :nvim-telescope/telescope.nvim
|
||||||
:tag :0.1.8
|
:tag :0.1.8
|
||||||
:dependencies [:nvim-lua/plenary.nvim] }
|
:dependencies [:nvim-lua/plenary.nvim] }
|
||||||
|
|
||||||
{ plug :OXY2DEV/markview.nvim
|
{ plug :OXY2DEV/markview.nvim
|
||||||
:dependencies
|
:dependencies
|
||||||
[ :nvim-treesitter/nvim-treesitter
|
[ :nvim-treesitter/nvim-treesitter
|
||||||
:nvim-tree/nvim-web-devicons ] }
|
:nvim-tree/nvim-web-devicons ] }
|
||||||
|
|
||||||
{ plug :ThePrimeagen/harpoon
|
{ plug :ThePrimeagen/harpoon
|
||||||
:branch :harpoon2
|
:branch :harpoon2
|
||||||
:dependencies [:nvim-lua/plenary.nvim] }
|
:dependencies [:nvim-lua/plenary.nvim] }
|
||||||
|
|
||||||
{ plug :nvim-lualine/lualine.nvim
|
{ plug :nvim-lualine/lualine.nvim
|
||||||
:dependencies [:nvim-tree/nvim-web-devicons] }
|
:dependencies [:nvim-tree/nvim-web-devicons] }
|
||||||
|
|
||||||
{ plug :nvim-treesitter/nvim-treesitter
|
{ plug :nvim-treesitter/nvim-treesitter
|
||||||
:build ":TSUpdate" }
|
:build ":TSUpdate" }
|
||||||
|
|
||||||
{ plug :VonHeikemen/lsp-zero.nvim
|
{ plug :VonHeikemen/lsp-zero.nvim
|
||||||
:branch "v3.x"
|
:branch "v3.x"
|
||||||
:dependencies
|
:dependencies
|
||||||
[ :neovim/nvim-lspconfig
|
[ :neovim/nvim-lspconfig
|
||||||
:williamboman/mason.nvim
|
:williamboman/mason.nvim
|
||||||
:williamboman/mason-lspconfig.nvim
|
:williamboman/mason-lspconfig.nvim
|
||||||
|
|
||||||
:hrsh7th/nvim-cmp
|
:hrsh7th/nvim-cmp
|
||||||
:hrsh7th/cmp-nvim-lsp
|
:hrsh7th/cmp-nvim-lsp
|
||||||
:L3MON4D3/LuaSnip ]}
|
:L3MON4D3/LuaSnip ]}
|
||||||
|
|
||||||
{ plug :m4xshen/hardtime.nvim
|
{ plug :m4xshen/hardtime.nvim
|
||||||
:dependencies
|
:dependencies
|
||||||
[ :MunifTanjim/nui.nvim
|
[ :MunifTanjim/nui.nvim
|
||||||
:nvim-lua/plenary.nvim ] } ])
|
:nvim-lua/plenary.nvim ] } ])
|
||||||
|
|
||||||
(lazy.setup plugins)
|
(lazy.setup plugins)
|
||||||
|
|
|
||||||
|
|
@ -9,13 +9,15 @@
|
||||||
|
|
||||||
(local mason-lspc (require :mason-lspconfig))
|
(local mason-lspc (require :mason-lspconfig))
|
||||||
(mason-lspc.setup
|
(mason-lspc.setup
|
||||||
{ :ensure-installed
|
{ :ensure-installed
|
||||||
[ :fennel-ls
|
[ :fennel-ls
|
||||||
:lua-language-server
|
:lua-language-server
|
||||||
:python-lsp-server
|
:python-lsp-server
|
||||||
:zls ]
|
:ltex-ls
|
||||||
|
:zls
|
||||||
|
:rust-analyzer ]
|
||||||
|
|
||||||
:automatic_installation true })
|
:automatic_installation true })
|
||||||
|
|
||||||
(local cmp (require :cmp))
|
(local cmp (require :cmp))
|
||||||
(local cmp_action (lsp.cmp_action))
|
(local cmp_action (lsp.cmp_action))
|
||||||
|
|
@ -24,39 +26,39 @@
|
||||||
(lsp.on_attach (fn [_ bufnr] lsp.default_keymaps {:buffer bufnr}))
|
(lsp.on_attach (fn [_ bufnr] lsp.default_keymaps {:buffer bufnr}))
|
||||||
|
|
||||||
(lspconfig.pylsp.setup
|
(lspconfig.pylsp.setup
|
||||||
{ :setings
|
{ :setings { :pylsp { :plugins { :pycodestyle
|
||||||
{ :pylsp
|
{ :ignore [:W391 :E303 :E226]
|
||||||
{ :plugins
|
:maxLineLength 120 } }}}})
|
||||||
{ :pycodestyle
|
|
||||||
{ :ignore [:W391 :E303 :E226]
|
|
||||||
:maxLineLength 120 } }}}})
|
|
||||||
|
|
||||||
(lsp.setup)
|
(lsp.setup)
|
||||||
|
|
||||||
; (local fennel-ls lspconfig.fennel_ls)
|
(local fennel-ls lspconfig.fennel_ls)
|
||||||
; (fennel-ls.setup {})
|
(fennel-ls.setup {})
|
||||||
|
|
||||||
|
(local rustan lspconfig.rust_analyzer)
|
||||||
|
(rustan.setup {})
|
||||||
|
|
||||||
(lspconfig.racket_langserver.setup {})
|
(lspconfig.racket_langserver.setup {})
|
||||||
(lspconfig.zls.setup {})
|
(lspconfig.zls.setup {})
|
||||||
|
|
||||||
|
|
||||||
(cmp.setup
|
(cmp.setup
|
||||||
{ :mapping
|
{ :mapping
|
||||||
{ :<CR> (cmp.mapping.confirm {:select true})
|
{ :<CR> (cmp.mapping.confirm {:select true})
|
||||||
|
|
||||||
:<Tab> (cmp.mapping
|
:<Tab> (cmp.mapping
|
||||||
(fn [fallback]
|
(fn [fallback]
|
||||||
(if (cmp.visible)
|
(if (cmp.visible)
|
||||||
(cmp.select_next_item)
|
(cmp.select_next_item)
|
||||||
(fallback)) [:i :s] ))
|
(fallback)) [:i :s] ))
|
||||||
|
|
||||||
:<S-Tab> (cmp.mapping
|
:<S-Tab> (cmp.mapping
|
||||||
(fn [fallback]
|
(fn [fallback]
|
||||||
(if (cmp.visible)
|
(if (cmp.visible)
|
||||||
(cmp.select_prev_item)
|
(cmp.select_prev_item)
|
||||||
(fallback)) [:i :s] ))
|
(fallback)) [:i :s] ))
|
||||||
|
|
||||||
:<C-Space> cmp.mapping.complete
|
:<C-Space> cmp.mapping.complete
|
||||||
|
|
||||||
:<C-f> cmp_action.luasnip_jump_forward
|
:<C-f> cmp_action.luasnip_jump_forward
|
||||||
:<C-b> cmp_action.luasnip_jump_backward }})
|
:<C-b> cmp_action.luasnip_jump_backward }})
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
(local lualine (require :lualine))
|
(local lualine (require :lualine))
|
||||||
|
|
||||||
(lualine.setup
|
(lualine.setup
|
||||||
{ :options
|
{ :options
|
||||||
{ :section_separators
|
{ :section_separators
|
||||||
{ :left :
|
{ :left :
|
||||||
:right : }
|
:right : }
|
||||||
|
|
||||||
:component_separators
|
:component_separators
|
||||||
{ :left :
|
{ :left :
|
||||||
:right : }} })
|
:right : }} })
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
(local telescope (require :telescope))
|
(local telescope (require :telescope))
|
||||||
|
|
||||||
(telescope.setup
|
(telescope.setup
|
||||||
{ :extansions
|
{ :extansions
|
||||||
{ :fzf
|
{ :fzf
|
||||||
{ :fuzzy true
|
{ :fuzzy true
|
||||||
:override_generic_sorter true
|
:override_generic_sorter true
|
||||||
:override_file_sorter true
|
:override_file_sorter true
|
||||||
:case_mode :smart_case } }})
|
:case_mode :smart_case } }})
|
||||||
|
|
||||||
(telescope.load_extension :fzf)
|
(telescope.load_extension :fzf)
|
||||||
|
|
|
||||||
|
|
@ -2,25 +2,30 @@
|
||||||
; (local parsers (require :nvim-treesitter.parsers))
|
; (local parsers (require :nvim-treesitter.parsers))
|
||||||
|
|
||||||
(configs.setup
|
(configs.setup
|
||||||
{ :ensure_installed
|
{ :ensure_installed
|
||||||
[ :c
|
[ :c
|
||||||
:lua
|
:rust
|
||||||
:vim
|
:lua
|
||||||
:vimdoc
|
:vim
|
||||||
:query
|
:vimdoc
|
||||||
:haskell
|
:query
|
||||||
:go
|
:haskell
|
||||||
:bash
|
:go
|
||||||
:python
|
:bash
|
||||||
:fennel
|
:python
|
||||||
:hyprlang ]
|
:fennel
|
||||||
|
:hyprlang ]
|
||||||
|
|
||||||
:sync_install false
|
:sync_install false
|
||||||
:auto_install true
|
:auto_install true
|
||||||
|
|
||||||
:highlight
|
:highlight
|
||||||
{ :enable true }})
|
{ :enable true }})
|
||||||
|
|
||||||
(vim.filetype.add
|
(vim.filetype.add
|
||||||
{ :pattern
|
{ :pattern
|
||||||
{ :.*/hypr/.*%.conf :hyprlang }})
|
{ :.*/hypr/.*%.conf :hyprlang }})
|
||||||
|
|
||||||
|
(vim.filetype.add
|
||||||
|
{ :pattern
|
||||||
|
{ :*.tex :latex }})
|
||||||
|
|
|
||||||
|
|
@ -1,24 +1,24 @@
|
||||||
; (local wilder (require :wilder))
|
; (local wilder (require :wilder))
|
||||||
;
|
;
|
||||||
; (wilder.setup {
|
; (wilder.setup {
|
||||||
; :modes [":" "/" "?"]
|
; :modes [":" "/" "?"]
|
||||||
; })
|
; })
|
||||||
;
|
;
|
||||||
; (wilder.set_option :renderer (wilder.renderer_mux {
|
; (wilder.set_option :renderer (wilder.renderer_mux {
|
||||||
; ":" (wilder.popupmenu_renderer {
|
; ":" (wilder.popupmenu_renderer {
|
||||||
; :highlighter wilder.basic_highlighter
|
; :highlighter wilder.basic_highlighter
|
||||||
; :left [ " " wilder.popupmenu_devicons ]
|
; :left [ " " wilder.popupmenu_devicons ]
|
||||||
; :right [ " " wilder.popupmenu_scrollbar ]
|
; :right [ " " wilder.popupmenu_scrollbar ]
|
||||||
; })
|
; })
|
||||||
;
|
;
|
||||||
; "/" (wilder.popupmenu_renderer {
|
; "/" (wilder.popupmenu_renderer {
|
||||||
; :highlighter wilder.basic_highlighter
|
; :highlighter wilder.basic_highlighter
|
||||||
; :left [ "" wilder.popupmenu_devicons ]
|
; :left [ "" wilder.popupmenu_devicons ]
|
||||||
; :right [ "" wilder.popupmenu_scrollbar ]
|
; :right [ "" wilder.popupmenu_scrollbar ]
|
||||||
; })
|
; })
|
||||||
; }))
|
; }))
|
||||||
;
|
;
|
||||||
; (wilder.set_option :renderer
|
; (wilder.set_option :renderer
|
||||||
; (wilder.popupmenu_renderer
|
; (wilder.popupmenu_renderer
|
||||||
; { :max_height :20%
|
; { :max_height :20%
|
||||||
; :min_width :100% }))
|
; :min_width :100% }))
|
||||||
|
|
|
||||||
34
init.fnl
34
init.fnl
|
|
@ -1,26 +1,26 @@
|
||||||
; ████████╗██████╗ ██╗██╗ ██╗██╗ ██╗
|
; ████████╗██████╗ ██╗██╗ ██╗██╗ ██╗
|
||||||
; ╚══██╔══╝██╔══██╗██║╚██╗██╔╝╚██╗ ██╔╝
|
; ╚══██╔══╝██╔══██╗██║╚██╗██╔╝╚██╗ ██╔╝
|
||||||
; ██║ ██████╔╝██║ ╚███╔╝ ╚████╔╝
|
; ██║ ██████╔╝██║ ╚███╔╝ ╚████╔╝
|
||||||
; ██║ ██╔══██╗██║ ██╔██╗ ╚██╔╝
|
; ██║ ██╔══██╗██║ ██╔██╗ ╚██╔╝
|
||||||
; ██║ ██║ ██║██║██╔╝ ██╗ ██║
|
; ██║ ██║ ██║██║██╔╝ ██╗ ██║
|
||||||
; ╚═╝ ╚═╝ ╚═╝╚═╝╚═╝ ╚═╝ ╚═
|
; ╚═╝ ╚═╝ ╚═╝╚═╝╚═╝ ╚═╝ ╚═
|
||||||
|
|
||||||
; Listen up, you motherfuckers,
|
; Listen up, you motherfuckers,
|
||||||
; Those Ivy League dopes, they wanna
|
; Those Ivy League dopes, they wanna
|
||||||
; mock us. Tell 'em all this is war.
|
; mock us. Tell 'em all this is war.
|
||||||
; And not fighting a war is for suckers.
|
; And not fighting a war is for suckers.
|
||||||
|
|
||||||
; (import-macros {: g! : set!} :hibiscus.vim)
|
; (import-macros {: g! : set!} :hibiscus.vim)
|
||||||
|
|
||||||
; When using neovide, use these settings
|
; When using neovide, use these settings
|
||||||
; (when vim.g.neovide (do
|
; (when vim.g.neovide (do
|
||||||
; (set! guifont "FiraCode Nerd Font:h14")
|
; (set! guifont "FiraCode Nerd Font:h14")
|
||||||
; (g! neovide_scale_factor 1.0)
|
; (g! neovide_scale_factor 1.0)
|
||||||
; (g! neovide_refresh_rate 120)
|
; (g! neovide_refresh_rate 120)
|
||||||
; (g! neovide_refresh_rate_idle 5)
|
; (g! neovide_refresh_rate_idle 5)
|
||||||
; (g! neovide_cursor_antialiasing true)
|
; (g! neovide_cursor_antialiasing true)
|
||||||
; (g! neovide_cursor_animate_in_insert_mode true)
|
; (g! neovide_cursor_animate_in_insert_mode true)
|
||||||
; (g! neovide_cursor_vfx_mode "ripple")))
|
; (g! neovide_cursor_vfx_mode "ripple")))
|
||||||
|
|
||||||
|
|
||||||
(require :plugins)
|
(require :plugins)
|
||||||
|
|
|
||||||
34
init.lua
34
init.lua
|
|
@ -4,23 +4,23 @@ vim.tbl_islist = vim.islist
|
||||||
|
|
||||||
-- bootstrap tangerine and hibiscus in order to have fennel support
|
-- bootstrap tangerine and hibiscus in order to have fennel support
|
||||||
local function bootstrap(url, ref)
|
local function bootstrap(url, ref)
|
||||||
local name = url:gsub(".*/", "")
|
local name = url:gsub(".*/", "")
|
||||||
local path
|
local path
|
||||||
|
|
||||||
path = vim.fn.stdpath("data") .. "/lazy/" .. name
|
path = vim.fn.stdpath("data") .. "/lazy/" .. name
|
||||||
vim.opt.rtp:prepend(path)
|
vim.opt.rtp:prepend(path)
|
||||||
|
|
||||||
if vim.fn.isdirectory(path) == 0 then
|
if vim.fn.isdirectory(path) == 0 then
|
||||||
print(name .. ": installing in data dir...")
|
print(name .. ": installing in data dir...")
|
||||||
|
|
||||||
vim.fn.system {"git", "clone", url, path}
|
vim.fn.system {"git", "clone", url, path}
|
||||||
if ref then
|
if ref then
|
||||||
vim.fn.system {"git", "-C", path, "checkout", ref}
|
vim.fn.system {"git", "-C", path, "checkout", ref}
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.cmd "redraw"
|
vim.cmd "redraw"
|
||||||
print(name .. ": finished installing")
|
print(name .. ": finished installing")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
bootstrap("https://github.com/udayvir-singh/tangerine.nvim")
|
bootstrap("https://github.com/udayvir-singh/tangerine.nvim")
|
||||||
|
|
@ -28,8 +28,8 @@ bootstrap("https://github.com/udayvir-singh/hibiscus.nvim")
|
||||||
|
|
||||||
|
|
||||||
require "tangerine".setup {
|
require "tangerine".setup {
|
||||||
compiler = {
|
compiler = {
|
||||||
verbose = false,
|
verbose = false,
|
||||||
hooks = { "onsave", "oninit" }
|
hooks = { "onsave", "oninit" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue