Merge branch 'master' into laptop

hypr/hyprland.conf

@@ -12,6 +12,8 @@ exec-once=hyprpaper
 exec-once=wl-paste --type text --watch cliphist store
 exec-once=wl-paste --type image --watch cliphist store
 exec-once=/usr/lib/mate-polkit/polkit-mate-authentication-agent-1
+exec-once=/usr/lib/kdeconnectd
+exec-once=sleep 2 && hyprctl dispatch workspace 11
 
 workspace=eDP-1,1
 workspace=HDMI-A-1,11

install.sh

@@ -39,14 +39,14 @@ fi
 if $NVIM; then
     dependencies="neovim git unzip fzf cmake gcc make curl wget ripgrep npm"
     if [[ $OS == "NAME=\"Arch Linux\"" ]]; then
-        $SUDO pacman -Sy --needed --noconfirm "$dependencies" npm go fd
+        $SUDO pacman -Sy --needed --noconfirm $dependencies npm go fd dotnet-sdk
     elif [[ $OS == "NAME=\"Ubuntu\"" ]]; then
         $SUDO apt update
         $SUDO apt install -y software-properties-common
         $SUDO add-apt-repository ppa:neovim-ppa/unstable -y
         $SUDO curl -sL https://deb.nodesource.com/setup_21.x | $SUDO bash -
         $SUDO apt update
-        $SUDO apt install -y "$dependencies" python3-venv nodejs golang fd-find
+        $SUDO apt install -y $dependencies python3-venv nodejs golang fd-find
     fi
 
     ln -s "$PWD"/nvim "$XDG_CONFIG_HOME"/nvim
@@ -63,11 +63,11 @@ if $ZSH; then
     PROFILE=true
     dependencies="fzf zsh curl zoxide"
     if [[ $OS == "NAME=\"Arch Linux\"" ]]; then
-        $SUDO pacman -Sy --needed --noconfirm "$dependencies" zsh-autosuggestions
+        $SUDO pacman -Sy --needed --noconfirm $dependencies zsh-autosuggestions
         echo "Please manually install yay"
     elif [[ $OS == "NAME=\"Ubuntu\"" ]]; then
         $SUDO apt update
-        $SUDO apt install -y "$dependencies"
+        $SUDO apt install -y $dependencies
     fi
 
     ln -s "$PWD"/zsh "$XDG_CONFIG_HOME"/zsh
@@ -95,10 +95,10 @@ fi
 if $AWESOME; then
     dependencies="awesome picom numlockx xcape rofi"
     if [[ $OS == "NAME=\"Arch Linux\"" ]]; then
-        $SUDO pacman -Sy --needed --noconfirm "$dependencies" network-manager-applet xorg-xmodmap adobe-source-code-pro-fonts noto-fonts ttf-nerd-fonts-symbols
+        $SUDO pacman -Sy --needed --noconfirm $dependencies network-manager-applet xorg-xmodmap adobe-source-code-pro-fonts noto-fonts ttf-nerd-fonts-symbols
     elif [[ $OS == "NAME=\"Ubuntu\"" ]]; then
         $SUDO apt update
-        $SUDO apt install -y "$dependencies" awesome-extra
+        $SUDO apt install -y $dependencies awesome-extra
     fi
 
     ln -s "$PWD"/awesome "$XDG_CONFIG_HOME"/awesome
@@ -149,14 +149,14 @@ fi
 if $TMUX; then
     dependencies="tmux git zsh xdg-utils"
     if [[ $OS == "NAME=\"Arch Linux\"" ]]; then
-        $SUDO pacman -Sy --needed --noconfirm "$dependencies"
+        $SUDO pacman -Sy --needed --noconfirm $dependencies
 
         ln -s "$PWD"/tmux "$XDG_CONFIG_HOME"/tmux
         git clone https://github.com/tmux-plugins/tpm "$XDG_DATA_HOME"/tmux/plugins/tpm
         "$XDG_DATA_HOME"/tmux/plugins/tpm/bin/install_plugins
     elif [[ $OS == "NAME=\"Ubuntu\"" ]]; then
         $SUDO apt update
-        $SUDO apt install -y "$dependencies"
+        $SUDO apt install -y $dependencies
 
         ln -s "$PWD"/tmux "$HOME"/.tmux
         ln -s "$PWD"/tmux/tmux.conf "$HOME"/.tmux.conf

nvim/lazy-lock.json

@@ -1,44 +1,45 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
   "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" },
