2 Коммиты 41744f825f ... 10af0d0fe3

Автор SHA1 Сообщение Дата
  alkostuchkov 10af0d0fe3 Modified: .c/nvim/../plugins/formatting.lua 4 месяцев назад
  alkostuchkov 2e9d396b29 Modified: .c/awesome/themes/myeverforest/theme.lua 4 месяцев назад

+ 2 - 1
.config/awesome/themes/myeverforest/theme.lua

@@ -17,7 +17,8 @@ theme.font = "Sarasa Mono SC Nerd 12"
 theme.taglist_font = "Ubuntu Nerd Font 12"
 
 theme.bg_normal = "#2d353b"
-theme.bg_focus = "#475258"
+theme.bg_focus = "#5b656b"
+-- theme.bg_focus = "#475258"
 theme.bg_urgent = "#e67e80"
 -- theme.bg_minimize = "#3c4a4f"
 theme.bg_systray = theme.bg_normal

+ 201 - 201
.config/fish/config.fish

@@ -373,205 +373,205 @@ alias emacs="emacsclient -c -a 'emacs'"
 # opam configuration ----------------------------------------------------------
 source /home/alexander/.opam/opam-init/init.fish >/dev/null 2>/dev/null; or true
 # Fuzzy finder ----------------------------------------------------------------
-source /usr/share/fzf/key-bindings.fish
-
-# ### key-bindings.fish ###
-# #     ____      ____
-# #    / __/___  / __/
-# #   / /_/_  / / /_
-# #  / __/ / /_/ __/
-# # /_/   /___/_/ key-bindings.fish
-# #
-# # - $FZF_TMUX_OPTS
-# # - $FZF_CTRL_T_COMMAND
-# # - $FZF_CTRL_T_OPTS
-# # - $FZF_CTRL_R_OPTS
-# # - $FZF_ALT_C_COMMAND
-# # - $FZF_ALT_C_OPTS
+# source /usr/share/fzf/key-bindings.fish
+
+### key-bindings.fish ###
+#     ____      ____
+#    / __/___  / __/
+#   / /_/_  / / /_
+#  / __/ / /_/ __/
+# /_/   /___/_/ key-bindings.fish
 #
