Merge branch 'main' of github.com:ficcdaf/dotfiles

merge conflict

.config/kitty/kitty.conf##hostname.dbox

@@ -1,6 +1,7 @@
 include ~/.cache/wal/colors-kitty.conf
 
 font_family     Source Code Pro Semibold
+# font_family     Firacode Nerd Font
 font_size 	    11.0
 bold_font       Source Code Pro Bold
 italic_font     Source Code Pro Italic 
@@ -19,4 +20,4 @@ selection_background #F5FBFF
 
 # Nerd Fonts v2.3.3
 
-symbol_map U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0D4,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6AA,U+E700-U+E7C5,U+EA60-U+EBEB,U+F000-U+F2E0,U+F300-U+F32F,U+F400-U+F4A9,U+F500-U+F8FF,U+F0001-U+F1AF0 Symbols Nerd Font Mono
+# symbol_map U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0D4,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6AA,U+E700-U+E7C5,U+EA60-U+EBEB,U+F000-U+F2E0,U+F300-U+F32F,U+F400-U+F4A9,U+F500-U+F8FF,U+F0001-U+F1AF0 Symbols Nerd Font Mono

.config/nvim/lua/config/autocmds.lua

@@ -1,9 +1,48 @@
 -- Autocmds are automatically loaded on the VeryLazy event
 -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua
 -- Add any additional autocmds here
--- vim.cmd("let &t_ut=''")
 vim.opt_local.breakindent = true
 vim.opt_local.wrap = true
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = "tex",
+  callback = function()
+    vim.cmd([[
+            syntax match texMathSymbol "\\oplus" conceal cchar=⊕
+        ]])
+  end,
+})
+-- This autocommand fixes syntax highlighting for inline math in markdown files
+-- Together with vimtex, it will apply very sexy good stuff here!
+vim.api.nvim_create_autocmd("FileType", {
+  pattern = "markdown",
+  callback = function()
+    vim.cmd([[
+    syn region mathBlock start=/\$\$/ end=/\$\$/ contains=@tex
+    " inline math
+    syn match mathInline '\$[^$].\{-}\$' contains=@tex
+    " syn include @tex syntax/tex.vim
+    " actually highlight the region we defined as "math"
+    syn include @tex syntax/tex.vim
+    hi def link mathBlock Statement
+    hi def link mathInline Statement
+    " let g:vimtex_syntax_custom_cmds = [
+    "       \ {'name': 'vct', 'mathmode': 1, 'argstyle': 'bold'},
+    "       \ {'name': 'R', 'cmdre': 'R>', 'mathmode': 1, 'concealchar': 'ℝ'},
+    "       \ {'name': 'R',  'mathmode': 1, 'concealchar': 'ℝ'},
+    "       \ {'name': 'mathnote', 'mathmode': 1, 'nextgroup': 'texMathTextArg'},
+    "       \ {'name': 'nospell', 'argspell': 0},
+    "       \]
+  ]])
+    vim.g.vimtex_syntax_custom_cmds = vim.tbl_extend("force", vim.g.vimtex_syntax_custom_cmds or {}, {
+      -- { name = "oplus", mathmode = 1, concealchar = "⊕" },
+      { name = "oplus", mathmode = 1, concealchar = "⊕" },
+    })
+    -- vim.g.vimtex_syntax_conceal = {
+    --   math = 1,
+    --   oplus = "⊕",
+    -- }
+  end,
+})
 vim.api.nvim_create_autocmd({ "FileType" }, {
   pattern = { "markdown" },
   callback = function()

.config/nvim/spell/en.utf-8.add

@@ -57,3 +57,6 @@ networkx
 NetworkX
 ie
 numpy
+unicode
+ints
+oplus

.zshrc

@@ -4,9 +4,12 @@ source $ZSH/oh-my-zsh.sh
 
 # autoload -U promptinit; promptinit
 # prompt purer
+autoload -U edit-command-line
+zle -N edit-command-line
+bindkey "^e" edit-command-line
 
 # Set up fzf key bindings and fuzzy completion
-eval "$(fzf --zsh)"
+# eval "$(fzf --zsh)"
 
 alias ls="eza -lh"
 alias top=btop