Refactor/treesitter highlights

.env.xps

@@ -3,45 +3,46 @@
 # ln -s <this_filename> dotfiles/.env
 
 # font names
-FONT1="LigaSaucyCodePro Nerd Font"
-FONT2="LigaSaucyCodeProNerdFont"
-FONT3="LigaSaucyCodeProNerdFontComplete"
-FONT4="LigaSaucyCodeProBlackNerdFontComplete"
+FONT_FAMILY_REG="LigaSauceCodePro"
+FONT_FAMILY_BLD="LigaSauceCodePro"
+FONT_POSTSCRIPT_REG="LigaSauceCodePro"
+FONT_POSTSCRIPT_BLD="LigaSauceCodePro"
+FONT_EMOJI="Noto Color Emoji"
 
 # kitty
 export ENABLE_KITTY=1
-export KITTY_FONT_1="$FONT3-Regular"
-export KITTY_FONT_2="$FONT3-Italic"
-export KITTY_FONT_3="$FONT4-Black"
-export KITTY_FONT_4="$FONT4-BlackIt"
+export KITTY_FONT_1="$FONT_POSTSCRIPT_REG-SemiBold"
+export KITTY_FONT_2="$FONT_POSTSCRIPT_REG-SemiBoldItalic"
+export KITTY_FONT_3="$FONT_POSTSCRIPT_BLD-Black"
+export KITTY_FONT_4="$FONT_POSTSCRIPT_BLD-BlackItalic"
 export KITTY_FONT_SIZE=11.0
 
 # dunst
 export ENABLE_DUNST=1
-export DUNST_FONT="$FONT2 10"
+export DUNST_FONT="$FONT_FAMILY_BLD 10"
 
 # i3
 export ENABLE_I3=1
-export I3_FONT="pango:$FONT2 10"
+export I3_FONT="pango:$FONT_FAMILY_BLD 10"
 
 # polybar
 export ENABLE_POLYBAR=1
-export POLYBAR_FONT_0="$FONT1:pixelsize=10:style=Bold"
-export POLYBAR_FONT_1="$FONT1:pixelsize=10:style=Regular"
-export POLYBAR_FONT_2="Noto Color Emoji:pixelsize=1:style=Regular:scale=10;2"
+export POLYBAR_FONT_0="$FONT_FAMILY_REG:pixelsize=10:style=bold"
+export POLYBAR_FONT_1="$FONT_FAMILY_REG:pixelsize=10:style=bold"
+export POLYBAR_FONT_2="$FONT_EMOJI:pixelsize=1:style=Regular:scale=10;2"
 
 # qutebrowser
 export ENABLE_QUTEBROWSER=1
 export QUTEBROWSER_FONT_SIZE=11
-export QUTEBROWSER_MONO_FONT="$FONT1"
+export QUTEBROWSER_MONO_FONT="$FONT_FAMILY_REG"
 export QUTEBROWSER_REGULAR_FONT=""
 
 # rofi
 export ENABLE_ROFI=1
-export ROFI_FONT="$FONT1 12"
+export ROFI_FONT="$FONT_FAMILY_REG 12"
 
 # sketchybar
-export SKETCHYBAR_FONT="$FONT1:Bold:13.0"
+export SKETCHYBAR_FONT="$FONT_FAMILY_REG:black:13.0"
 
 # wallpapers
 export WALLPAPER_DIR="$HOME/pictures/wallpapers"
@@ -64,7 +65,7 @@ export ENABLE_TMUX=1
 
 # pdf reader
 export ENABLE_ZATHURA=1
-export ZATHURA_FONT="$FONT1 12"
+export ZATHURA_FONT="$FONT_FAMILY_REG 12"
 
 # fzf
 export FZF_FILES_DIR="/usr/share/fzf"
@@ -85,6 +86,6 @@ export ENABLE_ZSH_PLUGINS=1
 export ENABLE_LAUNCHER=0
 
 # LSP servers to install in vim
-export LSP_SERVERS="tsserver,jsonls,marksman,lua_ls,bashls,gopls"
+export LSP_SERVERS="tsserver,eslint,jsonls,marksman,lua_ls,bashls,gopls,pylsp"
 
 # vim:ft=sh

neovim/.config/nvim/lua/config/plugins/ui.lua

@@ -159,6 +159,31 @@ return {
       }
     end
   },
+  {
+    'folke/twilight.nvim',
+    opts = {
+      {
+        dimming = {
+          alpha = 0.50, -- amount of dimming
+          -- we try to get the foreground from the highlight groups or fallback color
+          color = { "Normal", "#ffffff" },
+          term_bg = "#000000", -- if guibg=NONE, this will be used to calculate text color
+          inactive = false, -- when true, other windows will be fully dimmed (unless they contain the same buffer)
+        },
+        context = 10,    -- amount of lines we will try to show around the current line
+        treesitter = true, -- use treesitter when available for the filetype
+        -- treesitter is used to automatically expand the visible text,
+        -- but you can further control the types of nodes that should always be fully expanded
+        expand = { -- for treesitter, we we always try to expand to the top-most ancestor with these types
+          "function",
+          "method",
+          "table",
+          "if_statement",
+        },
+        exclude = {}, -- exclude these filetypes
+      }
+    }
+  },
   {
     'folke/zen-mode.nvim',
     keys = {
@@ -298,10 +323,6 @@ return {
     'nvimdev/dashboard-nvim',
     event = 'VimEnter',
     opts = function()
-      vim.cmd [[ highlight link DashboardHeader ColorYellow ]]
-      vim.cmd [[ highlight link DashboardProjectTitle ColorBlue ]]
-      vim.cmd [[ highlight link DashboardMruTitle ColorBlue ]]
-
       local logo = require('config/utils/ascii_art')
       table.insert(logo, "")
       table.insert(logo, "")

neovim/.config/nvim/lua/config/settings.lua

@@ -21,6 +21,7 @@ o.mouse = 'a'
 o.swapfile = false
 o.wrap = false
 o.linebreak = true
+o.breakindent = true
 o.spell = true
 o.clipboard = 'unnamed,unnamedplus'
 o.foldlevelstart = 20