From 4d410eee9d3d2eb58ef9567c87f9ddbcb9e00eb5 Mon Sep 17 00:00:00 2001 From: Jovan Djokic-Sumarac Date: Sat, 20 Jul 2024 13:18:47 +0200 Subject: [PATCH] remove hlchunk, change colorscheme --- fnl/options/colors.fnl | 79 ++++++++++- fnl/options/keybind.fnl | 8 +- fnl/options/opts.fnl | 14 +- fnl/plugins/devicons.fnl | 40 +++--- fnl/plugins/gitsigns.fnl | 44 +++---- fnl/plugins/hlblocks.fnl | 39 ------ fnl/plugins/init.fnl | 4 +- fnl/plugins/lazy.fnl | 109 +++++++-------- fnl/plugins/lazyinlua.bak | 115 ---------------- fnl/plugins/lsp-zero.fnl | 59 ++++----- fnl/plugins/lualine.fnl | 262 ++----------------------------------- fnl/plugins/treesitter.fnl | 44 +++---- init.fnl | 18 +-- 13 files changed, 240 insertions(+), 595 deletions(-) delete mode 100755 fnl/plugins/hlblocks.fnl delete mode 100755 fnl/plugins/lazyinlua.bak diff --git a/fnl/options/colors.fnl b/fnl/options/colors.fnl index eed4adf..a589077 100644 --- a/fnl/options/colors.fnl +++ b/fnl/options/colors.fnl @@ -1,4 +1,81 @@ (import-macros {: set! : exec!} :hibiscus.vim) +(local espresso (require :catppuccin)) + +(local color_overrides + { :macchiato + { :rosewater :#F5B8AB + :flamingo :#F29D9D + :pink :#AD6FF7 + :mauve :#FF8F40 + :red :#E66767 + :maroon :#EB788B + :peach :#FAB770 + :yellow :#FACA64 + :green :#70CF67 + :teal :#4CD4BD + :sky :#61BDFF + :sapphire :#4BA8FA + :blue :#00BFFF + :lavender :#00BBCC + :text :#C1C9E6 + :subtext1 :#A3AAC2 + :subtext0 :#8E94AB + :overlay2 :#7D8296 + :overlay1 :#676B80 + :overlay0 :#464957 + :surface2 :#3A3D4A + :surface1 :#2F313D + :surface0 :#1D1E29 + :base :#0b0b0b + :mantle :#11111a + :crust :#191926 } }) + +(local integrations + { :cmp true + :gitsigns true + :treesitter true + + :telescope + { :enabled true + :style :nvchad } + + :mini + { :enabled true} }) + + +(espresso.setup + { :flavour :macchiato + :color_overrides color_overrides + :integrations integrations }) + + (set! background :dark) -(exec! [colorscheme carbonfox]) +(exec! [colorscheme catppuccin]) + + + +; (local highlight_overrides +; { :all +; (fn [colors] +; :CurSearch { :bg colors.sky } +; :IncSearch { :bg colors.sky } +; :CursorLineNr { :fg colors.blue :style [:bold] } +; :DashboardFooter { :fg colors.overlay0 } +; :TreesitterContextBottom { :style {} } +; :WinSeparator { :fg colors.overlay0 :style [:bold] } +; :Headline { :style [:bold] } +; :Headline1 { :fg colors.blue :style [:bold] } +; :Headline2 { :fg colors.pink :style [:bold] } +; :Headline3 { :fg colors.lavender :style [:bold] } +; :Headline4 { :fg colors.green :style [:bold] } +; :Headline5 { :fg colors.peach :style [:bold] } +; :Headline6 { :fg colors.flamingo :style [:bold] } +; :rainbow1 { :fg colors.blue :style [:bold] } +; :rainbow2 { :fg colors.pink :style [:bold] } +; :rainbow3 { :fg colors.lavender :style [:bold] } +; :rainbow4 { :fg colors.green :style [:bold] } +; :rainbow5 { :fg colors.peach :style [:bold] } +; :rainbow6 { :fg colors.flamingo :style [:bold] } +; "@markup.italic" { :fg colors.blue :style [:italic] } +; "@markup.strong" { :fg colors.blue :style [:bold] } )}) diff --git a/fnl/options/keybind.fnl b/fnl/options/keybind.fnl index 39d9c3c..fd6155b 100755 --- a/fnl/options/keybind.fnl +++ b/fnl/options/keybind.fnl @@ -31,7 +31,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])) +; (map! [x :noremap] :p (fn [] [:_dP])) +; (map! [x :noremap] :p (fn [] [:+dP])) +; (map! [n :noremap] :s ":%s/\\<\\>//gI") +; (map! [nv :noremap] :d (fn [] [:_d])) diff --git a/fnl/options/opts.fnl b/fnl/options/opts.fnl index 0956cd3..3e88a18 100644 --- a/fnl/options/opts.fnl +++ b/fnl/options/opts.fnl @@ -1,25 +1,26 @@ (import-macros {: set! : g!} :hibiscus.vim) -(set! number true) ; enable line number +(set! number true) ; enable line number (set! relativenumber true) ; enable relative line number (set! undofile true) ; persistent undo (set! backup false) ; disable backup (set! autowrite true) ; auto write buffer when it's not focused -(set! ignorecase true) ; case insensitive on search.. -(set! list true) ; display listchars -(set! smartindent true) ; smarter indentation +(set! ignorecase true) ; case insensitive on search.. +(set! list true) ; display listchars +(set! smartindent false) ; smarter indentation (set! splitright true) ; split right instead of left (set! splitkeep :screen) ; stabilize split (set! startofline false) ; don't go to the start of the line when moving to another file (set! swapfile false) ; disable swapfile (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! smarttab false) (set! tabstop 4) (set! softtabstop 4) (set! shiftwidth 4) +(set! expandtab false) (set! compatible false) ; disable compatibility with old vi (set! showmatch true) ; show matches while searching for text @@ -36,8 +37,9 @@ (set! autochdir true) (set! signcolumn :yes:1) (set! shell :/bin/zsh) -(set! splitright false) +(set! showmode false) +(set! cmdheight 0) ; Skip loading of following neovim builtins (local default_plugins { diff --git a/fnl/plugins/devicons.fnl b/fnl/plugins/devicons.fnl index 8effdd2..259df7f 100755 --- a/fnl/plugins/devicons.fnl +++ b/fnl/plugins/devicons.fnl @@ -5,29 +5,21 @@ :default true :color_icons true - :override [ - :zsh [ - :icon "" - :color "#428850" - :cterm_color "65" - :name "zsh" - ] - ] + :override + [ :zsh + [ :icon "" + :color "#428850" + :cterm_color "65" + :name "zsh" ]] - :override_by_filename [ - :.gitignore [ - :icon "" - :color "#f1502f" - :name "gitignore" - ] - ] + :override_by_filename + [ :.gitignore + [ :icon "" + :color "#f1502f" + :name "gitignore" ]] - :override_by_extension [ - :log [ - :icon "" - :color "#81e043" - :name "Log" - ] - ] - -]) + :override_by_extension + [ :log + [ :icon "" + :color "#81e043" + :name "Log" ]] ]) diff --git a/fnl/plugins/gitsigns.fnl b/fnl/plugins/gitsigns.fnl index 0bf8bac..43acf84 100755 --- a/fnl/plugins/gitsigns.fnl +++ b/fnl/plugins/gitsigns.fnl @@ -1,34 +1,30 @@ (local gitsigns (require :gitsigns)) (gitsigns.setup { - :signs { - :add [:text :▍] - :change [:text :▍] - :delete [:text :▍] - :topdelete [:text :▍] - :changedelete [:text :▍] - :untracked [:text :▍] - } + :signs + { :add [:text :▍] + :change [:text :▍] + :delete [:text :▍] + :topdelete [:text :▍] + :changedelete [:text :▍] + :untracked [:text :▍] } :signcolumn true :numhl false :linehl false :word_diff false - :watch_gitdir { - :follow_files true - } + :watch_gitdir { :follow_files true } :attach_to_untracked true :current_line_blame false - :current_line_blame_opts { - :virt_text true - :virt_text_pos :eol - :delay 1000 - :ignore_whitespace false - } + :current_line_blame_opts + { :virt_text true + :virt_text_pos :eol + :delay 1000 + :ignore_whitespace false } :current_line_blame_formatter ", - " :sign_priority 6 @@ -36,11 +32,9 @@ :status_formatter nil :max_file_length 40000 - :preview_config { - :border :single - :style :minimal - :relative :cursor - :row 0 - :col 1 - } -}) + :preview_config + { :border :single + :style :minimal + :relative :cursor + :row 0 + :col 1 } }) diff --git a/fnl/plugins/hlblocks.fnl b/fnl/plugins/hlblocks.fnl deleted file mode 100755 index 8d26f36..0000000 --- a/fnl/plugins/hlblocks.fnl +++ /dev/null @@ -1,39 +0,0 @@ -(local hlchunk (require :hlchunk)) - -(hlchunk.setup { - :indent { - :chars { "." "." "." "." } - - :style { - :#888888 - :#666666 - :#444444 - :#333333 - :#333333 - :#333333 - :#333333 - :#333333 - } - } - - :blank { - :enable false - } - - :chunk { - :chars { - :horizontal_line "" - :vertical_line "" - :left_top "" - :left_bottom "" - :right_arrow "" - } - - :style :#FF7F00 - } - - :line_num { - :style :#FFFFFF - } - -}) diff --git a/fnl/plugins/init.fnl b/fnl/plugins/init.fnl index 30b9c5d..4d9f222 100755 --- a/fnl/plugins/init.fnl +++ b/fnl/plugins/init.fnl @@ -5,7 +5,7 @@ (require (modul :devicons)) (require (modul :gitsigns)) (require (modul :harpoon)) -(require (modul :hlblocks)) +; (require (modul :hlchunk)) (require (modul :lsp-zero)) (require (modul :lualine)) (require (modul :mini)) @@ -13,3 +13,5 @@ (require (modul :telescope)) (require (modul :treesitter)) (require (modul :wilder)) +(require (modul :incline)) +(require (modul :colorizer)) diff --git a/fnl/plugins/lazy.fnl b/fnl/plugins/lazy.fnl index 74e73a7..8ed91d1 100755 --- a/fnl/plugins/lazy.fnl +++ b/fnl/plugins/lazy.fnl @@ -8,86 +8,67 @@ (local lazy (require :lazy)) (local plug 1) -(local opt 1) -(lazy.setup [ +(local plugins [ + :udayvir-singh/tangerine.nvim + :udayvir-singh/hibiscus.nvim + :EdenEast/nightfox.nvim :nyoom-engineering/oxocarbon.nvim - :lambdalisue/nerdfont.vim - :gelguy/wilder.nvim + { plug :catppuccin/nvim + :name :catppuccin + :priority 1000 } + + :gelguy/wilder.nvim :bkad/camelcasemotion :lewis6991/gitsigns.nvim - { - plug :stevearc/oil.nvim - :dependencies [ - {plug :nvim-tree/nvim-web-devicons} - ] - } + { plug :b0o/incline.nvim + :event [:BufReadPre] } - { - plug :nvim-telescope/telescope.nvim - :tag "0.1.8" - :dependencies [ - {plug :nvim-lua/plenary.nvim} - ] - } + :echasnovski/mini.nvim + :brenoprata10/nvim-highlight-colors - { - plug :OXY2DEV/markview.nvim - :dependencies [ - {plug :nvim-treesitter/nvim-treesitter} - {plug :nvim-tree/nvim-web-devicons} - ] - } + { plug :svampkorg/moody.nvim + :event [:ModeChanged :BufWinEnter :WinEnter] + :opts [] } - { - plug :shellRaining/hlchunk.nvim - :event [ - {opt :UIEnter} - ] - } + { plug :stevearc/oil.nvim + :dependencies [:nvim-tree/nvim-web-devicons] } - { - plug :ThePrimeagen/harpoon - :branch :harpoon2 - :dependencies [ - {plug :nvim-lua/plenary.nvim} - ] - } + { plug :nvim-telescope/telescope.nvim + :tag "0.1.8" + :dependencies [:nvim-lua/plenary.nvim] } - { - plug :nvim-lualine/lualine.nvim - :dependencies [ - {plug :nvim-tree/nvim-web-devicons} - ] - } + { plug :OXY2DEV/markview.nvim + :dependencies + [ :nvim-treesitter/nvim-treesitter + :nvim-tree/nvim-web-devicons ] } - { - plug :nvim-treesitter/nvim-treesitter - :build ":TSUpdate" - } + ; { plug :shellRaining/hlchunk.nvim + ; :event [:BufReadPre :BufNewFile] } - { - plug :VonHeikemen/lsp-zero.nvim - :branch "v3.x" - :dependencies [ - {plug :neovim/nvim-lspconfig} - {plug :williamboman/mason.nvim} - {plug :williamboman/mason-lspconfig.nvim} + { plug :ThePrimeagen/harpoon + :branch :harpoon2 + :dependencies [:nvim-lua/plenary.nvim] } - {plug :hrsh7th/nvim-cmp} - {plug :hrsh7th/cmp-nvim-lsp} - {plug :L3MON4D3/LuaSnip} - ] - } + { plug :nvim-lualine/lualine.nvim + :dependencies [:nvim-tree/nvim-web-devicons] } - { - plug :echasnovski/mini.nvim - :version false - } -]) + { plug :nvim-treesitter/nvim-treesitter + :build ":TSUpdate" } + { plug :VonHeikemen/lsp-zero.nvim + :branch "v3.x" + :dependencies + [ :neovim/nvim-lspconfig + :williamboman/mason.nvim + :williamboman/mason-lspconfig.nvim + :hrsh7th/nvim-cmp + :hrsh7th/cmp-nvim-lsp + :L3MON4D3/LuaSnip ]} ]) + +(lazy.setup plugins) diff --git a/fnl/plugins/lazyinlua.bak b/fnl/plugins/lazyinlua.bak deleted file mode 100755 index a213ec5..0000000 --- a/fnl/plugins/lazyinlua.bak +++ /dev/null @@ -1,115 +0,0 @@ -local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim' - -if not vim.loop.fs_stat(lazypath) then - vim.fn.system({ - 'git', - 'clone', - '--filter=blob:none', - 'https://github.com/folke/lazy.nvim.git', - '--branch=stable', -- latest stable release - lazypath, - }) -end - -vim.opt.rtp:prepend(lazypath) - -require('lazy').setup({ - - 'EdenEast/nightfox.nvim', - 'luckasRanarison/tree-sitter-hypr', - - 'lambdalisue/nerdfont.vim', - 'gelguy/wilder.nvim', - - 'bkad/camelcasemotion', - 'lewis6991/gitsigns.nvim', - - { - 'nvim-telescope/telescope.nvim', - tag = '0.1.8', - dependencies = { - 'nvim-lua/plenary.nvim' - } - }, - - { - 'stevearc/oil.nvim', - dependencies = { - 'nvim-tree/nvim-web-devicons' - }, - }, - - { - 'kylechui/nvim-surround', - version = '*', -- Use for stability; omit to use `main` branch for the latest features - config = function() - require('nvim-surround').setup() - end - }, - - { - 'OXY2DEV/markview.nvim', - config = function() - require('markview').setup() - end, - dependencies = { - -- You may not need this if you don't lazy load - -- Or if the parsers are in your $RUNTIMEPATH - "nvim-treesitter/nvim-treesitter", - - "nvim-tree/nvim-web-devicons" - }, - }, - - { - 'shellRaining/hlchunk.nvim', - event = { - 'UIEnter' - }, - }, - - { - 'ThePrimeagen/harpoon', - branch = 'harpoon2', - dependencies = { - 'nvim-lua/plenary.nvim' - } - }, - - { - 'nvim-lualine/lualine.nvim', - dependencies = - { - 'nvim-tree/nvim-web-devicons', - opt = true - } - }, - - { - 'nvim-treesitter/nvim-treesitter', - build = ':TSUpdate' - }, - - { - 'VonHeikemen/lsp-zero.nvim', - branch = 'v3.x', - dependencies = { - -- LSP Support - 'neovim/nvim-lspconfig', - 'williamboman/mason.nvim', - 'williamboman/mason-lspconfig.nvim', - - -- Autocompletion - 'hrsh7th/nvim-cmp', - 'hrsh7th/cmp-nvim-lsp', - 'L3MON4D3/LuaSnip', - } - }, - - { - 'echasnovski/mini.nvim', - version = false - }, -}) - -vim.opt.laststatus=2 diff --git a/fnl/plugins/lsp-zero.fnl b/fnl/plugins/lsp-zero.fnl index 9832025..9e7a668 100755 --- a/fnl/plugins/lsp-zero.fnl +++ b/fnl/plugins/lsp-zero.fnl @@ -8,16 +8,13 @@ (mason.setup) (local mason-lspc (require :mason-lspconfig)) -(mason-lspc.setup { - :ensure-installed [ - :fennel-ls - :lua-language-server - :python-lsp-server ] - - :automatic_installation true }) - ; :handlers [ - ; (fn [server_name] ((. lspconfig server_name).setup {})] +(mason-lspc.setup + { :ensure-installed + [ :fennel-ls + :lua-language-server + :python-lsp-server ] + :automatic_installation true }) (local cmp (require :cmp)) (local cmp_action (lsp.cmp_action)) @@ -25,34 +22,36 @@ (lsp.on_attach (fn [_ bufnr] lsp.default_keymaps {:buffer bufnr})) -(lspconfig.pylsp.setup { - :setings { - :pylsp { - :plugins { - :pycodestyle { - :ignore [:W391 :E303 :E226] - :maxLineLength 120 }}}}}) +(lspconfig.pylsp.setup + { :setings + { :pylsp + { :plugins + { :pycodestyle + { :ignore [:W391 :E303 :E226] + :maxLineLength 120 } }}}}) (lsp.setup) (local fennel-ls lspconfig.fennel_ls) (fennel-ls.setup {}) -(cmp.setup { - :mapping { - : (cmp.mapping.confirm {:select true}) +(cmp.setup + { :mapping + { : (cmp.mapping.confirm {:select true}) - : (cmp.mapping (fn [fallback] - (if (cmp.visible) - (cmp.select_next_item) + : (cmp.mapping + (fn [fallback] + (if (cmp.visible) + (cmp.select_next_item) + (fallback)) [:i :s] )) + + : (cmp.mapping + (fn [fallback] + (if (cmp.visible) + (cmp.select_prev_item) (fallback)) [:i :s] )) - : (cmp.mapping (fn [fallback] - (if (cmp.visible) - (cmp.select_prev_item) - (fallback)) [:i :s] )) + : cmp.mapping.complete - : cmp.mapping.complete - - : cmp_action.luasnip_jump_forward - : cmp_action.luasnip_jump_backward }}) + : cmp_action.luasnip_jump_forward + : cmp_action.luasnip_jump_backward }}) diff --git a/fnl/plugins/lualine.fnl b/fnl/plugins/lualine.fnl index 5c16f9c..1e716cd 100755 --- a/fnl/plugins/lualine.fnl +++ b/fnl/plugins/lualine.fnl @@ -1,257 +1,11 @@ (local lualine (require :lualine)) -(lualine.setup) -; TODO: create a new theme +(lualine.setup + { :options + { :section_separators + { :left : + :right : } -; OLD THEME : - -; local lualine = require('lualine') -; -; local colors = { -; bg = '#202328', -; fg = '#bbc2cf', -; yellow = '#ECBE7B', -; cyan = '#008080', -; darkblue = '#081633', -; green = '#98be65', -; orange = '#FF8800', -; violet = '#a9a1e1', -; magenta = '#c678dd', -; blue = '#51afef', -; red = '#ec5f67', -; } -; -; -; local conditions = { -; buffer_not_empty = function() -; return vim.fn.empty(vim.fn.expand('%:t')) ~= 1 -; end, -; hide_in_width = function() -; return vim.fn.winwidth(0) > 80 -; end, -; check_git_workspace = function() -; local filepath = vim.fn.expand('%:p:h') -; local gitdir = vim.fn.finddir('.git', filepath .. ';') -; return gitdir and #gitdir > 0 and #gitdir < #filepath -; end, -; } -; -; -- Config -; local config = { -; options = { -; component_separators = '', -; section_separators = '', -; theme = { -; -; normal = { -; c = { -; fg = colors.fg, -; bg = colors.bg -; } -; }, -; -; inactive = { -; c = { -; fg = colors.fg, -; bg = colors.bg -; } -; }, -; -; }, -; }, -; -; -; sections = { -; lualine_a = {}, -; lualine_b = {}, -; lualine_y = {}, -; lualine_z = {}, -; lualine_c = {}, -; lualine_x = {}, -; }, -; inactive_sections = { -; lualine_a = {}, -; lualine_b = {}, -; lualine_y = {}, -; lualine_z = {}, -; lualine_c = {}, -; lualine_x = {}, -; }, -; } -; -; local function ins_left(component) -; table.insert(config.sections.lualine_c, component) -; end -; -; local function ins_right(component) -; table.insert(config.sections.lualine_x, component) -; end -; -; ins_left { -; function() -; return '▊' -; end, -; -; color = { fg = colors.blue }, -; -; padding = { -; left = 0, -; right = 1 -; }, -; } -; -; -; -; ins_left { -; function() -; -- return '' -; return '' -; end, -; color = function() -; local mode_color = { -; n = colors.blue, -; i = colors.red, -; v = colors.green, -; [''] = colors.orange, -; V = colors.green, -; c = colors.magenta, -; no = colors.red, -; s = colors.orange, -; S = colors.orange, -; [''] = colors.orange, -; ic = colors.yellow, -; R = colors.violet, -; Rv = colors.violet, -; cv = colors.red, -; ce = colors.red, -; r = colors.cyan, -; rm = colors.cyan, -; ['r?'] = colors.cyan, -; ['!'] = colors.red, -; t = colors.red, -; } -; return { fg = mode_color[vim.fn.mode()] } -; end, -; padding = { right = 1 }, -; } -; -; -; ins_left { -; 'branch', -; icon = '', -; -; color = { -; fg = colors.violet, -; gui = 'bold' -; }, -; } -; -; ins_left { -; 'diff', -; -; symbols = { -; added = ' ', -; modified = ' ', -; removed = ' ' -; }, -; -; diff_color = { -; added = { fg = colors.green }, -; modified = { fg = colors.orange }, -; removed = { fg = colors.red }, -; }, -; -; cond = conditions.hide_in_width, -; } -; -; -; -; ins_left { -; 'diagnostics', -; -; sources = { 'nvim_diagnostic' }, -; -; symbols = { -; error = ' ', -; warn = ' ', -; info = ' ' -; }, -; -; diagnostics_color = { -; color_error = { fg = colors.red }, -; color_warn = { fg = colors.yellow }, -; color_info = { fg = colors.cyan }, -; }, -; } -; -; ins_left { -; function() -; return '%=' -; end, -; } -; -; -; ins_left { -; 'filename', -; cond = conditions.buffer_not_empty, -; -; color = { -; fg = colors.magenta, -; gui = 'bold' -; }, -; } -; -; -; ins_right { -; 'filetype', -; colored = true, -; icon_only = false, -; icon = { align = 'right' } -; } -; -; ins_right { -; 'progress', -; -; color = { -; fg = colors.fg, -; gui = 'bold' -; } -; } -; -; -; ins_right { -; 'o:encoding', -; -; fmt = string.upper, -; cond = conditions.hide_in_width, -; -; color = { -; fg = colors.green, -; gui = 'bold' -; }, -; } -; -; -; ins_right { -; 'fileformat', -; -; fmt = string.upper, -; icons_enabled = false, -; -; color = { -; fg = colors.green, -; gui = 'bold' -; }, -; } -; -; -; ins_right { -; function() -; return '▊' -; end, -; -; color = { fg = colors.blue }, -; padding = { left = 1 }, -; } -; -; lualine.setup(config) + :component_separators + { :left : + :right : }} }) diff --git a/fnl/plugins/treesitter.fnl b/fnl/plugins/treesitter.fnl index 01be86d..2352fbd 100755 --- a/fnl/plugins/treesitter.fnl +++ b/fnl/plugins/treesitter.fnl @@ -1,28 +1,26 @@ (local configs (require :nvim-treesitter.configs)) -(local parsers (require :nvim-treesitter.parsers)) +; (local parsers (require :nvim-treesitter.parsers)) -(configs.setup { - :ensure_installed [ - :c - :lua - :vim - :vimdoc - :query - :haskell - :go - :bash - :python - :fennel - :hyprlang - ] +(configs.setup + { :ensure_installed + [ :c + :lua + :vim + :vimdoc + :query + :haskell + :go + :bash + :python + :fennel + :hyprlang ] - :sync_install false - :auto_install true + :sync_install false + :auto_install true - :highlight { - :enable true - } -}) + :highlight + { :enable true }}) -(vim.filetype.add { - :pattern { :.*/hypr/.*%.conf :hyprlang }}) +(vim.filetype.add + { :pattern + { :.*/hypr/.*%.conf :hyprlang }}) diff --git a/init.fnl b/init.fnl index ef74604..6f6a1be 100644 --- a/init.fnl +++ b/init.fnl @@ -10,17 +10,17 @@ ; mock us. Tell 'em all this is war. ; 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 vim.g.neovide (do - (set! guifont "FiraCode Nerd Font:h14") - (g! neovide_scale_factor 1.0) - (g! neovide_refresh_rate 120) - (g! neovide_refresh_rate_idle 5) - (g! neovide_cursor_antialiasing true) - (g! neovide_cursor_animate_in_insert_mode true) - (g! neovide_cursor_vfx_mode "ripple"))) +; (when vim.g.neovide (do +; (set! guifont "FiraCode Nerd Font:h14") +; (g! neovide_scale_factor 1.0) +; (g! neovide_refresh_rate 120) +; (g! neovide_refresh_rate_idle 5) +; (g! neovide_cursor_antialiasing true) +; (g! neovide_cursor_animate_in_insert_mode true) +; (g! neovide_cursor_vfx_mode "ripple"))) (require :plugins)