-  "catppuccin": { "branch": "main", "commit": "c2034f7b549152e5cc757820426341ea5000bc7a" },
+  "catppuccin": { "branch": "main", "commit": "c0de3b46811fe1ce3912e2245a9dfbea6b41c300" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp-snippy": { "branch": "master", "commit": "6e39210aa3a74e2bf6462f492eaf0d436cd2b7d3" },
-  "copilot.lua": { "branch": "master", "commit": "03f825956ec49e550d07875d867ea6e7c4dc8c00" },
+  "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
   "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
   "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
   "formatter.nvim": { "branch": "master", "commit": "cb4778b8432f1ae86dae4634c0b611cb269a4c2f" },
   "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
-  "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" },
-  "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
-  "neogit": { "branch": "master", "commit": "536b4cfc009fc6d8bd771f010f04d48204533fae" },
-  "none-ls.nvim": { "branch": "main", "commit": "c10b7be7751aee820a02f2d1fafe76bc316fe223" },
-  "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" },
+  "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" },
+  "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
+  "neogit": { "branch": "master", "commit": "9c5b1392f22203c1ea082ad42f2c97f3ca6b5de1" },
+  "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" },
   "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
-  "nvim-lspconfig": { "branch": "master", "commit": "41f40dc4b86f3e166cf08115f621001972565a20" },
+  "nvim-lspconfig": { "branch": "master", "commit": "7f5cf1121f772850a30bdaf83fb448e88846aa58" },
   "nvim-neoclip.lua": { "branch": "main", "commit": "798cd0592a81c185465db3a091a0ff8a21af60fd" },
-  "nvim-snippy": { "branch": "master", "commit": "8e4e39a4bf5f8939fcf4898d1fba48d1d1f72303" },
+  "nvim-snippy": { "branch": "master", "commit": "6295b6cb30725c343a8986096c9f04b0e7646c52" },
   "nvim-tree.lua": { "branch": "master", "commit": "59e65d88db177ad1e6a8cffaafd4738420ad20b6" },
-  "nvim-treesitter": { "branch": "master", "commit": "05962ae14a076c5806592b1d447adb0f9707c2c1" },
-  "nvim-web-devicons": { "branch": "master", "commit": "7f30f2da3c3641841ceb0e2c150281f624445e8f" },
-  "obsidian.nvim": { "branch": "main", "commit": "387f5cf90718b729e1e855e66dd272039395a6dc" },
-  "oil.nvim": { "branch": "master", "commit": "bf753c3e3f8736939ad5597f92329dfe7b1df4f5" },
+  "nvim-treesitter": { "branch": "master", "commit": "212b7a504cf56f85d1acc5be237261b42d7560c5" },
+  "nvim-web-devicons": { "branch": "master", "commit": "4adea17610d140a99c313e3f79a9dc01825d59ae" },
+  "obsidian.nvim": { "branch": "main", "commit": "b1f5eb198a6e8dffffc484e803f0b3de4e15f815" },
+  "oil.nvim": { "branch": "master", "commit": "c437f3c5b0da0a9cc6a222d87212cce11b80ba75" },
   "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
-  "sqlite.lua": { "branch": "master", "commit": "b7e28c8463254c46a8e61c52d27d6a2040492fc3" },
+  "sqlite.lua": { "branch": "master", "commit": "40701b6151f8883980c1548647116de39b763540" },
   "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" },
   "telescope-undo.nvim": { "branch": "main", "commit": "d3afc1c105535a90caec092ce27a113f77ba7b84" },
-  "telescope.nvim": { "branch": "master", "commit": "0f865f17af4f9bc1587a0132414cdfd32d91852e" },
+  "telescope.nvim": { "branch": "master", "commit": "dc1ea28cc2a02cd1cebb9d80e967807d668f78f8" },
   "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
-  "tree-sitter-hyprlang": { "branch": "master", "commit": "e60fc858e6327a15c0b26f99ec96945fecd1e4ee" },
-  "trim.nvim": { "branch": "master", "commit": "629b96a303a3a0bb5fd050e6cd9d627ca7831cc7" },
+  "tree-sitter-hyprlang": { "branch": "master", "commit": "fc1d331586e4da2b5f5bcfa89d630ebafe66458b" },
+  "tree-sitter-typst": { "branch": "master", "commit": "823309ed8b872dd33c7f350a3bab3d6e51436a5a" },
+  "trim.nvim": { "branch": "master", "commit": "17a16c532a0ba1528fe9a4d79015b2843734502d" },
   "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" },
   "vim-bracketed-paste": { "branch": "master", "commit": "45411da73cc159e4fc2138d930553d247bbfbcdc" },