-# status is-interactive; or exit 0
-#
-#
-# # Key bindings
-# # ------------
-# function fzf_key_bindings
-#
-#   function __fzf_defaults
-#     # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS
-#     # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS
-#     test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
-#     echo "--height $FZF_TMUX_HEIGHT --bind=ctrl-z:ignore" $argv[1]
-#     command cat "$FZF_DEFAULT_OPTS_FILE" 2> /dev/null
-#     echo $FZF_DEFAULT_OPTS $argv[2]
-#   end
-#
-#   # Store current token in $dir as root for the 'find' command
-#   function fzf-file-widget -d "List files and folders"
-#     set -l commandline (__fzf_parse_commandline)
-#     set -lx dir $commandline[1]
-#     set -l fzf_query $commandline[2]
-#     set -l prefix $commandline[3]
-#
-#     test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
-#     begin
-#       set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=file,dir,follow,hidden --scheme=path --walker-root='$dir'" "$FZF_CTRL_T_OPTS")
-#       set -lx FZF_DEFAULT_COMMAND "$FZF_CTRL_T_COMMAND"
-#       set -lx FZF_DEFAULT_OPTS_FILE ''
-#       eval (__fzfcmd)' -m --query "'$fzf_query'"' | while read -l r; set result $result $r; end
-#     end
-#     if [ -z "$result" ]
-#       commandline -f repaint
-#       return
-#     else
-#       # Remove last token from commandline.
-#       commandline -t ""
-#     end
-#     for i in $result
-#       commandline -it -- $prefix
-#       commandline -it -- (string escape $i)
-#       commandline -it -- ' '
-#     end
-#     commandline -f repaint
-#   end
-#
-#   function fzf-history-widget -d "Show command history"
-#     test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
-#     begin
-#       set -l FISH_MAJOR (echo $version | cut -f1 -d.)
-#       set -l FISH_MINOR (echo $version | cut -f2 -d.)
-#
-#       # merge history from other sessions before searching
-#       if test -z "$fish_private_mode"
-#         builtin history merge
-#       end
-#
-#       # history's -z flag is needed for multi-line support.
-#       # history's -z flag was added in fish 2.4.0, so don't use it for versions
-#       # before 2.4.0.
-#       if [ "$FISH_MAJOR" -gt 2 -o \( "$FISH_MAJOR" -eq 2 -a "$FISH_MINOR" -ge 4 \) ];
-#         if type -P perl > /dev/null 2>&1
-#           set -lx FZF_DEFAULT_OPTS (__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"\t"↳ ' --highlight-line $FZF_CTRL_R_OPTS +m")
-#           set -lx FZF_DEFAULT_OPTS_FILE ''
-#           builtin history -z --reverse | command perl -0 -pe 's/^/$.\t/g; s/\n/\n\t/gm' | eval (__fzfcmd) --tac --read0 --print0 -q '(commandline)' | command perl -pe 's/^\d*\t//' | read -lz result
-#           and commandline -- $result
-#         else
-#           set -lx FZF_DEFAULT_OPTS (__fzf_defaults "" "--scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"\t"↳ ' --highlight-line $FZF_CTRL_R_OPTS +m")
-#           set -lx FZF_DEFAULT_OPTS_FILE ''
-#           builtin history -z | eval (__fzfcmd) --read0 --print0 -q '(commandline)' | read -lz result
-#           and commandline -- $result
-#         end
-#       else
-#         builtin history | eval (__fzfcmd) -q '(commandline)' | read -l result
-#         and commandline -- $result
-#       end
-#     end
-#     commandline -f repaint
-#   end
-#
-#   function fzf-cd-widget -d "Change directory"
-#     set -l commandline (__fzf_parse_commandline)
-#     set -lx dir $commandline[1]
-#     set -l fzf_query $commandline[2]
-#     set -l prefix $commandline[3]
-#
-#     test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
-#     begin
-#       set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=dir,follow,hidden --scheme=path --walker-root='$dir'" "$FZF_ALT_C_OPTS")
-#       set -lx FZF_DEFAULT_OPTS_FILE ''
-#       set -lx FZF_DEFAULT_COMMAND "$FZF_ALT_C_COMMAND"
-#       eval (__fzfcmd)' +m --query "'$fzf_query'"' | read -l result
-#
-#       if [ -n "$result" ]
-#         cd -- $result
-#
-#         # Remove last token from commandline.
-#         commandline -t ""
-#         commandline -it -- $prefix
-#       end
-#     end
-#
-#     commandline -f repaint
-#   end
-#
-#   function __fzfcmd
-#     test -n "$FZF_TMUX"; or set FZF_TMUX 0
-#     test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
-#     if [ -n "$FZF_TMUX_OPTS" ]
-#       echo "fzf-tmux $FZF_TMUX_OPTS -- "
-#     else if [ $FZF_TMUX -eq 1 ]
-#       echo "fzf-tmux -d$FZF_TMUX_HEIGHT -- "
-#     else
-#       echo "fzf"
-#     end
-#   end
-#
-#   bind \cr fzf-history-widget
-#   if not set -q FZF_CTRL_T_COMMAND; or test -n "$FZF_CTRL_T_COMMAND"
-#     bind \ct fzf-file-widget
-#   end
-#   if not set -q FZF_ALT_C_COMMAND; or test -n "$FZF_ALT_C_COMMAND"
-#     bind \ec fzf-cd-widget
-#   end
-#
-#   if bind -M insert > /dev/null 2>&1
-#     bind -M insert \cr fzf-history-widget
-#     if not set -q FZF_CTRL_T_COMMAND; or test -n "$FZF_CTRL_T_COMMAND"
-#       bind -M insert \ct fzf-file-widget
-#     end
-#     if not set -q FZF_ALT_C_COMMAND; or test -n "$FZF_ALT_C_COMMAND"
-#       bind -M insert \ec fzf-cd-widget
-#     end
-#   end
-#
-#   function __fzf_parse_commandline -d 'Parse the current command line token and return split of existing filepath, fzf query, and optional -option= prefix'
-#     set -l commandline (commandline -t)
-#
-#     # strip -option= from token if present
-#     set -l prefix (string match -r -- '^-[^\s=]+=' $commandline)
-#     set commandline (string replace -- "$prefix" '' $commandline)
-#
-#     # eval is used to do shell expansion on paths
-#     eval set commandline $commandline
-#
-#     if [ -z $commandline ]
-#       # Default to current directory with no --query
-#       set dir '.'
-#       set fzf_query ''
-#     else
-#       set dir (__fzf_get_dir $commandline)
-#
-#       if [ "$dir" = "." -a (string sub -l 1 -- $commandline) != '.' ]
-#         # if $dir is "." but commandline is not a relative path, this means no file path found
-#         set fzf_query $commandline
-#       else
-#         # Also remove trailing slash after dir, to "split" input properly
-#         set fzf_query (string replace -r "^$dir/?" -- '' "$commandline")
-#       end
-#     end
-#
-#     echo $dir
-#     echo $fzf_query
-#     echo $prefix
-#   end
-#
-#   function __fzf_get_dir -d 'Find the longest existing filepath from input string'
-#     set dir $argv
-#
-#     # Strip all trailing slashes. Ignore if $dir is root dir (/)
-#     if [ (string length -- $dir) -gt 1 ]
-#       set dir (string replace -r '/*$' -- '' $dir)
-#     end
-#
-#     # Iteratively check if dir exists and strip tail end of path
-#     while [ ! -d "$dir" ]
-#       # If path is absolute, this can keep going until ends up at /
-#       # If path is relative, this can keep going until entire input is consumed, dirname returns "."
-#       set dir (dirname -- "$dir")
-#     end
-#
-#     echo $dir
-#   end
-#
-# end
-# ### end: key-bindings.fish ###
-# fzf_key_bindings
+# - $FZF_TMUX_OPTS
+# - $FZF_CTRL_T_COMMAND
+# - $FZF_CTRL_T_OPTS
+# - $FZF_CTRL_R_OPTS
+# - $FZF_ALT_C_COMMAND
+# - $FZF_ALT_C_OPTS
+
+status is-interactive; or exit 0
+
+
+# Key bindings
+# ------------
+function fzf_key_bindings
+
+  function __fzf_defaults
+    # $1: Prepend to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS
+    # $2: Append to FZF_DEFAULT_OPTS_FILE and FZF_DEFAULT_OPTS
+    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+    echo "--height $FZF_TMUX_HEIGHT --bind=ctrl-z:ignore" $argv[1]
+    command cat "$FZF_DEFAULT_OPTS_FILE" 2> /dev/null
+    echo $FZF_DEFAULT_OPTS $argv[2]
+  end
+
+  # Store current token in $dir as root for the 'find' command
+  function fzf-file-widget -d "List files and folders"
+    set -l commandline (__fzf_parse_commandline)
+    set -lx dir $commandline[1]
+    set -l fzf_query $commandline[2]
+    set -l prefix $commandline[3]
+
+    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+    begin
+      set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=file,dir,follow,hidden --scheme=path --walker-root='$dir'" "$FZF_CTRL_T_OPTS")
+      set -lx FZF_DEFAULT_COMMAND "$FZF_CTRL_T_COMMAND"
+      set -lx FZF_DEFAULT_OPTS_FILE ''
+      eval (__fzfcmd)' -m --query "'$fzf_query'"' | while read -l r; set result $result $r; end
+    end
+    if [ -z "$result" ]
+      commandline -f repaint
+      return
+    else
+      # Remove last token from commandline.
+      commandline -t ""
+    end
+    for i in $result
+      commandline -it -- $prefix
+      commandline -it -- (string escape $i)
+      commandline -it -- ' '
+    end
+    commandline -f repaint
+  end
+
+  function fzf-history-widget -d "Show command history"
+    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+    begin
+      set -l FISH_MAJOR (echo $version | cut -f1 -d.)
+      set -l FISH_MINOR (echo $version | cut -f2 -d.)
+
+      # merge history from other sessions before searching
+      if test -z "$fish_private_mode"
+        builtin history merge
+      end
+
+      # history's -z flag is needed for multi-line support.
+      # history's -z flag was added in fish 2.4.0, so don't use it for versions
+      # before 2.4.0.
+      if [ "$FISH_MAJOR" -gt 2 -o \( "$FISH_MAJOR" -eq 2 -a "$FISH_MINOR" -ge 4 \) ];
+        if type -P perl > /dev/null 2>&1
+          set -lx FZF_DEFAULT_OPTS (__fzf_defaults "" "-n2..,.. --scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"\t"↳ ' --highlight-line $FZF_CTRL_R_OPTS +m")
+          set -lx FZF_DEFAULT_OPTS_FILE ''
+          builtin history -z --reverse | command perl -0 -pe 's/^/$.\t/g; s/\n/\n\t/gm' | eval (__fzfcmd) --tac --read0 --print0 -q '(commandline)' | command perl -pe 's/^\d*\t//' | read -lz result
+          and commandline -- $result
+        else
+          set -lx FZF_DEFAULT_OPTS (__fzf_defaults "" "--scheme=history --bind=ctrl-r:toggle-sort --wrap-sign '"\t"↳ ' --highlight-line $FZF_CTRL_R_OPTS +m")
+          set -lx FZF_DEFAULT_OPTS_FILE ''
+          builtin history -z | eval (__fzfcmd) --read0 --print0 -q '(commandline)' | read -lz result
+          and commandline -- $result
+        end
+      else
+        builtin history | eval (__fzfcmd) -q '(commandline)' | read -l result
+        and commandline -- $result
+      end
+    end
+    commandline -f repaint
+  end
+
+  function fzf-cd-widget -d "Change directory"
+    set -l commandline (__fzf_parse_commandline)
+    set -lx dir $commandline[1]
+    set -l fzf_query $commandline[2]
+    set -l prefix $commandline[3]
+
+    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+    begin
+      set -lx FZF_DEFAULT_OPTS (__fzf_defaults "--reverse --walker=dir,follow,hidden --scheme=path --walker-root='$dir'" "$FZF_ALT_C_OPTS")
+      set -lx FZF_DEFAULT_OPTS_FILE ''
+      set -lx FZF_DEFAULT_COMMAND "$FZF_ALT_C_COMMAND"
+      eval (__fzfcmd)' +m --query "'$fzf_query'"' | read -l result
+
+      if [ -n "$result" ]
+        cd -- $result
+
+        # Remove last token from commandline.
+        commandline -t ""
+        commandline -it -- $prefix
+      end
+    end
+
+    commandline -f repaint
+  end
+
+  function __fzfcmd
+    test -n "$FZF_TMUX"; or set FZF_TMUX 0
+    test -n "$FZF_TMUX_HEIGHT"; or set FZF_TMUX_HEIGHT 40%
+    if [ -n "$FZF_TMUX_OPTS" ]
+      echo "fzf-tmux $FZF_TMUX_OPTS -- "
+    else if [ $FZF_TMUX -eq 1 ]
+      echo "fzf-tmux -d$FZF_TMUX_HEIGHT -- "
+    else
+      echo "fzf"
+    end
+  end
+
+  bind \cr fzf-history-widget
+  if not set -q FZF_CTRL_T_COMMAND; or test -n "$FZF_CTRL_T_COMMAND"
+    bind \ct fzf-file-widget
+  end
+  if not set -q FZF_ALT_C_COMMAND; or test -n "$FZF_ALT_C_COMMAND"
+    bind \ec fzf-cd-widget
+  end
+
+  if bind -M insert > /dev/null 2>&1
+    bind -M insert \cr fzf-history-widget
+    if not set -q FZF_CTRL_T_COMMAND; or test -n "$FZF_CTRL_T_COMMAND"
+      bind -M insert \ct fzf-file-widget
+    end
+    if not set -q FZF_ALT_C_COMMAND; or test -n "$FZF_ALT_C_COMMAND"
+      bind -M insert \ec fzf-cd-widget
+    end
+  end
+
+  function __fzf_parse_commandline -d 'Parse the current command line token and return split of existing filepath, fzf query, and optional -option= prefix'
+    set -l commandline (commandline -t)
+
+    # strip -option= from token if present
+    set -l prefix (string match -r -- '^-[^\s=]+=' $commandline)
+    set commandline (string replace -- "$prefix" '' $commandline)
+
+    # eval is used to do shell expansion on paths
+    eval set commandline $commandline
+
+    if [ -z $commandline ]
+      # Default to current directory with no --query
+      set dir '.'
+      set fzf_query ''
+    else
+      set dir (__fzf_get_dir $commandline)
+
+      if [ "$dir" = "." -a (string sub -l 1 -- $commandline) != '.' ]
+        # if $dir is "." but commandline is not a relative path, this means no file path found
+        set fzf_query $commandline
+      else
+        # Also remove trailing slash after dir, to "split" input properly
+        set fzf_query (string replace -r "^$dir/?" -- '' "$commandline")
+      end
+    end
+
+    echo $dir
+    echo $fzf_query
+    echo $prefix
+  end
+
+  function __fzf_get_dir -d 'Find the longest existing filepath from input string'
+    set dir $argv
+
+    # Strip all trailing slashes. Ignore if $dir is root dir (/)
+    if [ (string length -- $dir) -gt 1 ]
+      set dir (string replace -r '/*$' -- '' $dir)
+    end
+
+    # Iteratively check if dir exists and strip tail end of path
+    while [ ! -d "$dir" ]
+      # If path is absolute, this can keep going until ends up at /
+      # If path is relative, this can keep going until entire input is consumed, dirname returns "."
+      set dir (dirname -- "$dir")
+    end
+
+    echo $dir
+  end
+
+end
+### end: key-bindings.fish ###
+fzf_key_bindings

