update

fnl/init.fnl

@@ -63,6 +63,7 @@
 (set nvim.wo.signcolumn "yes")
 
 (set nvim.o.termguicolors true)
-(nvim.command "colorscheme photon")
+; (nvim.command "colorscheme photon")
 
+(require "plugins")
 (require "settings")

fnl/plugins.fnl

@@ -0,0 +1,35 @@
+(local packer (require :packer))
+
+(packer.init {:git {:clone_timeout 120}})
+
+(packer.startup (fn [use]
+  (use :wbthomason/packer.nvim)
+  (use :Olical/aniseed) ; fennel to lua
+
+  ; themes
+  (use :axvr/photon.vim)
+  (use :projekt0n/github-nvim-theme)
+
+  ; ui
+  (use {1 :hoob3rt/lualine.nvim
+        :requires {1 :kyazdani42/nvim-web-devicons :opt true}})
+  (use :junegunn/goyo.vim)
+  (use :Yggdroot/indentLine)
+  (use :ntpeters/vim-better-whitespace)
+  (use :valloric/matchtagalways)
+
+  ; util
+  (use :cocopon/vaffle.vim)
+  (use :jeetsukumaran/vim-buffergator)
+  (use :tpope/vim-fugitive)
+  (use :kana/vim-operator-user)
+  (use :rhysd/vim-operator-surround)
+  (use :chaoren/vim-wordmotion)
+  (use :b3nj5m1n/kommentary)
+  (use :nelstrom/vim-visual-star-search)
+
+  ; others
+  (use :wakatime/vim-wakatime)
+  (use :rescript-lang/vim-rescript)
+  (use :otherjoel/vim-pollen)
+  (use {1 :kkoomen/vim-doge :run ":call doge#install()"})))

fnl/settings.fnl

@@ -2,6 +2,10 @@
   {require {nvim aniseed.nvim
             nu aniseed.nvim.util}})
 
+;; theme
+(global github-theme (require :github-theme))
+(github-theme.setup {:themeStyle :dark})
+
 ;; buffergator
 (set nvim.g.buffergator_display_regime "parentdir")
 
@@ -20,17 +24,42 @@
 (nvim.set_keymap "" :sd "<Plug>(operator-surround-delete)" {:silent true})
 (nvim.set_keymap "" :sr "<Plug>(operator-surround-replace)" {:silent true})
 
-;; language-client neovim
-;; (set nvim.g.LanguageClient_loggingFile "~/.config/nvim/lc.log")
-(set nvim.g.LanguageClient_serverCommands
-     {:c ["ccls"]
-      :cpp ["ccls"]
-      :objc ["ccls"]
-      :objcpp ["ccls"]
-      :go ["gopls"]
-      :rust ["rls"]})
+;; pollen
+(vim.cmd "
+  au! BufRead,BufNewFile,BufWritePost *.pm set filetype=pollen
+  au! BufRead,BufNewFile,BufWritePost *.pp set filetype=pollen
+  au! BufRead,BufNewFile,BufWritePost *.ptree set filetype=pollen
 
-(nvim.command "set completefunc=LanguageClient#complete")
-(nvim.set_keymap "" :gd "<Plug>(lcn-definition)" {:silent true})
-(nvim.set_keymap "" :gh "<Plug>(lcn-hover)" {:silent true})
-(nvim.set_keymap "" :gr "<Plug>(lcn-references)" {:silent true})
+  \" Suggested editor settings:
+  \" autocmd FileType pollen setlocal wrap      \" Soft wrap (don't affect buffer)
+  \" autocmd FileType pollen setlocal linebreak \" Wrap on word-breaks only
+")
+
+;; kommentary
+(global kommentary (require :kommentary.config))
+(kommentary.configure_language :default {:prefer_single_line_comments true})
+(kommentary.configure_language :objcpp {:prefer_single_line_comments true})
+
+;; lualine
+(global lualine (require :lualine))
+(lualine.setup
+  {:options {:theme :nightfly
+             :section_separators ["" ""]
+             :component_separators ["" ""]
+             :icons_enabled true}
+  :sections {:lualine_a {1 {1 :mode
+                            :upper true}}
+             :lualine_b {1 {1 :branch
+                            :icon ""}}
+             :lualine_c {1 {1 :filename
+                            :file_status true}}
+             :lualine_x ["encoding" "fileformat" "filetype"]
+             :lualine_y ["progress"]
+             :lualine_z ["location"]}
+  :inactive_sections {:lualine_a {}
+                      :lualine_b {}
+                      :lualine_c ["filename"]
+                      :lualine_x ["location"]
+                      :lualine_y {}
+                      :lualine_z {}}
+  :extensions ["fugitive"]})