+  "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" },
   "vim-hypr-nav": { "branch": "main", "commit": "6ab4865a7eb5aad35305298815a4563c9d48556a" },
   "vim-rooter": { "branch": "master", "commit": "1353fa47ee3a81083c284e28ff4f7d92655d7c9e" },
-  "vim-snippets": { "branch": "master", "commit": "9bd88e07865bd4fa982d46356c227b07de66412a" },
-  "vimtex": { "branch": "master", "commit": "cb0fd1b437a6b3797ed4dfd01a0aa0ae97b23871" }
+  "vim-snippets": { "branch": "master", "commit": "393d980157b8149b3ff65a48bc4aae24dca9c846" },
+  "vimtex": { "branch": "master", "commit": "a77d14b2e4391c0d3e860708bb1fd56161ab68eb" }
 }

nvim/lua/plugins/init.lua

@@ -2,6 +2,7 @@ return {
     'ConradIrwin/vim-bracketed-paste',
     'airblade/vim-rooter',
     'nuchs/vim-hypr-nav',
+    'isobit/vim-caddyfile',
     'debugloop/telescope-undo.nvim',
     {'windwp/nvim-autopairs', event = "InsertEnter", opts = {}},
     {'NeogitOrg/neogit', dependencies = {"nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim", "sindrets/diffview.nvim"}, config = true, lazy = true},

nvim/lua/plugins/none-ls.lua

@@ -1,21 +0,0 @@
-return {
-    "nvimtools/none-ls.nvim",
-    dependencies = { "mason.nvim", "nvim-lua/plenary.nvim" },
-    config = function()
-        local null_ls = require("null-ls")
-        null_ls.setup({
-            root_dir = require("null-ls.utils").root_pattern(".git", "Makefile", "CMakeLists.txt", "build/", "meson.build"),
-            sources = {
-                -- null_ls.builtins.completion.spell,
-                -- null_ls.builtins.code_actions.proselint,
-                -- null_ls.builtins.diagnostics.proselint,
-                -- null_ls.builtins.diagnostics.codespell,
-                null_ls.builtins.diagnostics.shellcheck,
-                null_ls.builtins.formatting.shellharden,
-                null_ls.builtins.formatting.shfmt,
-                -- null_ls.builtins.diagnostics.cppcheck,
-                -- null_ls.builtins.diagnostics.selene
-            }
-        })
-    end,
-}

nvim/spell/ltex.dictionary.en-GB.txt

@@ -1,9 +1,9 @@
 logits
-logits
 OpenSwarm
 Lumentis
 stochasticity
 Feywild
+closeby
 ECML
 theshold-based
 imec

zsh/.zshenv

@@ -0,0 +1,3 @@
+if [ -d "$HOME/.cargo/env" ]; then
+    . "$HOME/.cargo/env"
+fi

zsh/.zshrc

@@ -151,19 +151,8 @@ export TERM="screen-256color"
 export PATH=$HOME/.local/bin:$PATH
 export GOPATH=/tmp/go
 
-# >>> mamba initialize >>>
-# !! Contents within this block are managed by 'mamba init' !!
-export MAMBA_EXE="$HOME/.local/bin/micromamba";
+eval "$(micromamba shell hook --shell zsh)"
 export MAMBA_ROOT_PREFIX="$HOME/.micromamba";
-__mamba_setup="$("$MAMBA_EXE" shell hook --shell zsh --root-prefix "$MAMBA_ROOT_PREFIX" 2> /dev/null)"
-if [ $? -eq 0 ]; then
-    eval "$__mamba_setup"
-else
-    alias micromamba="$MAMBA_EXE"  # Fallback on help from mamba activate
-fi
-unset __mamba_setup
-# <<< mamba initialize <<<
-
 autoload -Uz add-zsh-hook
 
 eval "$(zoxide init zsh --cmd j)"
@@ -207,3 +196,4 @@ alias cpr=rsync --archive -hh --partial --info=stats1,progress2 --modify-window=
 alias mvr=rsync --archive -hh --partial --info=stats1,progress2 --modify-window=1 --remove-source-files
 alias rg="rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'"
 alias ag="rg -i --colors 'match:bg:yellow' --colors 'match:fg:black' --colors 'match:style:nobold' --colors 'path:fg:green' --colors 'path:style:bold' --colors 'line:fg:yellow' --colors 'line:style:bold'"
+alias push="git add -A && git commit -m '`date`' && git push"