From ca0d4faec420a99de6141fccbdcad0ecc085d1ff Mon Sep 17 00:00:00 2001 From: Jovan Djokic-Sumarac Date: Mon, 22 Jul 2024 23:27:02 +0200 Subject: [PATCH] remove oil, hlchunk, add catppuccin, racket lsp --- fnl/options/keybind.fnl | 19 ++++++++-------- fnl/options/opts.fnl | 10 ++++---- fnl/plugins/gitsigns.fnl | 12 +++++----- fnl/plugins/init.fnl | 2 -- fnl/plugins/lazy.fnl | 22 ++++++++++-------- fnl/plugins/lsp-zero.fnl | 7 ++++-- fnl/plugins/telescope.fnl | 11 ++++++++- fnl/plugins/wilder.fnl | 48 +++++++++++++++++++-------------------- 8 files changed, 73 insertions(+), 58 deletions(-) diff --git a/fnl/options/keybind.fnl b/fnl/options/keybind.fnl index fd6155b..d1b4234 100755 --- a/fnl/options/keybind.fnl +++ b/fnl/options/keybind.fnl @@ -3,16 +3,17 @@ (g! mapleader " ") - -(map! [n :noremap] : "Telescope buffers") - +; trim those bastards (map! [n :noremap] :tw "lua MiniTrailspace.trim()") -(map! [n :noremap] :fo "Oil") +; Telescope mappings +(map! [n :noremap] :fb "Telescope buffers") (map! [n :noremap] :ff "Telescope find_files") (map! [n :noremap] :fs "Telescope current_buffer_fuzzy_find") (map! [n :noremap] :gs "Telescope git_status") -(map! [n :noremap] :gg "Telescope live_grep") +(map! [n :noremap] :fg "Telescope live_grep") +(map! [n :noremap] :fh "Telescope help_tags") +(map! [n :noremap] :fk "Telescope keymaps") ; remap keys so that they dont skip camelCase (map! [n :noremap :silent] :w "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] :p (fn [] [:+dP])) -; (map! [n :noremap] :s ":%s/\\<\\>//gI") -; (map! [nv :noremap] :d (fn [] [:_d])) +; interface with system clipboard +(map! [nvx :noremap :silent] :y "\"+y") +(map! [nvx :noremap :silent] :Y "\"+yy") +(map! [nvx :noremap :silent] :p "\"+p") diff --git a/fnl/options/opts.fnl b/fnl/options/opts.fnl index 3e88a18..ee7b9f4 100644 --- a/fnl/options/opts.fnl +++ b/fnl/options/opts.fnl @@ -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 \"\\\" conceal cchar=λ") +(set! conceallevel 1) + ; Skip loading of following neovim builtins (local default_plugins { :2html_plugin diff --git a/fnl/plugins/gitsigns.fnl b/fnl/plugins/gitsigns.fnl index 43acf84..9456ef7 100755 --- a/fnl/plugins/gitsigns.fnl +++ b/fnl/plugins/gitsigns.fnl @@ -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 diff --git a/fnl/plugins/init.fnl b/fnl/plugins/init.fnl index 4d9f222..1d48a9f 100755 --- a/fnl/plugins/init.fnl +++ b/fnl/plugins/init.fnl @@ -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)) diff --git a/fnl/plugins/lazy.fnl b/fnl/plugins/lazy.fnl index 8ed91d1..b011f21 100755 --- a/fnl/plugins/lazy.fnl +++ b/fnl/plugins/lazy.fnl @@ -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) diff --git a/fnl/plugins/lsp-zero.fnl b/fnl/plugins/lsp-zero.fnl index 9e7a668..c78f802 100755 --- a/fnl/plugins/lsp-zero.fnl +++ b/fnl/plugins/lsp-zero.fnl @@ -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 diff --git a/fnl/plugins/telescope.fnl b/fnl/plugins/telescope.fnl index 54dfd22..55a01f1 100644 --- a/fnl/plugins/telescope.fnl +++ b/fnl/plugins/telescope.fnl @@ -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) diff --git a/fnl/plugins/wilder.fnl b/fnl/plugins/wilder.fnl index 875d11b..d579d1f 100755 --- a/fnl/plugins/wilder.fnl +++ b/fnl/plugins/wilder.fnl @@ -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% }))