merge it

.config/alacritty/alacritty.toml

@@ -120,3 +120,127 @@ lines = 24
 [window.padding]
 x = 3
 y = 3
+||||||| b9b5ebe
+=======
+[bell]
+color = "#ffffff"
+duration = 200
+
+[colors]
+draw_bold_text_with_bright_colors = false
+
+[colors.bright]
+black = "#565656"
+blue = "#49a4f8"
+cyan = "#99faf2"
+green = "#c0e17d"
+magenta = "#a47de9"
+red = "#ec5357"
+white = "#ffffff"
+yellow = "#f9da6a"
+
+[colors.normal]
+black = "#2e2e2e"
+blue = "#47a0f3"
+cyan = "#64dbed"
+green = "#abe047"
+magenta = "#7b5cb0"
+red = "#eb4129"
+white = "#e5e9f0"
+yellow = "#f6c744"
+
+[colors.primary]
+background = "#000000"
+foreground = "#fffbf6"
+
+[env]
+TERM = "xterm-256color"
+
+[font]
+size = 19.0
+
+[font.bold]
+style = "Regular"
+
+[font.bold_italic]
+style = "Oblique"
+
+[font.italic]
+style = "Light Oblique"
+
+[font.normal]
+family = "Iosevka Berkeley"
+style = "Light"
+
+[hints]
+alphabet = "jfkdls;ahgurieowpq"
+
+[[hints.enabled]]
+action = "Copy"
+regex = "[a-f0-9]{7,}"
+
+[hints.enabled.binding]
+key = "H"
+mods = "Control|Shift"
+
+[[hints.enabled]]
+action = "Copy"
+regex = "(magnet:|mailto:|https:|http:|news:|file:|git:|ssh:|ftp:)[^\u0000-\u001F\u007F-Ÿ<>\"\\s{-}\\^⟨⟩`]+"
+
+[hints.enabled.binding]
+key = "U"
+mods = "Control|Shift"
+
+[[hints.enabled]]
+command = "xdg-open"
+post_processing = true
+regex = "(magnet:|mailto:|https:|http:|news:|file:|git:|ssh:|ftp:)[^\u0000-\u001F\u007F-Ÿ<>\"\\s{-}\\^⟨⟩`]+"
+
+[hints.enabled.binding]
+key = "L"
+mods = "Control|Shift"
+
+[hints.enabled.mouse]
+enabled = true
+mods = "None"
+
+[[keyboard.bindings]]
+action = "ToggleViMode"
+key = "Q"
+mode = "Vi|~Search"
+
+[[keyboard.bindings]]
+action = "Paste"
+key = "P"
+mode = "Vi|~Search"
+
+[[keyboard.bindings]]
+action = "ToggleFullscreen"
+key = "Return"
+mods = "Alt"
+
+[[keyboard.bindings]]
+action = "ToggleFullscreen"
+key = "Return"
+mods = "Command"
+
+[[keyboard.bindings]]
+chars = "\u001B."
+key = "Period"
+mods = "Command"
+
+[scrolling]
+history = 10000
+multiplier = 3
+
+[window]
+opacity = 0.88
+startup_mode = "Windowed"
+
+[window.dimensions]
+columns = 106
+lines = 24
+
+[window.padding]
+x = 3
+y = 3

.config/fish/conf.d/virtualfish-loader.fish

@@ -1,4 +0,0 @@
-set -g VIRTUALFISH_VERSION 2.5.5
-set -g VIRTUALFISH_PYTHON_EXEC /bin/python
-source /home/barak/.local/lib/python3.11/site-packages/virtualfish/virtual.fish
-emit virtualfish_did_setup_plugins

.vim/nvim.lua

@@ -158,7 +158,7 @@ nvim_lsp.hls.setup {
 }
 
 nvim_lsp.svelte.setup {
-  cmd = { "/home/barak/.yarn/bin/svelteserver", "--stdio" }
+  cmd = { "/home/barak/.bun/bin/bunx", "svelteserver", "--stdio" }
 }
 
 local runtime_path = vim.split(package.path, ';')