+ 12 - 12
.config/nvim/lazy-lock.json

@@ -1,36 +1,36 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
-  "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
-  "auto-session": { "branch": "main", "commit": "fe705eed9da20ac81780134432b2e12ab28af8f9" },
+  "alpha-nvim": { "branch": "main", "commit": "355fbb81a59637a8963cf5847074f8c44dbef11f" },
+  "auto-session": { "branch": "main", "commit": "322d82fa7cb455bc82a30f4e4907af696afdfb45" },
   "bufferline.nvim": { "branch": "main", "commit": "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "2122fe2ff01e9a542fc358ee9398ce2cbddf345d" },
+  "conform.nvim": { "branch": "master", "commit": "667102f26106709cddd2dff1f699610df5b94d7f" },
   "dressing.nvim": { "branch": "master", "commit": "6741f1062d3dc6e4755367a7e9b347b553623f04" },
   "everforest": { "branch": "master", "commit": "b49ba81e79b20d2b47bb71e98fa984bae90731be" },
   "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
   "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" },
   "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" },
-  "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" },
+  "lazygit.nvim": { "branch": "main", "commit": "2432b447483f42ff2e18b2d392cb2bb27e495c08" },
   "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
-  "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" },
+  "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "f2acd4a21db1ca0a12559e7a9f7cdace3bdbfb09" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "nvim-autopairs": { "branch": "master", "commit": "4a39f2dcbe1967ddc3a0f76f863540dd3aa7871a" },
+  "nvim-autopairs": { "branch": "master", "commit": "48ca9aaee733911424646cb1605f27bc01dedbe3" },
   "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" },
+  "nvim-lint": { "branch": "master", "commit": "ad0fe35e80f5cd31a0f19176d7b30e5c3011119d" },
   "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" },
-  "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a67bc39aaa4f1e13212c5022a561120846eaef27" },
   "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
-  "nvim-tree.lua": { "branch": "master", "commit": "48d0e82f9434691cc50d970898142a8c084a49d6" },
-  "nvim-treesitter": { "branch": "master", "commit": "3e0feeb062b29bb7d6d6df1e32ba28111c2bb734" },
+  "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" },
+  "nvim-treesitter": { "branch": "master", "commit": "047ce49ccf9a2dce22e1cf3843bef3b5682a8144" },
   "nvim-ts-autotag": { "branch": "main", "commit": "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "6b5f95aa4d24f2c629a74f2c935c702b08dbde62" },
   "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" },

+ 2 - 1
.config/nvim/lua/alex/plugins/formatting.lua

@@ -16,7 +16,8 @@ return {
         -- python = { "autopep8" },
       },
       format_on_save = {
-        lsp_fallback = true,
+        lsp_fallback = false,
+        -- lsp_fallback = true,
         async = false,
         timeout_ms = 1000,
       },