remove oil, hlchunk, add catppuccin, racket lsp
This commit is contained in:
parent
65290b67f7
commit
ca0d4faec4
|
@ -3,16 +3,17 @@
|
|||
|
||||
(g! mapleader " ")
|
||||
|
||||
|
||||
(map! [n :noremap] :<C-space> "<cmd>Telescope buffers<CR>")
|
||||
|
||||
; trim those bastards
|
||||
(map! [n :noremap] :<leader>tw "<cmd>lua MiniTrailspace.trim()<CR>")
|
||||
|
||||
(map! [n :noremap] :<leader>fo "<cmd>Oil<CR>")
|
||||
; Telescope mappings
|
||||
(map! [n :noremap] :<leader>fb "<cmd>Telescope buffers<CR>")
|
||||
(map! [n :noremap] :<leader>ff "<cmd>Telescope find_files<CR>")
|
||||
(map! [n :noremap] :<leader>fs "<cmd>Telescope current_buffer_fuzzy_find<CR>")
|
||||
(map! [n :noremap] :<leader>gs "<cmd>Telescope git_status<CR>")
|
||||
(map! [n :noremap] :<leader>gg "<cmd>Telescope live_grep<CR>")
|
||||
(map! [n :noremap] :<leader>fg "<cmd>Telescope live_grep<CR>")
|
||||
(map! [n :noremap] :<leader>fh "<cmd>Telescope help_tags<CR>")
|
||||
(map! [n :noremap] :<leader>fk "<cmd>Telescope keymaps<CR>")
|
||||
|
||||
; remap keys so that they dont skip camelCase
|
||||
(map! [n :noremap :silent] :w "<Plug>CamelCaseMotion_w")
|
||||
|
@ -31,7 +32,7 @@
|
|||
(map! [n :noremap] :n "nzzzv")
|
||||
(map! [n :noremap] :N "Nzzzv")
|
||||
|
||||
; (map! [x :noremap] :p (fn [] [:_dP]))
|
||||
; (map! [x :noremap] :<leader>p (fn [] [:+dP]))
|
||||
; (map! [n :noremap] :<leader>s ":%s/\\<<C-r><C-w>\\>/<C-r><C-w>/gI<Left><Left><Left>")
|
||||
; (map! [nv :noremap] :<leader>d (fn [] [:_d]))
|
||||
; interface with system clipboard
|
||||
(map! [nvx :noremap :silent] :<leader>y "\"+y")
|
||||
(map! [nvx :noremap :silent] :<leader>Y "\"+yy")
|
||||
(map! [nvx :noremap :silent] :<leader>p "\"+p")
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
(import-macros {: set! : g!} :hibiscus.vim)
|
||||
(import-macros {: set! : g! : exec!} :hibiscus.vim)
|
||||
|
||||
(set! number true) ; enable line number
|
||||
(set! relativenumber true) ; enable relative line number
|
||||
|
@ -30,17 +30,19 @@
|
|||
(set! wildmode "longest,list")
|
||||
(set! mouse :v)
|
||||
(set! mouse :a)
|
||||
(set! clipboard :unnamedplus) ; use system clipboard
|
||||
; (set! clipboard :unnamedplus) ; use system clipboard
|
||||
(set! ttyfast true)
|
||||
(set! cursorline true)
|
||||
(set! splitbelow true)
|
||||
(set! autochdir true)
|
||||
; (set! autochdir true)
|
||||
(set! signcolumn :yes:1)
|
||||
(set! shell :/bin/zsh)
|
||||
|
||||
(set! showmode false)
|
||||
(set! cmdheight 0)
|
||||
|
||||
(vim.cmd "syntax match keyword \"\\<lambda\\>\" conceal cchar=λ")
|
||||
(set! conceallevel 1)
|
||||
|
||||
; Skip loading of following neovim builtins
|
||||
(local default_plugins {
|
||||
:2html_plugin
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
(gitsigns.setup {
|
||||
:signs
|
||||
{ :add [:text :▍]
|
||||
:change [:text :▍]
|
||||
:delete [:text :▍]
|
||||
:topdelete [:text :▍]
|
||||
:changedelete [:text :▍]
|
||||
:untracked [:text :▍] }
|
||||
{ :add {:text :▍}
|
||||
:change {:text :▍}
|
||||
:delete {:text :▍}
|
||||
:topdelete {:text :▍}
|
||||
:changedelete {:text :▍}
|
||||
:untracked {:text :▍} }
|
||||
|
||||
:signcolumn true
|
||||
:numhl false
|
||||
|
|
|
@ -5,11 +5,9 @@
|
|||
(require (modul :devicons))
|
||||
(require (modul :gitsigns))
|
||||
(require (modul :harpoon))
|
||||
; (require (modul :hlchunk))
|
||||
(require (modul :lsp-zero))
|
||||
(require (modul :lualine))
|
||||
(require (modul :mini))
|
||||
(require (modul :oil))
|
||||
(require (modul :telescope))
|
||||
(require (modul :treesitter))
|
||||
(require (modul :wilder))
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
(local plug 1)
|
||||
|
||||
(local plugins [
|
||||
:ThePrimeagen/vim-be-good
|
||||
|
||||
:udayvir-singh/tangerine.nvim
|
||||
:udayvir-singh/hibiscus.nvim
|
||||
|
||||
:EdenEast/nightfox.nvim
|
||||
:nyoom-engineering/oxocarbon.nvim
|
||||
:lambdalisue/nerdfont.vim
|
||||
|
||||
{ plug :catppuccin/nvim
|
||||
{ plug :catppuccin/nvim
|
||||
:name :catppuccin
|
||||
:priority 1000 }
|
||||
|
||||
|
@ -35,11 +35,11 @@
|
|||
:event [:ModeChanged :BufWinEnter :WinEnter]
|
||||
:opts [] }
|
||||
|
||||
{ plug :stevearc/oil.nvim
|
||||
:dependencies [:nvim-tree/nvim-web-devicons] }
|
||||
{ plug :nvim-telescope/telescope-fzf-native.nvim
|
||||
:build :make }
|
||||
|
||||
{ plug :nvim-telescope/telescope.nvim
|
||||
:tag "0.1.8"
|
||||
:tag :0.1.8
|
||||
:dependencies [:nvim-lua/plenary.nvim] }
|
||||
|
||||
{ plug :OXY2DEV/markview.nvim
|
||||
|
@ -47,9 +47,6 @@
|
|||
[ :nvim-treesitter/nvim-treesitter
|
||||
:nvim-tree/nvim-web-devicons ] }
|
||||
|
||||
; { plug :shellRaining/hlchunk.nvim
|
||||
; :event [:BufReadPre :BufNewFile] }
|
||||
|
||||
{ plug :ThePrimeagen/harpoon
|
||||
:branch :harpoon2
|
||||
:dependencies [:nvim-lua/plenary.nvim] }
|
||||
|
@ -69,6 +66,11 @@
|
|||
|
||||
:hrsh7th/nvim-cmp
|
||||
:hrsh7th/cmp-nvim-lsp
|
||||
:L3MON4D3/LuaSnip ]} ])
|
||||
:L3MON4D3/LuaSnip ]}
|
||||
|
||||
{ plug :m4xshen/hardtime.nvim
|
||||
:dependencies
|
||||
[ :MunifTanjim/nui.nvim
|
||||
:nvim-lua/plenary.nvim ] } ])
|
||||
|
||||
(lazy.setup plugins)
|
||||
|
|
|
@ -32,8 +32,11 @@
|
|||
|
||||
(lsp.setup)
|
||||
|
||||
(local fennel-ls lspconfig.fennel_ls)
|
||||
(fennel-ls.setup {})
|
||||
; (local fennel-ls lspconfig.fennel_ls)
|
||||
; (fennel-ls.setup {})
|
||||
|
||||
(lspconfig.racket_langserver.setup {})
|
||||
|
||||
|
||||
(cmp.setup
|
||||
{ :mapping
|
||||
|
|
|
@ -1,2 +1,11 @@
|
|||
(local telescope (require :telescope))
|
||||
(telescope.setup)
|
||||
|
||||
(telescope.setup
|
||||
{ :extansions
|
||||
{ :fzf
|
||||
{ :fuzzy true
|
||||
:override_generic_sorter true
|
||||
:override_file_sorter true
|
||||
:case_mode :smart_case } }})
|
||||
|
||||
(telescope.load_extension :fzf)
|
||||
|
|
|
@ -1,24 +1,24 @@
|
|||
(local wilder (require :wilder))
|
||||
|
||||
(wilder.setup {
|
||||
:modes [":" "/" "?"]
|
||||
})
|
||||
|
||||
(wilder.set_option :renderer (wilder.renderer_mux {
|
||||
":" (wilder.popupmenu_renderer {
|
||||
:highlighter wilder.basic_highlighter
|
||||
:left [ " " wilder.popupmenu_devicons ]
|
||||
:right [ " " wilder.popupmenu_scrollbar ]
|
||||
})
|
||||
|
||||
"/" (wilder.popupmenu_renderer {
|
||||
:highlighter wilder.basic_highlighter
|
||||
:left [ "" wilder.popupmenu_devicons ]
|
||||
:right [ "" wilder.popupmenu_scrollbar ]
|
||||
})
|
||||
}))
|
||||
|
||||
(wilder.set_option :renderer
|
||||
(wilder.popupmenu_renderer
|
||||
{ :max_height :20%
|
||||
:min_width :100% }))
|
||||
; (local wilder (require :wilder))
|
||||
;
|
||||
; (wilder.setup {
|
||||
; :modes [":" "/" "?"]
|
||||
; })
|
||||
;
|
||||
; (wilder.set_option :renderer (wilder.renderer_mux {
|
||||
; ":" (wilder.popupmenu_renderer {
|
||||
; :highlighter wilder.basic_highlighter
|
||||
; :left [ " " wilder.popupmenu_devicons ]
|
||||
; :right [ " " wilder.popupmenu_scrollbar ]
|
||||
; })
|
||||
;
|
||||
; "/" (wilder.popupmenu_renderer {
|
||||
; :highlighter wilder.basic_highlighter
|
||||
; :left [ "" wilder.popupmenu_devicons ]
|
||||
; :right [ "" wilder.popupmenu_scrollbar ]
|
||||
; })
|
||||
; }))
|
||||
;
|
||||
; (wilder.set_option :renderer
|
||||
; (wilder.popupmenu_renderer
|
||||
; { :max_height :20%
|
||||
; :min_width :100% }))
|
||||
|
|
Loading…
Reference in a new issue