@@ -255,23 +255,23 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
 
 -- Compe setup
 require 'compe'.setup {
-  enabled = true;
+  enabled = true,
-  autocomplete = true;
+  autocomplete = true,
-  debug = false;
+  debug = false,
-  min_length = 1;
+  min_length = 1,
-  preselect = 'disable';
+  preselect = 'disable',
-  throttle_time = 80;
+  throttle_time = 80,
-  source_timeout = 200;
+  source_timeout = 200,
-  incomplete_delay = 400;
+  incomplete_delay = 400,
-  max_abbr_width = 100;
+  max_abbr_width = 100,
-  max_kind_width = 100;
+  max_kind_width = 100,
-  max_menu_width = 100;
+  max_menu_width = 100,
-  documentation = true;
+  documentation = true,
 
   source = {
-    path = true;
+    path = true,
-    nvim_lsp = true;
+    nvim_lsp = true,
-  };
+  },
 }
 
 --signature_cfg = {
@@ -387,17 +387,17 @@ require('trouble').setup {
     jump = { "o", "<tab>" }, -- jump to the diagnostic or open / close folds
     --open_split = { "<c-x>" }, -- open buffer in new split
     --open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
-    open_tab = {}, -- open buffer in new tab
+    open_tab = {},                -- open buffer in new tab
-    jump_close = { "<cr>" }, -- jump to the diagnostic and close the list
+    jump_close = { "<cr>" },      -- jump to the diagnostic and close the list
-    toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode
+    toggle_mode = "m",            -- toggle between "workspace" and "document" diagnostics mode
-    toggle_preview = "P", -- toggle auto_preview
+    toggle_preview = "P",         -- toggle auto_preview
-    hover = "K", -- opens a small popup with the full multiline message
+    hover = "K",                  -- opens a small popup with the full multiline message
-    preview = "p", -- preview the diagnostic location
+    preview = "p",                -- preview the diagnostic location
     close_folds = { "zM", "zm" }, -- close all folds
-    open_folds = { "zR", "zr" }, -- open all folds
+    open_folds = { "zR", "zr" },  -- open all folds
     toggle_fold = { "zA", "za" }, -- toggle fold of current file
-    previous = "k", -- previous item
+    previous = "k",               -- previous item
-    next = "j" -- next item
+    next = "j"                    -- next item
   },
 }
 
@@ -549,7 +549,7 @@ require 'nvim-treesitter.configs'.setup {
   playground = {
     enable = true,
     disable = {},
-    updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
+    updatetime = 25,         -- Debounced time for highlighting nodes in the playground from source code
     persist_queries = false, -- Whether the query persists across vim sessions
     keybindings = {
       toggle_query_editor = 'o',

.vimrc

@@ -124,7 +124,6 @@ Plug 'chrisbra/NrrwRgn'
 "Plug 'tpope/vim-fireplace', {'for': 'clojure'}
 ""Plug 'terryma/vim-multiple-cursors'
 "Plug 'ambv/black'
-Plug 'kana/vim-textobj-user'
 
 
 " Plugins I wish I used more
@@ -137,7 +136,6 @@ Plug 'tpope/vim-unimpaired'
 Plug 'b4winckler/vim-angry'
 Plug 'tpope/vim-surround'
 Plug 'junegunn/vim-easy-align'
-Plug 'bps/vim-textobj-python'
 
 " Plugins I NEED
 Plug 'scrooloose/nerdcommenter'
@@ -246,6 +244,8 @@ Plug 'kristijanhusak/defx-icons'
 
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 Plug 'nvim-treesitter/playground'
+Plug 'nvim-treesitter/nvim-treesitter-textobjects'
+
 
 "Plug 'ggandor/lightspeed.nvim'
 "Plug 'justinmk/vim-sneak'
@@ -657,11 +657,15 @@ set statusline+=\ %P    "percent through file
 
 " ** SMALL FUNCTIONS THAT DON'T FIT AS PLUGINS ***
 
-" Add capital W so I can be lazy about my shift key
+" Add capital W and Q so I can be lazy about my shift key
 if !exists(":W")
 	command W :w
 endif
 
+if !exists(":Q")
+        command Q :q
+endif
+
 " CD to the path of the file I'm editing.
 command Cdf :cd %:p:h