354 changed files with 9606 additions and 8673 deletions
--- a/.chezmoiroot
+++ b/.chezmoiroot
@ -0,0 +1 @@
+chezmoi
--- a/.dotter/aleidk-work-laptop.toml
+++ b/.dotter/aleidk-work-laptop.toml
@ -1,8 +0,0 @@
-includes = []
-packages = ["default"]
-
-[files]
-"configs/hypr/work-laptop/hyprland.conf" = "~/.config/hypr/include/work-laptop.conf"
-"configs/niri/work-laptop/local.kdl" = "~/.config/niri/include/local.kdl"
-
-[variables]
--- a/.dotter/almighty.toml
+++ b/.dotter/almighty.toml
@ -1,7 +0,0 @@
-includes = []
-packages = ["default"]
-
-[files]
-"configs/hypr/almighty/hyprland.conf" = "~/.config/hypr/include/almighty.conf"
-
-[variables]
--- a/.dotter/global.toml
+++ b/.dotter/global.toml
@ -1,42 +0,0 @@
-[settings]
-default_target_type = "symbolic"
-
-[helpers]
-
-[default]
-depends = ["niri"]
-
-[default.files]
-"configs/fish" = "~/.config/fish"
-"configs/alacritty" = "~/.config/alacritty"
-"configs/atuin" = "~/.config/atuin"
-"configs/bat" = "~/.config/bat"
-"configs/containers" = "~/.config/containers"
-"configs/fzf" = "~/.config/fzf"
-"configs/ghostty" = "~/.config/ghostty"
-"configs/git" = "~/.config/git"
-"configs/hypr/base" = "~/.config/hypr"
-"configs/kitty" = "~/.config/kitty"
-"configs/lazygit" = "~/.config/lazygit"
-"configs/mako" = "~/.config/mako"
-"configs/mise" = "~/.config/mise"
-"configs/mpv" = "~/.config/mpv"
-"configs/nvim" = "~/.config/nvim"
-"configs/rofi" = "~/.config/rofi"
-"configs/swappy" = "~/.config/swappy"
-"configs/swaync" = "~/.config/swaync"
-"configs/uwsm" = "~/.config/uwsm"
-"configs/vimiv" = "~/.config/vimiv"
-"configs/waybar" = "~/.config/waybar"
-"configs/wezterm" = "~/.config/wezterm"
-"configs/wlogout" = "~/.config/wlogout"
-"configs/wpaperd" = "~/.config/wpaperd"
-"configs/yazi" = "~/.config/yazi"
-"configs/systemd" = "~/.config/systemd"
-"configs/zed" = "~/.config/zed"
-
-
-[default.variables]
-
-[niri.files]
-"configs/niri/base" = "~/.config/niri"
--- a/.gitignore
+++ b/.gitignore
@ -16,6 +16,3 @@ config/ncspot/userstate.cbor
 config/zsh/zprofile.local
 config/spicetify/CustomApps/*
 chezmoi/dot_config/zsh/aliases/work.zsh
-.dotter/cache.toml
-.dotter/cache
-.dotter/local.toml
--- a/configs/alacritty/themes/.keep
+++ b/configs/alacritty/themes/.keep
--- a/.justfile
+++ b/.justfile
@ -1,49 +0,0 @@
-packages_file  := quote(justfile_directory() / "bootstrap/pkgs_arch.txt")
-
-bootstrap: setup_pacman setup_paru install_packages
-
-
-install_packages: update_packages
-  paru -S --needed --noconfirm - < {{ packages_file }}
-
-update_packages:
-  paru -Syu --noconfirm
-
-clean_orphans:
-  -sudo pacman -Qdtq | sudo pacman -Rns -
-  @echo "\n\n{{ BLUE }}The following files are not owned by any package anymore:{{ NORMAL }}"
-
-# setup sudo:
-# sudo loop
-# show asterisk on password
-
-setup_pacman:
-  # add automatic updates
-  sudo sed -i \
-  -e 's/#\?ParallelDownloads = [0-9]\+/ParallelDownloads = {{ num_cpus() }}/' \
-  -e 's/#\?Color\+/Color/' \
-  -e 's/#\?ILoveCandy\+/ILoveCandy/' \
-  -e 's/#\?VerbosePkgLists\+/VerbosePkgLists/' \
-  /etc/pacman.conf
-
-setup_paru:
-  #!/usr/bin/env bash
-  set -euxo pipefail
-
-  if ! command -v paru &> /dev/null ; then
-    tmp=$(mktemp -d)
-    sudo pacman -S --needed base-devel
-    git clone https://aur.archlinux.org/paru.git "$tmp"
-    cd "$tmp"
-    makepkg -si
-    cd -
-    rm -rf "$tmp"
-  fi
-
-  sudo sed -i \
-  -e 's/#\?BottomUp\+/BottomUp/' \
-  -e 's/#\?SudoLoop\+/SudoLoop/' \
-  -e 's/#\?CombinedUpgrade\+/CombinedUpgrade/' \
-  -e 's/#\?CleanAfter\+/CleanAfter/' \
-  -e 's/#\?NewsOnUpgrade\+/NewsOnUpgrade/' \
-  /etc/paru.conf
--- a/.php-cs-fixer.cache
+++ b/.php-cs-fixer.cache
@ -0,0 +1 @@
+{"php":"8.1.16","version":"3.14.4","indent":"    ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"imports_order":["class","function","const"],"sort_algorithm":"none"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true},"hashes":{"config\/.null-ls_409243_php-cs-fixer-conf.php":"fb71792ed72df5b2976115b4380ef622","config\/.null-ls_800261_php-cs-fixer-conf.php":"1a554594a4eaa31e7bf231c0a93ad00e","config\/.null-ls_450233_php-cs-fixer-conf.php":"1a554594a4eaa31e7bf231c0a93ad00e","config\/.null-ls_536351_php-cs-fixer-conf.php":"5bfcd97c4bfff433fa6da9d289fd7ef9","config\/.null-ls_121074_php-cs-fixer-conf.php":"c116993e570fd1fd0d8e5ff29103a452"}}
--- a/.stylua.toml
+++ b/.stylua.toml
@ -1,12 +0,0 @@
-syntax = "All"
-column_width = 120
-line_endings = "Unix"
-indent_type = "Spaces"
-indent_width = 2
-quote_style = "AutoPreferDouble"
-call_parentheses = "Always"
-collapse_simple_statement = "ConditionalOnly"
-space_after_function_names = "Never"
-
-[sort_requires]
-enabled = true
--- a/.taplo.toml
+++ b/.taplo.toml
@ -1,3 +0,0 @@
-[formatting]
-inline_table_expand = false
-array_auto_expand = false
--- a/Hooks/containers/post_reload_daemons.sh
+++ b/Hooks/containers/post_reload_daemons.sh
@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-systemctl --user daemon-reload
--- a/README.md
+++ b/README.md
@ -6,15 +6,5 @@ Please ensure the that git is installed and you have an ssh key registered,
 then execute the following command:

 ```bash
-curl -SsL https://git.alecodes.page/alecodes/dots/raw/branch/main/bootstrap/bootstrap.sh | bash
-```
-
-Optionally, manually clone the repo to `~/.config/dotfiles/` and then execute:
-
-```bash
-curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-
-cargo binstall --git https://github.com/RaphGL/Tuckr.git
-
-tuckr set \*
+sh -c "$(curl -fsLS get.chezmoi.io)" -- -b $HOME/.local/bin init --apply aleee-idk/dots
 ```
--- a/bin/mb_csv.fish
+++ b/bin/mb_csv.fish
@ -1,28 +0,0 @@
-
-set -l artist_id $argv[1]
-
-set -l total 999
-set -l offset 0
-
-set -l out ""
-
-
-set query '.["release-groups"][] | [(.["artist-credit"] | (map(.name) | join(";") )), .title, .["first-release-date"], .["primary-type"], (.["secondary-types"] | join(";")), "https://musicbrainz.org/release-group/" + .id] | @csv'
-
-while test $offset -lt $total;
-  echo "fetching offset $offset of $total"
-
-  set -l json (curl -SsL -H "Accept: application/json" "http://musicbrainz.org/ws/2/release-group?inc=artist-credits+aliases&release-group-status=website-default&artist=$artist_id&offset=$offset" | tee /tmp/foo.json)
-
-  set total (echo $json | jq -r '.["release-group-count"]')
-  set offset (math $offset + 25)
-
-  set -l csv (echo $json | jq -r $query | string collect -N)
-
-  set out (string collect -N $out $csv)
-end
-
-
-echo $out | wl-copy -n
-
-echo $out
--- a/bootstrap/bootstrap.sh
+++ b/bootstrap/bootstrap.sh
@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-set -eou pipefail
-
-export ANSIBLE_STDOUT_CALLBACK=minimal
-
-if ! command -v uv >/dev/null 2>&1; then
-  echo -e "Installing UV...\n"
-  curl -LsSf https://astral.sh/uv/install.sh | sh
-fi
-
-echo -e "Executing playbook...\n"
-
-if [[ -d ~/.config/dotfiles ]]; then
-  pushd ~/.config/dotfiles/bootstrap/ || exit
-
-  # dotfiles are cloned, executed localy
-  uvx --from ansible ansible-playbook --ask-become-pass bootstrap.yaml
-
-else
-
-  # dotfiles are not cloned, executed remotly
-  uvx --from ansible ansible-pull --ask-become-pass --url ssh://git@git.alecodes.page:24062/alecodes/dots.git bootstrap/bootstrap.yaml
-
-fi
-
-popd || exit
-
-echo -e "Done!\n"
--- a/bootstrap/bootstrap.yaml
+++ b/bootstrap/bootstrap.yaml
@ -1,69 +0,0 @@
- name: Bootstrap system installation
-  hosts: localhost
-  vars_files:
-    - ./variables.yaml
-  tasks:
-    - name: Fedora setup
-      when: ansible_facts['distribution'] == "Fedora"
-      block:
-        - name: Enable copr repos
-          become: true
-          loop: "{{ distros.fedora.copr }}"
-          community.general.copr:
-            state: enabled
-            name: "{{ item }}"
-
-    - name: Install packages
-      become: true
-      ansible.builtin.package:
-        state: present
-        name: "{{ distros.Global.packages }}"
-
-    - name: 'Ensure rustup is setup'
-      ansible.builtin.command: "{{ (ansible_facts['pkg_mgr'] in ['dnf5']) | ternary('rustup-init -y --no-modify-path', 'rustup --no-modify-path -y') }}"
-      args:
-        creates: ~/.cargo/env
-
-    - name: "Installing Cargo Binstall"
-      ansible.builtin.unarchive:
-        remote_src: true
-        src: https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz
-        dest: "{{ ansible_env.HOME }}/.cargo/bin/"
-        keep_newer: true
-        extra_opts:
-          - "--no-anchored"
-          - "cargo-binstall"
-
-
-    - name: 'Install cargo packages'
-      loop: "{{ distros[ansible_facts['distribution']].cargo }}"
-      register: cargo_log
-      notify:
-        - Deploy dots
-        - Install yazi packages
-      ansible.builtin.command:
-        cmd: "cargo binstall --no-confirm --locked {{ item.pkg }}"
-        creates: "{{ ansible_env.HOME }}/.cargo/bin/{{ item.bin }}"
-
-    - name: Generate an OpenSSH keypair
-      community.crypto.openssh_keypair:
-        path: ~/.ssh/id_ed25519
-        type: ed25519
-
-    - name: Clone dotfiles
-      ignore_errors: true
-      notify:
-        - Deploy dots
-        - Install yazi packages
-      ansible.builtin.git:
-        accept_newhostkey: true
-        repo: ssh://git@git.alecodes.page:24062/alecodes/dots.git
-        dest: ~/.config/dotfiles
-        update: true
-        version: main
-
-  handlers:
-    - name: Deploy dots
-      ansible.builtin.command: tuckr add *
-    - name: Install yazi packages
-      ansible.builtin.command: ya pkg install
--- a/bootstrap/pkgs_arch.txt
+++ b/bootstrap/pkgs_arch.txt
@ -1,72 +0,0 @@
-age
-atuin
-brave-bin
-bun-bin
-catppuccin-cursors-macchiato
-catppuccin-gtk-theme-macchiato
-catppuccin-sddm-theme-macchiato
-celluloid
-deno
-dotter-rs-bin
-dunst
-eza
-fish
-flatpak
-fzf
-git
-gitleaks
-gnome-disk-utility
-just
-kitty
-kvantum
-kvantum-theme-catppuccin-git
-lazygit
-limine
-limine-mkinitcpio-hook
-limine-snapper-sync
-lostfiles
-lxappearance
-ly
-nautilus
-nautilus-admin-gtk4
-nautilus-image-converter
-nautilus-open-any-terminal
-neovim
-noto-fonts
-noto-fonts-cjk
-noto-fonts-emoji
-paccache-hook
-plymouth-theme-catppuccin-macchiato-git
-podman
-pre-commit
-pwvucontrol
-qt5-wayland
-qt6-wayland
-rofi
-rofi-rbw
-rofimoji
-rsync
-sops
-swappy
-tailscale
-tealdeer
-trash-cli
-ttf-dejavu
-ttf-fira-code
-ttf-fira-mono
-ttf-fira-sans
-ttf-firacode-nerd
-ttf-jetbrains-mono-nerd
-ttf-ms-win11-auto
-ttf-nerd-fonts-symbols-mono
-ttf-nunito
-ttf-opensans
-ttf-roboto
-ttf-roboto-mono-nerd
-udiskie
-vim
-wget
-yazi
-zed
-zip
-zoxide
--- a/bootstrap/variables.yaml
+++ b/bootstrap/variables.yaml
@ -1,81 +0,0 @@
-distros:
-  Fedora:
-    copr:
-      - atim/lazygit
-      - the4runner/firefox-dev
-    packages: {}
-    cargo:
-      - pkg: yazi-fm
-        bin: yazi
-      - pkg: yazi-cli
-        bin: yazi
-      - pkg: tuckr
-        bin: tuckr
-
-  Arch:
-    packages:
-      - tuckr-git
-    cargo: {}
-
-  Global:
-    packages:
-      - adwaita-cursor-theme
-      - adwaita-icon-theme
-      - adwaita-icon-theme-legacy
-      - adwaita-mono-fonts
-      - adwaita-sans-fonts
-      - bat
-      - breeze-icon-theme
-      - breeze-icon-theme-fedora
-      - curl
-      - duf
-      - eza
-      - fd-find
-      - firefox-dev
-      - fish
-      - flatpak
-      - fzf
-      - git
-      - grim
-      - kitty
-      - lazygit
-      - neovim
-      - nodejs
-      - openssh
-      - openssh-askpass
-      - openssh-clients
-      - openssh-server
-      - openssl
-      - openssl-devel
-      - openssl-libs
-      - php-cli
-      - php-common
-      - php-intl
-      - php-mbstring
-      - php-pecl-zip
-      - php-process
-      - php-soap
-      - php-xml
-      - rhythmbox
-      - ripgrep
-      - rofi-themes
-      - rofi-wayland
-      - rofimoji
-      - rootfiles
-      - rsync
-      - rustup
-      - sd
-      - sed
-      - sushi
-      - swappy
-      - tailscale
-      - tealdeer
-      - trash-cli
-      - tree
-      - tree-sitter-cli
-      - udisks2
-      - unrar
-      - unrar-free
-      - unzip
-      - zip
-      - zoxide
--- a/chezmoi/.chezmoi.toml.tmpl
+++ b/chezmoi/.chezmoi.toml.tmpl
@ -0,0 +1,10 @@
+{{- $osid := .chezmoi.os -}}
+{{- if hasKey .chezmoi.osRelease "id" -}}
+{{-   $osid = printf "%s-%s" .chezmoi.os .chezmoi.osRelease.id -}}
+{{- end -}}
+
+[data]
+    osid = {{ $osid | quote }}
+    hasGui = {{ promptBoolOnce . "hasGui" "Does this machine needs gui configs/apps?" }}
+    hasWOL = {{ promptBoolOnce . "hasWOL" "Does this machine WOL?" }}
+    openAIKey = {{ promptStringOnce . "openAIKey" "Enter Open AI key for chatGPT integration (or leave blank)" | quote }}
--- a/chezmoi/.chezmoidata/packages.yaml
+++ b/chezmoi/.chezmoidata/packages.yaml
@ -0,0 +1,41 @@
+packages:
+  cargo:
+    - du-dust
+    - mise
+    - rbw
+    # - yazi-fm
+    # - yazi-cli
+  dnf:
+    copr:
+      - atim/lazygit
+      - atim/starship
+      - the4runner/firefox-dev
+    packages:
+      - bat
+      - dnf-plugin-system-upgrade
+      - duf
+      - eza
+      - fd-find
+      - firefox-dev
+      - flatpak
+      - fzf
+      - gcc
+      - gcc-c++
+      - git
+      - gitlint
+      - gnome-software
+      - lazygit
+      - neovim
+      - nodejs
+      - openssl
+      - openssl-devel
+      - papirus-icon-theme
+      - remove-retired-packages
+      - ripgrep
+      - sd
+      - starship
+      - tealdeer
+      - tmux
+      - tree-sitter-cli
+      - zoxide
+      - zsh
--- a/chezmoi/.chezmoiexternal.toml
+++ b/chezmoi/.chezmoiexternal.toml
@ -0,0 +1,32 @@
+[".local/share/zinit"]
+    type = "git-repo"
+    url = "https://github.com/zdharma-continuum/zinit.git"
+    refreshPeriod = "168h"
+
+[".config/alacritty/themes/catppuccin/catppuccin-macchiato.toml"]
+    type = "file"
+    url = "https://raw.githubusercontent.com/catppuccin/alacritty/main/catppuccin-macchiato.toml"
+    refreshPeriod = "168h"
+
+[".config/bat/themes/Catppuccin-macchiato.tmTheme"]
+    # Run "bat cache --build" to make the theme available
+    type = "file"
+    url = "https://github.com/catppuccin/bat/raw/main/themes/Catppuccin%20Macchiato.tmTheme"
+    refreshPeriod = "168h"
+
+["Repos/Source/xdg-ninja"]
+    type = "git-repo"
+    url = "https://github.com/b3nj5m1n/xdg-ninja.git"
+    refreshPeriod = "168h"
+
+[".local/bin/sesh"]
+    type = "archive-file"
+    url = "https://github.com/joshmedeski/sesh/releases/latest/download/sesh_Linux_x86_64.tar.gz"
+    path = "sesh"
+    refreshPeriod = "168h"
+
+[".local/bin/zk"]
+    type = "archive-file"
+    url = "https://github.com/zk-org/zk/releases/latest/download/zk-v0.14.1-linux-amd64.tar.gz"
+    path = "zk"
+    refreshPeriod = "168h"
--- a/chezmoi/.chezmoiignore
+++ b/chezmoi/.chezmoiignore
@ -0,0 +1,5 @@
+**/original_*
+.config/lazygit/state.yml
+
+config/tmux/plugins/*
+!config/tmux/plugins/.gitkeep
--- a/chezmoi/.chezmoiscripts/run_once_after_setup_wol.sh.tmpl
+++ b/chezmoi/.chezmoiscripts/run_once_after_setup_wol.sh.tmpl
@ -0,0 +1,23 @@
+{{- if eq .hasWOL true -}}
+#!/usr/bin/env bash
+
+set -e
+
+# run as sudo so it ask for the password here and not inside FZF
+sudo echo -e "\nSetting up wol...\n"
+
+interface="$(
+	nmcli --fields name --terse con show |
+		fzf \
+			--height 10 \
+			--header 'Select network interface' \
+			--preview 'nmcli c show {} | grep 802-3-ethernet.wake-on-lan'
+)"
+
+if [[ -z "$interface" ]]; then
+	echo "no interface selected"
+	exit
+fi
+nmcli c modify "$interface" 802-3-ethernet.wake-on-lan magic
+nmcli c modify "$interface" 802-3-ethernet.auto-negotiate yes
+{{ end }}
--- a/chezmoi/.chezmoiscripts/run_once_setup_gtk_theme.sh.tmpl
+++ b/chezmoi/.chezmoiscripts/run_once_setup_gtk_theme.sh.tmpl
@ -0,0 +1,19 @@
+{{- if eq .hasGui true -}}
+#!/usr/bin/env bash
+
+#  ╭──────────────────────────────────────────────────────────╮
+#  │                Setup Catppuccin GTK theme                │
+#  ╰──────────────────────────────────────────────────────────╯
+
+set -e
+
+tmp_dir="$(mktemp -d)"
+
+cd "$tmp_dir"
+
+curl -LsS "https://raw.githubusercontent.com/catppuccin/gtk/main/install.py" -o install.py
+
+python3 install.py macchiato teal
+
+rm -rf "$tmp_dir"
+{{ end }}
--- a/chezmoi/.chezmoiscripts/run_onchange_bootstrap.tmpl
+++ b/chezmoi/.chezmoiscripts/run_onchange_bootstrap.tmpl
@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+set -e
+
+NO_FORMAT="\033[0m"
+C_DODGERBLUE1="\033[38;5;33m"
+echo -e "${C_DODGERBLUE1}Installing packages...${NO_FORMAT}"
+
+{{- if eq .osid "darwin" }}
+# macOS-specific code
+{{- else if eq .osid "linux-debian" }}
+# Debian-specific code
+{{- else if eq .osid "linux-fedora" }}
+
+  # ╭──────────────────────────────────────────────────────────╮
+  # │                      Add COPR repos                      │
+  # ╰──────────────────────────────────────────────────────────╯
+
+  sudo dnf install -yq 'dnf-command(copr)'
+
+  {{ range .packages.dnf.copr -}}
+    sudo dnf copr enable -y {{ . | quote }} &> /dev/null
+  {{ end -}}
+
+  # ╭──────────────────────────────────────────────────────────╮
+  # │                   Install DNF packages                   │
+  # ╰──────────────────────────────────────────────────────────╯
+
+  sudo dnf install -y {{ range .packages.dnf.packages }} {{ . | quote }} {{- end -}}
+
+{{ end }}
+
+# ╭──────────────────────────────────────────────────────────╮
+# │                       Install Rust                       │
+# ╰──────────────────────────────────────────────────────────╯
+
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable
+
+rustup update
+
+# ╭──────────────────────────────────────────────────────────╮
+# │                  Install Cargo Packages                  │
+# ╰──────────────────────────────────────────────────────────╯
+
+cargo install {{ range .packages.cargo }} {{ . | quote }} {{- end -}}
+
--- a/chezmoi/dot_config/alacritty/alacritty.toml
+++ b/chezmoi/dot_config/alacritty/alacritty.toml
--- a/chezmoi/dot_config/alacritty/alacritty.yml
+++ b/chezmoi/dot_config/alacritty/alacritty.yml
--- a/chezmoi/dot_config/alacritty/themes/.keep
+++ b/chezmoi/dot_config/alacritty/themes/.keep
--- a/chezmoi/dot_config/bat/config
+++ b/chezmoi/dot_config/bat/config
--- a/chezmoi/dot_config/foot/foot.ini
+++ b/chezmoi/dot_config/foot/foot.ini
@ -0,0 +1,197 @@
+# -*- conf -*-
+
+# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
+# term=foot (or xterm-256color if built with -Dterminfo=disabled)
+# login-shell=no
+
+include=~/.config/foot/themes/catppuccin/catppuccin-macchiato.conf
+
+# app-id=foot
+# title=foot
+# locked-title=no
+
+font=JetBrainsMono NF:style=Regular:size=11
+font-bold=JetBrainsMono NF:style=Bold:size=11
+font-italic=JetBrainsMono NF:style=Italic:size=11
+font-bold-italic=JetBrainsMono NF:style=Bold Italic:size=11
+# line-height=<font metrics>
+# letter-spacing=0
+# horizontal-letter-offset=0
+# vertical-letter-offset=0
+# underline-offset=<font metrics>
+# box-drawings-uses-font-glyphs=no
+# dpi-aware=auto
+
+# initial-window-size-pixels=700x500  # Or,
+# initial-window-size-chars=<COLSxROWS>
+# initial-window-mode=windowed
+pad=10x10
+# resize-delay-ms=100
+
+# notify=notify-send -a ${app-id} -i ${app-id} ${title} ${body}
+
+# bold-text-in-bright=no
+# word-delimiters=,│`|:"'()[]{}<>
+# selection-target=primary
+# workers=<number of logical CPUs>
+
+[environment]
+# name=value
+
+[bell]
+# urgent=no
+# notify=no
+# command=
+# command-focused=no
+
+[scrollback]
+# lines=1000
+# multiplier=3.0
+# indicator-position=relative
+# indicator-format=
+
+[url]
+# launch=xdg-open ${url}
+# label-letters=sadfjklewcmpgh
+# osc8-underline=url-mode
+# protocols=http, https, ftp, ftps, file, gemini, gopher
+# uri-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_.,~:;/?#@!$&%*+="'()[]
+
+[cursor]
+# style=block
+# color=<inverse foreground/background>
+# blink=no
+# beam-thickness=1.5
+# underline-thickness=<font underline thickness>
+
+[mouse]
+# hide-when-typing=no
+# alternate-scroll-mode=yes
+
+[colors]
+alpha=0.9
+# foreground=dcdccc
+# background=111111
+
+## Normal/regular colors (color palette 0-7)
+# regular0=222222  # black
+# regular1=cc9393  # red
+# regular2=7f9f7f  # green
+# regular3=d0bf8f  # yellow
+# regular4=6ca0a3  # blue
+# regular5=dc8cc3  # magenta
+# regular6=93e0e3  # cyan
+# regular7=dcdccc  # white
+
+## Bright colors (color palette 8-15)
+# bright0=666666   # bright black
+# bright1=dca3a3   # bright red
+# bright2=bfebbf   # bright green
+# bright3=f0dfaf   # bright yellow
+# bright4=8cd0d3   # bright blue
+# bright5=fcace3   # bright magenta
+# bright6=b3ffff   # bright cyan
+# bright7=ffffff   # bright white
+
+## dimmed colors (see foot.ini(5) man page)
+# dim0=<not set>
+# ...
+# dim7=<not-set>
+
+## The remaining 256-color palette
+# 16 = <256-color palette #16>
+# ...
+# 255 = <256-color palette #255>
+
+## Misc colors
+# selection-foreground=<inverse foreground/background>
+# selection-background=<inverse foreground/background>
+# jump-labels=<regular0> <regular3>          # black-on-yellow
+# scrollback-indicator=<regular0> <bright4>  # black-on-bright-blue
+# search-box-no-match=<regular0> <regular1>  # black-on-red
+# search-box-match=<regular0> <regular3>     # black-on-yellow
+# urls=<regular3>
+
+[csd]
+preferred=none
+# size=26
+# font=<primary font>
+# color=<foreground color>
+# hide-when-typing=no
+# border-width=0
+# border-color=<csd.color>
+# button-width=26
+# button-color=<background color>
+# button-minimize-color=<regular4>
+# button-maximize-color=<regular2>
+# button-close-color=<regular1>
+
+[key-bindings]
+# scrollback-up-page=Shift+Page_Up
+# scrollback-up-half-page=none
+# scrollback-up-line=none
+# scrollback-down-page=Shift+Page_Down
+# scrollback-down-half-page=none
+# scrollback-down-line=none
+# clipboard-copy=Control+Shift+c XF86Copy
+# clipboard-paste=Control+Shift+v XF86Paste
+# primary-paste=Shift+Insert
+# search-start=Control+Shift+r
+# font-increase=Control+plus Control+equal Control+KP_Add
+# font-decrease=Control+minus Control+KP_Subtract
+# font-reset=Control+0 Control+KP_0
+# spawn-terminal=Control+Shift+n
+# minimize=none
+# maximize=none
+# fullscreen=none
+# pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none
+# pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
+# pipe-selected=[xargs -r firefox] none
+# show-urls-launch=Control+Shift+u
+# show-urls-copy=none
+# show-urls-persistent=none
+# prompt-prev=Control+Shift+z
+# prompt-next=Control+Shift+x
+# unicode-input=none
+# noop=none
+
+[search-bindings]
+# cancel=Control+g Control+c Escape
+# commit=Return
+# find-prev=Control+r
+# find-next=Control+s
+# cursor-left=Left Control+b
+# cursor-left-word=Control+Left Mod1+b
+# cursor-right=Right Control+f
+# cursor-right-word=Control+Right Mod1+f
+# cursor-home=Home Control+a
+# cursor-end=End Control+e
+# delete-prev=BackSpace
+# delete-prev-word=Mod1+BackSpace Control+BackSpace
+# delete-next=Delete
+# delete-next-word=Mod1+d Control+Delete
+# extend-to-word-boundary=Control+w
+# extend-to-next-whitespace=Control+Shift+w
+# clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste
+# primary-paste=Shift+Insert
+# unicode-input=none
+
+[url-bindings]
+# cancel=Control+g Control+c Control+d Escape
+# toggle-url-visible=t
+
+[text-bindings]
+# \x03=Mod4+c  # Map Super+c -> Ctrl+c
+
+[mouse-bindings]
+# selection-override-modifiers=Shift
+# primary-paste=BTN_MIDDLE
+# select-begin=BTN_LEFT
+# select-begin-block=Control+BTN_LEFT
+# select-extend=BTN_RIGHT
+# select-extend-character-wise=Control+BTN_RIGHT
+# select-word=BTN_LEFT-2
+# select-word-whitespace=Control+BTN_LEFT-2
+# select-row=BTN_LEFT-3
+
+# vim: ft=dosini
--- a/chezmoi/dot_config/foot/themes/catppuccin/LICENSE
+++ b/chezmoi/dot_config/foot/themes/catppuccin/LICENSE
@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Catppuccin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/chezmoi/dot_config/foot/themes/catppuccin/README.md
+++ b/chezmoi/dot_config/foot/themes/catppuccin/README.md
@ -0,0 +1,32 @@
+<h3 align="center">
+  <img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/logos/exports/1544x1544_circle.png" width="100" alt="Logo"/><br/>
+  <img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
+  Catppuccin for <a href="https://codeberg.org/dnkl/foot">Foot</a>
+  <img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
+</h3>
+
+<p align="center">
+  <a href="https://github.com/catppuccin/foot/stargazers"><img src="https://img.shields.io/github/stars/catppuccin/foot?colorA=363a4f&colorB=b7bdf8&style=for-the-badge"></a>
+  <a href="https://github.com/catppuccin/foot/issues"><img src="https://img.shields.io/github/issues/catppuccin/foot?colorA=363a4f&colorB=f5a97f&style=for-the-badge"></a>
+  <a href="https://github.com/catppuccin/foot/contributors"><img src="https://img.shields.io/github/contributors/catppuccin/foot?colorA=363a4f&colorB=a6da95&style=for-the-badge"></a>
+</p>
+
+<p align="center">
+  <img src="https://raw.githubusercontent.com/catppuccin/foot-catppuccin/main/assets/foot.png"/>
+</p>
+
+## Usage
+
+1. Copy the contents of `catppuccin.conf` colorscheme you want into your Foot config file (usually stored at `~/.config/foot/foot.ini`)
+
+## 💝 Thanks to
+
+- [Pocco81](https://github.com/Pocco81)
+- [crdpa](https://github.com/crdpa)
+- [Thibault Andreis](https://github.com/ThibaultAndreis)
+
+&nbsp;
+
+<p align="center"><img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/footers/gray0_ctp_on_line.svg?sanitize=true" /></p>
+<p align="center">Copyright &copy; 2021-present <a href="https://github.com/catppuccin" target="_blank">Catppuccin Org</a>
+<p align="center"><a href="https://github.com/catppuccin/catppuccin/blob/main/LICENSE"><img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&logoColor=d9e0ee&colorA=363a4f&colorB=b7bdf8"/></a></p>
--- a/chezmoi/dot_config/foot/themes/catppuccin/assets/empty_dot_gitkeep
+++ b/chezmoi/dot_config/foot/themes/catppuccin/assets/empty_dot_gitkeep
--- a/chezmoi/dot_config/foot/themes/catppuccin/assets/foot.png
+++ b/chezmoi/dot_config/foot/themes/catppuccin/assets/foot.png
--- a/chezmoi/dot_config/foot/themes/catppuccin/catppuccin-frappe.conf
+++ b/chezmoi/dot_config/foot/themes/catppuccin/catppuccin-frappe.conf
@ -0,0 +1,19 @@
+[colors]
+foreground=c6d0f5 # Text
+background=303446 # Base
+regular0=51576d   # Surface 1
+regular1=e78284   # red
+regular2=a6d189   # green
+regular3=e5c890   # yellow
+regular4=8caaee   # blue
+regular5=f4b8e4   # pink
+regular6=81c8be   # teal
+regular7=b5bfe2   # Subtext 1
+bright0=626880    # Surface 2
+bright1=e78284    # red
+bright2=a6d189    # green
+bright3=e5c890    # yellow
+bright4=8caaee    # blue
+bright5=f4b8e4    # pink
+bright6=81c8be    # teal
+bright7=a5adce    # Subtext 0
--- a/chezmoi/dot_config/foot/themes/catppuccin/catppuccin-latte.conf
+++ b/chezmoi/dot_config/foot/themes/catppuccin/catppuccin-latte.conf
@ -0,0 +1,19 @@
+[colors]
+foreground=4c4f69 # Text
+background=eff1f5 # Base
+regular0=5c5f77   # Subtext 1
+regular1=d20f39   # red
+regular2=40a02b   # green
+regular3=df8e1d   # yellow
+regular4=1e66f5   # blue
+regular5=ea76cb   # pink
+regular6=179299   # teal
+regular7=acb0be   # Surface 2
+bright0=6c6f85    # Subtext 0
+bright1=d20f39    # red
+bright2=40a02b    # green
+bright3=df8e1d    # yellow
+bright4=1e66f5    # blue
+bright5=ea76cb    # pink
+bright6=179299    # teal
+bright7=bcc0cc    # Surface 1
--- a/chezmoi/dot_config/foot/themes/catppuccin/catppuccin-macchiato.conf
+++ b/chezmoi/dot_config/foot/themes/catppuccin/catppuccin-macchiato.conf
@ -0,0 +1,19 @@
+[colors]
+foreground=cad3f5 # Text
+background=24273a # Base
+regular0=494d64   # Surface 1
+regular1=ed8796   # red
+regular2=a6da95   # green
+regular3=eed49f   # yellow
+regular4=8aadf4   # blue
+regular5=f5bde6   # pink
+regular6=8bd5ca   # teal
+regular7=b8c0e0   # Subtext 1
+bright0=5b6078    # Surface 2
+bright1=ed8796    # red
+bright2=a6da95    # green
+bright3=eed49f    # yellow
+bright4=8aadf4    # blue
+bright5=f5bde6    # pink
+bright6=8bd5ca    # teal
+bright7=a5adcb    # Subtext 0
--- a/chezmoi/dot_config/foot/themes/catppuccin/catppuccin-mocha.conf
+++ b/chezmoi/dot_config/foot/themes/catppuccin/catppuccin-mocha.conf
@ -0,0 +1,19 @@
+[colors]
+foreground=cdd6f4 # Text
+background=1e1e2e # Base
+regular0=45475a   # Surface 1
+regular1=f38ba8   # red
+regular2=a6e3a1   # green
+regular3=f9e2af   # yellow
+regular4=89b4fa   # blue
+regular5=f5c2e7   # pink
+regular6=94e2d5   # teal
+regular7=bac2de   # Subtext 1
+bright0=585b70    # Surface 2
+bright1=f38ba8    # red
+bright2=a6e3a1    # green
+bright3=f9e2af    # yellow
+bright4=89b4fa    # blue
+bright5=f5c2e7    # pink
+bright6=94e2d5    # teal
+bright7=a6adc8    # Subtext 0
--- a/chezmoi/dot_config/foot/themes/catppuccin/dot_editorconfig
+++ b/chezmoi/dot_config/foot/themes/catppuccin/dot_editorconfig
@ -0,0 +1,34 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# EditorConfig is awesome: https://EditorConfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_size = 2
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# go
+[*.go]
+indent_style = tab
+indent_size = 4
+
+# python
+[*.{ini,py,py.tpl,rst}]
+indent_size = 4
+
+# rust
+[*.rs]
+indent_size = 4
+
+# documentation, utils
+[*.{md,mdx,diff}]
+trim_trailing_whitespace = false
+
+# windows shell scripts
+[*.{cmd,bat,ps1}]
+end_of_line = crlf
--- a/chezmoi/dot_config/foot/themes/catppuccin/dot_git
+++ b/chezmoi/dot_config/foot/themes/catppuccin/dot_git
@ -0,0 +1 @@
+gitdir: ../../../../.git/modules/config/foot/themes/catppuccin
--- a/chezmoi/dot_config/fzf/forgitrc
+++ b/chezmoi/dot_config/fzf/forgitrc
--- a/chezmoi/dot_config/fzf/fzfrc
+++ b/chezmoi/dot_config/fzf/fzfrc
--- a/chezmoi/dot_config/fzf/widgets/alias_widget.zsh
+++ b/chezmoi/dot_config/fzf/widgets/alias_widget.zsh
--- a/chezmoi/dot_config/fzf/widgets/atuin-history_widget.zsh
+++ b/chezmoi/dot_config/fzf/widgets/atuin-history_widget.zsh
--- a/chezmoi/dot_config/fzf/widgets/cd-recent-dir_widget.zsh
+++ b/chezmoi/dot_config/fzf/widgets/cd-recent-dir_widget.zsh
--- a/chezmoi/dot_config/fzf/widgets/cd_widget.zsh
+++ b/chezmoi/dot_config/fzf/widgets/cd_widget.zsh
--- a/chezmoi/dot_config/fzf/widgets/dictionary_widget.zsh
+++ b/chezmoi/dot_config/fzf/widgets/dictionary_widget.zsh
--- a/chezmoi/dot_config/fzf/widgets/fzf-rg-launcher.zsh
+++ b/chezmoi/dot_config/fzf/widgets/fzf-rg-launcher.zsh
--- a/chezmoi/dot_config/fzf/widgets/locate_widget.zsh
+++ b/chezmoi/dot_config/fzf/widgets/locate_widget.zsh
--- a/chezmoi/dot_config/fzf/widgets/man_widget.zsh
+++ b/chezmoi/dot_config/fzf/widgets/man_widget.zsh
--- a/chezmoi/dot_config/git/config
+++ b/chezmoi/dot_config/git/config
@ -8,9 +8,3 @@

 [includeIf "gitdir:~/Repos/Work/"]
  path = ~/.config/git/config-work
-[merge]
-	autoStash = true
-	edit = no
-	ff = no
-[rebase]
-	autoStash = true
--- a/chezmoi/dot_config/git/ignore
+++ b/chezmoi/dot_config/git/ignore
@ -4,6 +4,3 @@
 # PHP Stuff
 vendor
 .php-cs-fixer.cache
-
-# Neovim
-Session.vim
--- a/chezmoi/dot_config/hypr/executable_gdm-wrapper.sh
+++ b/chezmoi/dot_config/hypr/executable_gdm-wrapper.sh
--- a/chezmoi/dot_config/hypr/hyprland.conf
+++ b/chezmoi/dot_config/hypr/hyprland.conf
@ -0,0 +1,158 @@
+#
+# Please note not all available settings / options are set here.
+# For a full list, see the wiki
+#
+
+# See https://wiki.hyprland.org/Configuring/Monitors/
+monitor=,highrr,auto,1
+
+# Execute your favorite apps at launch
+exec-once = waybar & hyprpaper
+
+# Source a file (multi-file configs)
+# source = ~/.config/hypr/myColors.conf
+
+# Some default env vars.
+env = XCURSOR_SIZE,24
+
+# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
+input {
+    kb_layout = latam
+    kb_variant =
+    kb_model =
+    kb_options = caps:escape
+    kb_rules =
+
+    follow_mouse = 1
+
+    touchpad {
+        natural_scroll = true
+    }
+
+    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+}
+
+general {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
+    gaps_in = 5
+    gaps_out = 10
+    border_size = 2
+    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+    col.inactive_border = rgba(595959aa)
+
+    layout = dwindle
+}
+
+decoration {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    rounding = 10
+    drop_shadow = true
+    shadow_range = 4
+    shadow_render_power = 3
+    col.shadow = rgba(1a1a1aee)
+
+    blur {
+        enabled = true
+        size = 3
+        passes = 1
+        new_optimizations = true
+    }
+}
+
+animations {
+    enabled = true
+
+    # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+
+    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+
+    animation = windows, 1, 7, myBezier
+    animation = windowsOut, 1, 7, default, popin 80%
+    animation = border, 1, 10, default
+    animation = borderangle, 1, 8, default
+    animation = fade, 1, 7, default
+    animation = workspaces, 1, 6, default
+}
+
+dwindle {
+    # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+    pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    preserve_split = true # you probably want this
+}
+
+master {
+    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+    new_is_master = true
+}
+
+gestures {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    workspace_swipe = true
+    workspace_swipe_invert = false
+}
+
+# Example per-device config
+# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
+device:epic-mouse-v1 {
+    sensitivity = -0.5
+}
+
+# Example windowrule v1
+# windowrule = float, ^(kitty)$
+# Example windowrule v2
+# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+
+
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more
+$mainMod = SUPER
+
+# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+bind = $mainMod, Q, exec, alacritty
+bind = $mainMod, C, killactive,
+bind = $mainMod, M, exit,
+bind = $mainMod, E, exec, dolphin
+bind = $mainMod, V, togglefloating,
+bind = $mainMod, D, exec, wofi --show drun
+bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, J, togglesplit, # dwindle
+
+# Move focus with mainMod + arrow keys
+bind = $mainMod, h, movefocus, l
+bind = $mainMod, j, movefocus, d
+bind = $mainMod, k, movefocus, u
+bind = $mainMod, l, movefocus, r
+
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+# Scroll through existing workspaces with mainMod + scroll
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+
--- a/chezmoi/dot_config/hypr/hyprpaper.conf
+++ b/chezmoi/dot_config/hypr/hyprpaper.conf
--- a/chezmoi/dot_config/kitty/current-theme.conf
+++ b/chezmoi/dot_config/kitty/current-theme.conf
--- a/chezmoi/dot_config/kitty/kitty.conf
+++ b/chezmoi/dot_config/kitty/kitty.conf
--- a/chezmoi/dot_config/kitty/private_kitty.conf.bak
+++ b/chezmoi/dot_config/kitty/private_kitty.conf.bak
--- a/chezmoi/dot_config/lazygit/config.yml
+++ b/chezmoi/dot_config/lazygit/config.yml
@ -1,51 +1,70 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/jesseduffield/lazygit/master/schema/config.json
+
 # Config relating to the Lazygit UI
 gui:
  # The number of lines you scroll by when scrolling the main window
  scrollHeight: 2
+
  # If true, allow scrolling past the bottom of the content in the main window
  scrollPastBottom: true
+
  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#scroll-off-margin
  scrollOffMargin: 2
+
  # One of: 'margin' (default) | 'jump'
  scrollOffBehavior: margin
+
  # If true, capture mouse events.
  # When mouse events are captured, it's a little harder to select text: e.g. requiring you to hold the option key when on macOS.
  mouseEvents: true
+
  # If true, do not show a warning when discarding changes in the staging view.
  skipDiscardChangeWarning: false
+
  # If true, do not show warning when applying/popping the stash
  skipStashWarning: false
+
  # If true, do not show a warning when attempting to commit without any staged files; instead stage all unstaged files.
  skipNoStagedFilesWarning: false
+
  # If true, do not show a warning when rewording a commit via an external editor
  skipRewordInEditorWarning: false
+
  # Fraction of the total screen width to use for the left side section. You may want to pick a small number (e.g. 0.2) if you're using a narrow screen, so that you can see more of the main section.
  # Number from 0 to 1.0.
  sidePanelWidth: 0.3333
+
  # If true, increase the height of the focused side window; creating an accordion effect.
  expandFocusedSidePanel: false
+
  # The weight of the expanded side panel, relative to the other panels. 2 means
  # twice as tall as the other panels. Only relevant if `expandFocusedSidePanel` is true.
  expandedSidePanelWeight: 2
+
  # Sometimes the main window is split in two (e.g. when the selected file has both staged and unstaged changes). This setting controls how the two sections are split.
  # Options are:
  # - 'horizontal': split the window horizontally
  # - 'vertical': split the window vertically
  # - 'flexible': (default) split the window horizontally if the window is wide enough, otherwise split vertically
  mainPanelSplitMode: flexible
+
  # How the window is split when in half screen mode (i.e. after hitting '+' once).
  # Possible values:
  # - 'left': split the window horizontally (side panel on the left, main view on the right)
  # - 'top': split the window vertically (side panel on top, main view below)
  enlargedSideViewLocation: left
+
  # One of 'auto' (default) | 'en' | 'zh-CN' | 'zh-TW' | 'pl' | 'nl' | 'ja' | 'ko' | 'ru'
  language: auto
+
  # Format used when displaying time e.g. commit time.
  # Uses Go's time format syntax: https://pkg.go.dev/time#Time.Format
  timeFormat: 02 Jan 06
+
  # Format used when displaying time if the time is less than 24 hours ago.
  # Uses Go's time format syntax: https://pkg.go.dev/time#Time.Format
  shortTimeFormat: 3:04PM
+
  # Config relating to colors and styles.
  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#color-attributes
  theme:
@ -68,73 +87,100 @@ gui:
      - '#cad3f5'
    searchingActiveBorderColor:
      - '#eed49f'
+
    # Background color of selected line when view doesn't have focus.
    inactiveViewSelectedLineBgColor:
      - bold
+
    # Foreground color of marked base commit (for rebase)
    markedBaseCommitFgColor:
      - blue
+
    # Background color of marked base commit (for rebase)
    markedBaseCommitBgColor:
      - yellow
+
  authorColors:
    '*': '#b7bdf8'
+
  # Config relating to the commit length indicator
  commitLength:
    # If true, show an indicator of commit message length
    show: true
+
  # If true, show the '5 of 20' footer at the bottom of list views
  showListFooter: true
+
  # If true, display the files in the file views as a tree. If false, display the files as a flat list.
  # This can be toggled from within Lazygit with the '~' key, but that will not change the default.
  showFileTree: true
+
  # If true, show a random tip in the command log when Lazygit starts
  showRandomTip: true
+
  # If true, show the command log
  showCommandLog: true
+
  # If true, show the bottom line that contains keybinding info and useful buttons. If false, this line will be hidden except to display a loader for an in-progress action.
  showBottomLine: true
+
  # If true, show jump-to-window keybindings in window titles.
  showPanelJumps: true
+
  # Deprecated: use nerdFontsVersion instead
  showIcons: false
+
  # Nerd fonts version to use.
  # One of: '2' | '3' | empty string (default)
  # If empty, do not show icons.
  nerdFontsVersion: "3"
+
  # If true (default), file icons are shown in the file views. Only relevant if NerdFontsVersion is not empty.
  showFileIcons: true
+
  # Length of author name in (non-expanded) commits view. 2 means show initials only.
  commitAuthorShortLength: 2
+
  # Length of author name in expanded commits view. 2 means show initials only.
  commitAuthorLongLength: 17
+
  # Length of commit hash in commits view. 0 shows '*' if NF icons aren't on.
  commitHashLength: 8
+
  # If true, show commit hashes alongside branch names in the branches view.
  showBranchCommitHash: false
+
  # Whether to show the divergence from the base branch in the branches view.
  # One of: 'none' | 'onlyArrow'  | 'arrowAndNumber'
  showDivergenceFromBaseBranch: none
+
  # Height of the command log view
  commandLogSize: 8
+
  # Whether to split the main window when viewing file changes.
  # One of: 'auto' | 'always'
  # If 'auto', only split the main window when a file has both staged and unstaged changes
  splitDiff: auto
+
  # Default size for focused window. Window size can be changed from within Lazygit with '+' and '_' (but this won't change the default).
  # One of: 'normal' (default) | 'half' | 'full'
-  screenMode: normal
+  windowSize: normal
+
  # Window border style.
  # One of 'rounded' (default) | 'single' | 'double' | 'hidden'
  border: rounded
+
  # If true, show a seriously epic explosion animation when nuking the working tree.
  animateExplosion: true
+
  # Whether to stack UI components on top of each other.
  # One of 'auto' (default) | 'always' | 'never'
  portraitMode: auto
+
  # How things are filtered when typing '/'.
  # One of 'substring' (default) | 'fuzzy'
  filterMode: fuzzy
+
  # Config relating to the spinner.
  spinner:
    # The frames of the spinner animation.
@ -143,83 +189,113 @@ gui:
      - /
      - '-'
      - \
+
    # The "speed" of the spinner in milliseconds.
    rate: 50
+
  # Status panel view.
  # One of 'dashboard' (default) | 'allBranchesLog'
  statusPanelView: dashboard
+
  # If true, jump to the Files panel after popping a stash
  switchToFilesAfterStashPop: true
+
  # If true, jump to the Files panel after applying a stash
  switchToFilesAfterStashApply: true
+
 # Config relating to git
 git:
  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Custom_Pagers.md
-  pagers:
-    - # Value of the --color arg in the git diff command. Some pagers want this to be set to 'always' and some want it set to 'never'
-      colorArg: always
-      # e.g.
-      # diff-so-fancy
-      # delta --dark --paging=never
-      # ydiff -p cat -s --wrap --width={{columnWidth}}
-      pager: ""
-      # If true, Lazygit will use whatever pager is specified in `$GIT_PAGER`, `$PAGER`, or your *git config*. If the pager ends with something like ` | less` we will strip that part out, because less doesn't play nice with our rendering approach. If the custom pager uses less under the hood, that will also break rendering (hence the `--paging=never` flag for the `delta` pager).
-      useConfig: true
-      # e.g. 'difft --color=always'
-      externalDiffCommand: ""
+  paging:
+    # Value of the --color arg in the git diff command. Some pagers want this to be set to 'always' and some want it set to 'never'
+    colorArg: always
+
+    # e.g.
+    # diff-so-fancy
+    # delta --dark --paging=never
+    # ydiff -p cat -s --wrap --width={{columnWidth}}
+    pager: ""
+
+    # If true, Lazygit will use whatever pager is specified in `$GIT_PAGER`, `$PAGER`, or your *git config*. If the pager ends with something like ` | less` we will strip that part out, because less doesn't play nice with our rendering approach. If the custom pager uses less under the hood, that will also break rendering (hence the `--paging=never` flag for the `delta` pager).
+    useConfig: true
+
+    # e.g. 'difft --color=always'
+    externalDiffCommand: ""
+
  # Config relating to committing
  commit:
    # If true, pass '--signoff' flag when committing
    signOff: false
+
    # Automatic WYSIWYG wrapping of the commit message as you type
    autoWrapCommitMessage: true
+
    # If autoWrapCommitMessage is true, the width to wrap to
    autoWrapWidth: 72
+
  # Config relating to merging
  merging:
    # If true, run merges in a subprocess so that if a commit message is required, Lazygit will not hang
    # Only applicable to unix users.
    manualCommit: false
+
    # Extra args passed to `git merge`, e.g. --no-ff
    args: ""
+
    # The commit message to use for a squash merge commit. Can contain "{{selectedRef}}" and "{{currentBranch}}" placeholders.
    squashMergeMessage: Squash merge {{selectedRef}} into {{currentBranch}}
+
  # list of branches that are considered 'main' branches, used when displaying commits
  mainBranches:
    - master
    - main
+
  # Prefix to use when skipping hooks. E.g. if set to 'WIP', then pre-commit hooks will be skipped when the commit message starts with 'WIP'
  skipHookPrefix: WIP
+
  # If true, periodically fetch from remote
  autoFetch: true
+
  # If true, periodically refresh files and submodules
  autoRefresh: true
+
  # If true, pass the --all arg to git fetch
  fetchAll: true
+
  # If true, lazygit will automatically stage files that used to have merge
  # conflicts but no longer do; and it will also ask you if you want to
  # continue a merge or rebase if you've resolved all conflicts. If false, it
  # won't do either of these things.
  autoStageResolvedConflicts: true
+
  # Command used when displaying the current branch git log in the main window
  branchLogCmd: git log --graph --color=always --abbrev-commit --decorate --date=relative --pretty=medium {{branchName}} --
+
+  # Command used to display git log of all branches in the main window.
+  # Deprecated: User `allBranchesLogCmds` instead.
+  allBranchesLogCmd: git log --graph --all --color=always --abbrev-commit --decorate --date=relative  --pretty=medium
+
  # If true, do not spawn a separate process when using GPG
  overrideGpg: false
+
  # If true, do not allow force pushes
  disableForcePushing: false
-  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#predefined-commit-message-prefix
-  # commitPrefix:
-  # pattern to match on. E.g. for 'feature/AB-123' to match on the AB-123 use "^\\w+\\/(\\w+-\\w+).*"
-  # pattern: ""

-  # Replace directive. E.g. for 'feature/AB-123' to start the commit message with 'AB-123 ' use "[$1] "
-  # replace: ""
+  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#predefined-commit-message-prefix
+  commitPrefix:
+    # pattern to match on. E.g. for 'feature/AB-123' to match on the AB-123 use "^\\w+\\/(\\w+-\\w+).*"
+    pattern: ""
+
+    # Replace directive. E.g. for 'feature/AB-123' to start the commit message with 'AB-123 ' use "[$1] "
+    replace: ""

  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#predefined-branch-name-prefix
  branchPrefix: ""
+
  # If true, parse emoji strings in commit messages e.g. render :rocket: as 🚀
  # (This should really be under 'gui', not 'git')
  parseEmoji: true
+
  # Config for showing the log in the commits view
  log:
    # One of: 'date-order' | 'author-date-order' | 'topo-order' | 'default'
@ -228,86 +304,110 @@ git:
    #
    # Deprecated: Configure this with `Log menu -> Commit sort order` (<c-l> in the commits window by default).
    order: topo-order
+
    # This determines whether the git graph is rendered in the commits panel
    # One of 'always' | 'never' | 'when-maximised'
    #
    # Deprecated: Configure this with `Log menu -> Show git graph` (<c-l> in the commits window by default).
    showGraph: always
+
    # displays the whole git graph by default in the commits view (equivalent to passing the `--all` argument to `git log`)
    showWholeGraph: false
+
  # When copying commit hashes to the clipboard, truncate them to this
  # length. Set to 40 to disable truncation.
  truncateCopiedCommitHashesTo: 12
-  allBranchesLogCmds:
-    - git log --graph --all --color=always --abbrev-commit --decorate --date=relative  --pretty=medium
+
 # Periodic update checks
 update:
  # One of: 'prompt' (default) | 'background' | 'never'
  method: prompt
+
  # Period in days between update checks
  days: 14
+
 # Background refreshes
 refresher:
  # File/submodule refresh interval in seconds.
  # Auto-refresh can be disabled via option 'git.autoRefresh'.
  refreshInterval: 10
+
  # Re-fetch interval in seconds.
  # Auto-fetch can be disabled via option 'git.autoFetch'.
  fetchInterval: 60
+
 # If true, show a confirmation popup before quitting Lazygit
 confirmOnQuit: false
+
 # If true, exit Lazygit when the user presses escape in a context where there is nothing to cancel/close
 quitOnTopLevelReturn: true
+
 # Config relating to things outside of Lazygit like how files are opened, copying to clipboard, etc
 os:
  # Command for editing a file. Should contain "{{filename}}".
-  edit: "nvim -- {{filename}} && kitten @ close-window -m var:lazy_float=true --ignore-no-match"
+  edit: ""
+
  # Command for editing a file at a given line number. Should contain
  # "{{filename}}", and may optionally contain "{{line}}".
-  editAtLine: "nvim +{{line}} -- {{filename}} && kitten @ close-window -m var:lazy_float=true --ignore-no-match"
+  editAtLine: ""
+
  # Same as EditAtLine, except that the command needs to wait until the
  # window is closed.
  editAtLineAndWait: ""
+
  # For opening a directory in an editor
  openDirInEditor: ""
+
  # A built-in preset that sets all of the above settings. Supported presets
  # are defined in the getPreset function in editor_presets.go.
-  editPreset: "nvim"
+  editPreset: "nvim-remote"
+
  # Command for opening a file, as if the file is double-clicked. Should
  # contain "{{filename}}", but doesn't support "{{line}}".
  open: "xdg-open {{filename}} >/dev/null"
+
  # Command for opening a link. Should contain "{{link}}".
  openLink: ""
+
  # EditCommand is the command for editing a file.
  # Deprecated: use Edit instead. Note that semantics are different:
  # EditCommand is just the command itself, whereas Edit contains a
  # "{{filename}}" variable.
  editCommand: ""
+
  # EditCommandTemplate is the command template for editing a file
  # Deprecated: use EditAtLine instead.
  editCommandTemplate: ""
+
  # OpenCommand is the command for opening a file
  # Deprecated: use Open instead.
  openCommand: ""
+
  # OpenLinkCommand is the command for opening a link
  # Deprecated: use OpenLink instead.
  openLinkCommand: ""
+
  # CopyToClipboardCmd is the command for copying to clipboard.
  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard
  copyToClipboardCmd: ""
+
  # ReadFromClipboardCmd is the command for reading the clipboard.
  # See https://github.com/jesseduffield/lazygit/blob/master/docs/Config.md#custom-command-for-copying-to-and-pasting-from-clipboard
  readFromClipboardCmd: ""
+
 # If true, don't display introductory popups upon opening Lazygit.
 disableStartupPopups: false
+
 # What to do when opening Lazygit outside of a git repo.
 # - 'prompt': (default) ask whether to initialize a new repo or open in the most recent repo
 # - 'create': initialize a new repo
 # - 'skip': open most recent repo
 # - 'quit': exit Lazygit
 notARepository: quit
+
 # If true, display a confirmation when subprocess terminates. This allows you to view the output of the subprocess before returning to Lazygit.
-promptToReturnFromSubprocess: false
+promptToReturnFromSubprocess: true
+
 # Keybindings
 keybinding:
  universal:
@ -362,8 +462,10 @@ keybinding:
    scrollDownMain-alt2: <c-d>
    executeShellCommand: ':'
    createRebaseOptionsMenu: m
+
    # 'Files' appended for legacy reasons
    pushFiles: P
+
    # 'Files' appended for legacy reasons
    pullFiles: p
    refresh: R
@ -406,7 +508,7 @@ keybinding:
    viewResetOptions: D
    fetch: f
    toggleTreeView: '`'
-    openMergeOptions: M
+    openMergeTool: M
    openStatusFilter: <c-b>
    copyFileInfoToClipboard: "y"
  branches:
@ -471,24 +573,3 @@ keybinding:
    bulkMenu: b
  commitMessage:
    commitMenu: <c-o>
-customCommands:
-  - key: "C"
-    command: 'cog commit "{{ .Form.Type }} {{ .Form.Description }}" {{if .Form.Scopes}}({{ .Form.Scopes }}){{end}}'
-    description: "Commit with cocogitto"
-    context: "files"
-    prompts:
-      - type: "menuFromCommand"
-        title: "Select the commit type"
-        key: "Type"
-        command: >
-          bash -c "cog commit --help | sed -n 's/.*\\[possible values: \\(.*\\)\\].*/\\1/p' | tr ', ' '\\n' | sed '/^$/d' | sort"
-
-      - type: "input"
-        title: "Enter the scope(s) of this change"
-        key: "Scopes"
-      - type: "input"
-        title: "Enter a short description of the change"
-        key: "Description"
-      - type: "confirm"
-        title: "Is the commit message correct?"
-        body: "{{ .Form.Type }}{{if .Form.Scopes}}({{ .Form.Scopes }}){{end}}: {{ .Form.Description }}"
--- a/chezmoi/dot_config/mako/config
+++ b/chezmoi/dot_config/mako/config
@ -1,5 +1,4 @@
 default-timeout=5000
-anchor=top-center

 # Colors

--- a/chezmoi/dot_config/mise/config.toml
+++ b/chezmoi/dot_config/mise/config.toml
@ -0,0 +1,11 @@
+[tools]
+node = 'lts'
+# python = {version='3', virtualenv='.venv'}
+python = {version='3'} # setting virtualenv adds a virtualenv in every directory
+php = "8.2"
+go = "latest"
+
+[settings]
+[alias.node]
+my_custom_node = '20'  # makes `rtx install node@my_custom_node` install node-20.x
+                       # this can also be specified in a plugin (see below in "Aliases")
--- a/chezmoi/dot_config/mpv/encoding.rst
+++ b/chezmoi/dot_config/mpv/encoding.rst
--- a/chezmoi/dot_config/mpv/input.conf
+++ b/chezmoi/dot_config/mpv/input.conf
--- a/chezmoi/dot_config/mpv/mplayer-input.conf
+++ b/chezmoi/dot_config/mpv/mplayer-input.conf
--- a/chezmoi/dot_config/mpv/mpv.conf
+++ b/chezmoi/dot_config/mpv/mpv.conf
--- a/chezmoi/dot_config/mpv/restore-old-bindings.conf
+++ b/chezmoi/dot_config/mpv/restore-old-bindings.conf
--- a/chezmoi/dot_config/mpv/script-opts/mpv_thumbnail_script.conf
+++ b/chezmoi/dot_config/mpv/script-opts/mpv_thumbnail_script.conf
--- a/chezmoi/dot_config/mpv/scripts/mpv-i3-floating-centered.lua
+++ b/chezmoi/dot_config/mpv/scripts/mpv-i3-floating-centered.lua
--- a/chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_client_osc.lua
+++ b/chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_client_osc.lua
--- a/chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_server-1.lua
+++ b/chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_server-1.lua
--- a/chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_server-2.lua
+++ b/chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_server-2.lua
--- a/chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_server.lua
+++ b/chezmoi/dot_config/mpv/scripts/mpv_thumbnail_script_server.lua
--- a/chezmoi/dot_config/mpv/scripts/pause-indicator.lua
+++ b/chezmoi/dot_config/mpv/scripts/pause-indicator.lua
--- a/chezmoi/dot_config/mpv/tech-overview.txt
+++ b/chezmoi/dot_config/mpv/tech-overview.txt
--- a/chezmoi/dot_config/nvim/after/queries/blade/highlights.scm
+++ b/chezmoi/dot_config/nvim/after/queries/blade/highlights.scm
@ -0,0 +1,9 @@
+(directive) @function
+(directive_start) @function
+(directive_end) @function
+(comment) @comment
+((parameter) @include (#set! "priority" 110))
+((php_only) @include (#set! "priority" 110))
+((bracket_start) @function (#set! "priority" 120))
+((bracket_end) @function (#set! "priority" 120))
+(keyword) @function
--- a/chezmoi/dot_config/nvim/after/queries/blade/injections.scm
+++ b/chezmoi/dot_config/nvim/after/queries/blade/injections.scm
@ -0,0 +1,3 @@
+((php) @injection.content
+    (#set! injection.combined)
+    (#set! injection.language php))
--- a/chezmoi/dot_config/nvim/init.lua
+++ b/chezmoi/dot_config/nvim/init.lua
@ -0,0 +1,26 @@
+-- Loadnoptions before anything
+require("aleidk.options")
+
+-- Init PLugins
+
+-- Install package manager https://github.com/folke/lazy.nvim
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+	vim.fn.system({
+		"git",
+		"clone",
+		"--filter=blob:none",
+		"https://github.com/folke/lazy.nvim.git",
+		"--branch=stable", -- latest stable release
+		lazypath,
+	})
+end
+vim.opt.rtp:prepend(lazypath)
+
+-- Load plugins
+require("lazy").setup("aleidk.plugins")
+
+-- Rest of configuratin
+
+require("aleidk.keymaps")
+require("aleidk.autocmds")
--- a/chezmoi/dot_config/nvim/lua/aleidk/autocmds.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/autocmds.lua
@ -0,0 +1,10 @@
+-- Highlight on yank
+-- See `:help vim.highlight.on_yank()`
+local highlight_group = vim.api.nvim_create_augroup("YankHighlight", { clear = true })
+vim.api.nvim_create_autocmd("TextYankPost", {
+	callback = function()
+		vim.highlight.on_yank()
+	end,
+	group = highlight_group,
+	pattern = "*",
+})
--- a/chezmoi/dot_config/nvim/lua/aleidk/constants.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/constants.lua
@ -29,7 +29,7 @@ return {
 			Color = " ",
 			Constant = " ",
 			Constructor = " ",
-			Copilot = " ",
+			Copilot = " ",
 			Enum = " ",
 			EnumMember = " ",
 			Event = " ",
--- a/chezmoi/dot_config/nvim/lua/aleidk/keymaps.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/keymaps.lua
@ -0,0 +1,77 @@
+-- [[ Basic Keymaps ]]
+
+function MAP(mode, l, r, desc)
+	vim.keymap.set(mode, l, r, { desc = desc, silent = true })
+end
+
+function ReloadModule(module)
+	package.loaded[module] = nil
+	require(module)
+end
+
+local function default(desc)
+	return {
+		silent = true,
+		desc = desc,
+	}
+end
+
+local function fixIndentation()
+	local indent = 2
+	vim.opt.tabstop = indent
+	vim.opt.shiftwidth = indent
+	vim.opt.softtabstop = indent
+
+	vim.cmd("retab")
+end
+
+-- Keymaps for better default experience
+-- See `:help vim.keymap.set()`
+vim.keymap.set({ "n", "v" }, "<Space>", "<Nop>", { silent = true })
+
+-- vim.keymap.set("n", "<C-s>", "<CMD>w<CR>", default("Keep cursor centered while junping"))
+
+-- Remap for dealing with word wrap
+vim.keymap.set("n", "k", "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
+vim.keymap.set("n", "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
+
+vim.keymap.set("n", "J", "mzJ`z", default("Keep cursor in column while joining lines"))
+
+vim.keymap.set("n", "|", ":vs<CR>", default("Open vsplit"))
+vim.keymap.set("n", "°", ":sp<CR>", default("Open split"))
+
+vim.keymap.set("n", "<C-d>", "<C-d>zz", default("Keep cursor centered while junping"))
+vim.keymap.set("n", "<C-u>", "<C-u>zz", default("Keep cursor centered while junping"))
+
+vim.keymap.set("n", "n", "nzzzv", default("Keep cursor centered while searching"))
+vim.keymap.set("n", "N", "Nzzzv", default("Keep cursor centered while searching"))
+
+vim.keymap.set("n", "Q", "<nop>", {})
+
+vim.keymap.set(
+	"n",
+	"<leader>rw",
+	[[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
+	default("Search and replace current word")
+)
+
+-- vim.keymap.set("n", "<leader>rR", ":s/", default("Search and replace inline"))
+-- vim.keymap.set("n", "<leader>rr", ":%s/", default("Search and replace globally"))
+-- vim.keymap.set("v", "<leader>r", ":s/", default("Search and replace in selection"))
+
+vim.keymap.set("v", "p", [["_dP]], default("Paste without lossing yanked text"))
+
+vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv", default("Move selection down"))
+vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv", default("Move selection up"))
+vim.keymap.set("n", "<Leader>uI", fixIndentation, default("Fix indentation"))
+vim.keymap.set("n", "<Leader>uO", function() ReloadModule('aleidk.options') end,
+	default("Reload the options configuration"))
+
+vim.keymap.set("n", "<Leader>uh", ":nohl<CR>", default("Remove search highlight"))
+
+vim.keymap.set("t", "<ESC>", "<C-\\><C-n>", default("Exit insert mode on terminal"))
+
+vim.keymap.set("n", "<leader>bc", "<Cmd>bd<CR>", default("Close buffer"))
+vim.keymap.set("n", "<leader>bh", "<Cmd>bp<CR>", default("Prev buffer"))
+vim.keymap.set("n", "<leader>bl", "<Cmd>bn<CR>", default("Next buffer"))
+vim.keymap.set("n", "<leader>bA", "<Cmd>bufdo bd<CR>", default("Close all buffers"))
--- a/chezmoi/dot_config/nvim/lua/aleidk/options.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/options.lua
@ -0,0 +1,76 @@
+-- [[ Setting options ]]
+-- See `:help vim.o`
+
+-- Set <space> as the leader key
+vim.g.mapleader = " "
+vim.g.maplocalleader = " "
+
+local opt = vim.opt
+
+-- stylua: ignore
+opt.autowrite = true           -- Enable auto write
+opt.clipboard = "unnamedplus"  -- Sync with system clipboard
+opt.completeopt = "menu,menuone,noselect"
+opt.conceallevel = 2           -- Hide * markup for bold and italic
+opt.confirm = true             -- Confirm to save changes before exiting modified buffer
+opt.cursorline = true          -- Enable highlighting of the current line
+opt.expandtab = true           -- Use spaces instead of tabs
+opt.formatoptions = "jcroqlnt" -- tcqj
+opt.grepformat = "%f:%l:%c:%m"
+opt.grepprg = "rg --vimgrep"
+opt.ignorecase = true      -- Ignore case
+opt.inccommand = "nosplit" -- preview incremental substitute
+opt.laststatus = 0
+opt.list = true            -- Show some invisible characters (tabs...
+opt.mouse = "a"            -- Enable mouse mode
+opt.number = true          -- Print line number
+opt.pumblend = 10          -- Popup blend
+opt.pumheight = 10         -- Maximum number of entries in a popup
+opt.relativenumber = true  -- Relative line numbers
+opt.scrolloff = 15         -- Lines of context
+opt.sessionoptions = { "buffers", "curdir", "tabpages", "winsize" }
+opt.shiftround = true      -- Round indent
+opt.shiftwidth = 2         -- Size of an indent
+opt.shortmess:append({ W = true, I = true, c = true })
+opt.showmode = false       -- Dont show mode since we have a statusline
+opt.sidescrolloff = 8      -- Columns of context
+opt.signcolumn = "yes"     -- Always show the signcolumn, otherwise it would shift the text each time
+opt.smartcase = true       -- Don't ignore case with capitals
+opt.smartindent = true     -- Insert indents automatically
+opt.spelllang = { "en" }
+opt.splitbelow = true      -- Put new windows below current
+opt.splitright = true      -- Put new windows right of current
+opt.tabstop = 2            -- Number of spaces tabs count for
+opt.termguicolors = true   -- True color support
+opt.timeoutlen = 300
+opt.undofile = true
+opt.undolevels = 10000
+opt.updatetime = 200               -- Save swap file and trigger CursorHold
+opt.wildmode = "longest,list:full" -- Command-line completion mode
+opt.winminwidth = 5                -- Minimum window width
+opt.wrap = false                   -- Disable line wrap
+
+vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
+
+vim.filetype.add({
+	-- Detect and assign filetype based on the extension of the filename
+	extension = {
+		mdx = "mdx",
+		log = "log",
+		conf = "conf",
+		env = "dotenv",
+	},
+	-- Detect and apply filetypes based on the entire filename
+	filename = {
+		[".env"] = "dotenv",
+		["env"] = "dotenv",
+		["tsconfig.json"] = "jsonc",
+	},
+	-- Detect and apply filetypes based on certain patterns of the filenames
+	pattern = {
+		-- INFO: Match filenames like - ".env.example", ".env.local" and so on
+		["%.env%.[%w_.-]+"] = "dotenv",
+		[".*%.blade%.php"] = "blade",
+		[".*%.hurl.*"] = "hurl",
+	},
+})
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/ai.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/ai.lua
@ -0,0 +1,78 @@
+return {
+	"olimorris/codecompanion.nvim",
+	dependencies = {
+		"nvim-lua/plenary.nvim",
+		"nvim-treesitter/nvim-treesitter",
+		{
+			"zbirenbaum/copilot.lua",
+			cmd = "Copilot",
+			event = "InsertEnter",
+			config = function()
+				require("copilot").setup({
+					suggestion = { enabled = false },
+					panel = { enabled = true, auto_refresh = true },
+				})
+			end,
+		},
+		"hrsh7th/nvim-cmp",                    -- Optional: For using slash commands and variables in the chat buffer
+		"nvim-telescope/telescope.nvim",       -- Optional: For using slash commands
+		{ "stevearc/dressing.nvim", opts = {} }, -- Optional: Improves `vim.ui.select`
+	},
+	opts = {
+		strategies = {
+			chat = {
+				adapter = "copilot",
+			},
+			inline = {
+				adapter = "copilot",
+			},
+			agent = { adapter = "copilot" },
+		},
+		display = {
+			action_palette = {
+				prompt = " "
+			}
+		}
+	},
+	keys = {
+		{
+			"<leader>at",
+			function()
+				require("codecompanion").toggle()
+			end,
+			desc = "Toggle AI chat",
+			mode = { "n", "v" }
+		},
+		{
+			"<leader>aa",
+			"<CMD>CodeCompanion<CR>",
+			desc = "Run an inline prompt",
+			mode = { "n", "v" }
+		},
+		{
+			"<leader>aA",
+			function()
+				require("codecompanion").actions()
+			end,
+			desc = "Open AI actions",
+			mode = { "n", "v" }
+		},
+		{
+			"<leader>av",
+			function()
+				require("codecompanion").add()
+			end,
+			desc = "Add visual selection to chat",
+			mode = "v"
+		},
+		{
+			"<leader>ae",
+			function()
+				require("codecompanion").prompt("explain")
+			end,
+			desc = "Explain code",
+			mode = "v"
+		},
+	}
+}
+
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/auto-pairs.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/auto-pairs.lua
@ -0,0 +1,5 @@
+return {
+	"windwp/nvim-autopairs",
+	event = "InsertEnter",
+	opts = {}, -- this is equalent to setup({}) function
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/bookmarks.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/bookmarks.lua
@ -13,6 +13,7 @@ return {
 	dependencies = {
 		{ "nvim-tree/nvim-web-devicons", lazy = true },
 	},
+	lazy = false,
 	cmd = "Grapple",
 	keys = {
 		{ "<leader><leader>a", "<cmd>Grapple toggle<cr>",                      desc = "Toggle bookmark for current file" },
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/colorscheme.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/colorscheme.lua
@ -0,0 +1,39 @@
+return { -- Change colors.none if not using a transparent background
+	"catppuccin/nvim",
+	priority = 1000,
+	lazy = false,
+	opts = {
+		flavour = "macchiato",
+		transparent_background = true,
+		integrations = {
+			cmp = true,
+			notify = true,
+			harpoon = false,
+			mason = true,
+			neogit = true,
+			noice = true,
+			hop = true,
+			lsp_trouble = true,
+			indent_blankline = {
+				enabled = true,
+			},
+		},
+		custom_highlights = function(colors)
+			return {
+				-- Fix colors for cmp
+				Pmenu = { bg = colors.none, blend = 0 },
+				FloatBorder = { bg = colors.none },
+				CmpItemMenu = { fg = colors.text, bg = colors.none },
+				-- dadbod-ui
+				NotificationInfo = { bg = colors.none, fg = colors.text },
+				NotificationWarning = { bg = colors.none, fg = colors.yellow },
+				NotificationError = { bg = colors.none, fg = colors.red },
+			}
+		end,
+	},
+
+	config = function(_, opts)
+		require("catppuccin").setup(opts)
+		vim.cmd.colorscheme("catppuccin")
+	end,
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/comments.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/comments.lua
@ -0,0 +1,49 @@
+return {
+	{
+		"echasnovski/mini.comment",
+		version = "*",
+		event = "VeryLazy",
+		dependencies = {
+			{ "nvim-treesitter/nvim-treesitter-context" },
+		},
+		opts = {
+			options = {
+				custom_commentstring = function()
+					return require("ts_context_commentstring.internal").calculate_commentstring()
+							or vim.bo.commentstring
+				end,
+			},
+		},
+	},
+	{
+		"LudoPinelli/comment-box.nvim",
+		event = "VeryLazy",
+		config = function()
+			require("comment-box").setup({
+				outer_blank_lines = true,
+			})
+
+			local cb = require("comment-box")
+
+			-- left aligned fixed size box with left aligned text
+			MAP({ "n", "v" }, "gcb", cb.lcbox, "Create a comment box")
+			-- centered adapted box with centered text
+			MAP({ "n", "v" }, "gcl", cb.llline, "Create a comment line")
+		end,
+	},
+	{
+		"danymat/neogen",
+		opts = { snippet_engine = "luasnip" },
+		dependencies = { "nvim-treesitter/nvim-treesitter" },
+		version = "*", -- stable releases
+		keys = {
+			{
+				"gcd",
+				function()
+					require("neogen").generate()
+				end,
+				desc = "Generate comment docstring",
+			},
+		},
+	},
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/completion.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/completion.lua
@ -0,0 +1,120 @@
+---@diagnostic disable: missing-fields
+return {
+	"hrsh7th/nvim-cmp",
+	version = false, -- last release is way too old
+	event = "InsertEnter",
+	dependencies = {
+		"L3MON4D3/LuaSnip",
+		"davidsierradz/cmp-conventionalcommits",
+		"hrsh7th/cmp-buffer",
+		"hrsh7th/cmp-cmdline",
+		"hrsh7th/cmp-nvim-lsp",
+		"hrsh7th/cmp-path",
+		"petertriho/cmp-git",
+		"saadparwaiz1/cmp_luasnip",
+		"windwp/nvim-autopairs",
+		{
+			"zbirenbaum/copilot-cmp",
+			config = function()
+				require("copilot_cmp").setup()
+			end
+		},
+	},
+	config = function()
+		vim.api.nvim_set_hl(0, "CmpGhostText", { link = "Comment", default = true })
+		local cmp = require("cmp")
+
+		local cmp_autopairs = require("nvim-autopairs.completion.cmp")
+		cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
+
+		local defaults = require("cmp.config.default")()
+		local window_opts = {
+			border = "rounded",
+			side_padding = 1,
+			-- fix colors for catppuccin colorscheme
+			winhighlight = "Normal:Pmenu,FloatBorder:FloatBorder,CursorLine:PmenuSel,Search:None",
+		}
+		local opts = {
+			visible_docs = false,
+			completion = {
+				completeopt = "menu,menuone,noinsert",
+			},
+			snippet = {
+				expand = function(args)
+					require("luasnip").lsp_expand(args.body)
+				end,
+			},
+			mapping = cmp.mapping.preset.insert({
+				["<C-n>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
+				["<C-p>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
+				["<C-j>"] = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }),
+				["<C-k>"] = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }),
+				["<C-u>"] = cmp.mapping.scroll_docs(-4),
+				["<C-d>"] = cmp.mapping.scroll_docs(4),
+				["<C-o>"] = function()
+					if cmp.visible_docs() then
+						cmp.close_docs()
+					else
+						cmp.open_docs()
+					end
+				end,
+				["<C-Space>"] = cmp.mapping.complete(),
+				["<C-e>"] = cmp.mapping.abort(),
+				["<BR>"] = cmp.mapping.abort(),
+				["<C-CR>"] = cmp.mapping.confirm({ select = false }), -- Confirm only if selected an item
+				["<CR>"] = cmp.mapping.confirm({
+					-- Auto confirms first item
+					behavior = cmp.ConfirmBehavior.Replace,
+					select = true,
+				}),
+			}),
+			sources = cmp.config.sources({
+				{ name = "conventionalcommits" },
+				{ name = "copilot" },
+				{ name = "nvim_lsp" },
+				{ name = "luasnip" },
+				{ name = "buffer" },
+				{ name = "path" },
+			}),
+			formatting = {
+				fields = { "kind", "abbr", "menu" },
+				format = function(_, item)
+					local icons = require("aleidk.constants").icons.kinds
+					if icons[item.kind] then
+						item.kind = icons[item.kind] .. item.kind
+					end
+					return item
+				end,
+			},
+			window = {
+				completion = cmp.config.window.bordered(window_opts),
+				documentation = cmp.config.window.bordered(window_opts),
+			},
+			experimental = {
+				ghost_text = {
+					hl_group = "CmpGhostText",
+				},
+			},
+			sorting = {
+				priority_weight = 2,
+				comparators = {
+					require("copilot_cmp.comparators").prioritize,
+
+					-- Below is the default comparitor list and order for nvim-cmp
+					cmp.config.compare.offset,
+					-- cmp.config.compare.scopes, --this is commented in nvim-cmp too
+					cmp.config.compare.exact,
+					cmp.config.compare.score,
+					cmp.config.compare.recently_used,
+					cmp.config.compare.locality,
+					cmp.config.compare.kind,
+					cmp.config.compare.sort_text,
+					cmp.config.compare.length,
+					cmp.config.compare.order,
+				},
+			},
+		}
+
+		cmp.setup(opts)
+	end,
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/dashboard.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/dashboard.lua
@ -0,0 +1,35 @@
+return {
+	"goolord/alpha-nvim",
+	lazy = false,
+	opts = function()
+		local dashboard = require("alpha.themes.dashboard")
+
+		dashboard.section.header.val = {
+			"           ████            ███      █████ █████     ",
+			"          ░░███           ░░░      ░░███ ░░███      ",
+			"  ██████   ░███   ██████  ████   ███████  ░███ █████",
+			" ░░░░░███  ░███  ███░░███░░███  ███░░███  ░███░░███ ",
+			"  ███████  ░███ ░███████  ░███ ░███ ░███  ░██████░  ",
+			" ███░░███  ░███ ░███░░░   ░███ ░███ ░███  ░███░░███ ",
+			"░░████████ █████░░██████  █████░░████████ ████ █████",
+			" ░░░░░░░░ ░░░░░  ░░░░░░  ░░░░░  ░░░░░░░░ ░░░░ ░░░░░ ",
+		}
+		dashboard.section.header.opts.hl = "DashboardHeader"
+
+		dashboard.section.buttons.val = {
+			dashboard.button("LDR f f", "  Find File  ", "<leader>ff"),
+			dashboard.button("LDR LDR t", "  Bookmars", "<leader><leader>t"),
+			dashboard.button("LDR g g", "  Git  ", "<leader>gg"),
+		}
+
+		dashboard.section.footer.val =
+			{ " ", " ", " ", "Nvim loaded " .. require("lazy").stats().count .. " plugins " }
+		dashboard.section.footer.opts.hl = "DashboardFooter"
+
+		dashboard.config.layout[1].val = vim.fn.max({ 2, vim.fn.floor(vim.fn.winheight(0) * 0.2) })
+		dashboard.config.layout[3].val = 5
+		dashboard.config.opts.noautocmd = true
+
+		return dashboard.opts
+	end,
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/database.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/database.lua
@ -0,0 +1,44 @@
+return {
+	"kristijanhusak/vim-dadbod-ui",
+	dependencies = {
+		{ "tpope/vim-dadbod", lazy = true },
+		{ "kristijanhusak/vim-dadbod-completion", ft = { "sql", "mysql", "plsql" }, lazy = true },
+	},
+	cmd = {
+		"DBUI",
+		"DBUIToggle",
+		"DBUIAddConnection",
+		"DBUIFindBuffer",
+	},
+	keys = {
+		{ "<Leader>ud", "<CMD>DBUIToggle<CR>", desc = "Toggle DB UI" },
+	},
+	init = function()
+		-- Your DBUI configuration
+		vim.g.db_ui_use_nerd_fonts = 1
+		vim.g.db_ui_force_echo_notifications = 1
+
+		vim.api.nvim_create_autocmd("FileType", {
+			pattern = {
+				"sql",
+				"mysql",
+				"plsql",
+			},
+			command = [[setlocal omnifunc=vim_dadbod_completion#omni]],
+		})
+
+		vim.api.nvim_create_autocmd("FileType", {
+			pattern = {
+				"sql",
+				"mysql",
+				"plsql",
+			},
+			callback = function()
+				---@diagnostic disable-next-line: missing-fields
+				require("cmp").setup.buffer({
+					sources = { { name = "vim-dadbod-completion" }, { name = "buffer" } },
+				})
+			end,
+		})
+	end,
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/debugprint.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/debugprint.lua
@ -0,0 +1,7 @@
+return {
+	"andrewferrier/debugprint.nvim",
+	opts = {},
+	-- Remove the following line to use development versions,
+	-- not just the formal releases
+	version = "*",
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/dressing.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/dressing.lua
@ -0,0 +1,10 @@
+return {
+	-- better imputs
+	"stevearc/dressing.nvim",
+	opts = {
+		input = {
+			-- handle by noice
+			enabled = false,
+		},
+	},
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/file-browser.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/file-browser.lua
@ -0,0 +1,100 @@
+return {
+	{
+		"nvim-tree/nvim-tree.lua",
+		enabled = false,
+		version = "*",
+		dependencies = {
+			"nvim-tree/nvim-web-devicons",
+		},
+		keys = {
+			{ "<Leader>e", "<CMD>NvimTreeToggle<CR>", desc = "Open file explorer" },
+		},
+		cmd = { "NvimTreeToggle", "Tree" },
+		config = function()
+			local tree = require("nvim-tree")
+			local api = require("nvim-tree.api")
+
+			tree.setup({
+				hijack_unnamed_buffer_when_opening = true,
+				disable_netrw = false,
+				hijack_netrw = false, -- handle by telescope browser
+				hijack_cursor = true, -- cursor at the start of filename
+				sync_root_with_cwd = true,
+				respect_buf_cwd = true,
+				update_focused_file = {
+					enable = true, -- focus curren file
+					update_root = true,
+				},
+				actions = { open_file = { quit_on_open = true } },
+				renderer = {
+					full_name = true, -- show remaining name in floating text
+					group_empty = true, -- group empty folders
+					add_trailing = true, -- Trailing slash to folders
+					highlight_opened_files = "all",
+					highlight_git = true,
+				},
+				view = {
+					centralize_selection = true, -- center current file on enter
+					width = 30, -- N° of columns or %
+				},
+				on_attach = function(bufnr)
+					local function opts(desc)
+						return {
+							desc = "nvim-tree: " .. desc,
+							buffer = bufnr,
+							noremap = true,
+							silent = true,
+							nowait = true,
+						}
+					end
+
+					-- Check defaults here: https://github.com/nvim-tree/nvim-tree.lua/wiki/Migrating-To-on_attach
+					api.config.mappings.default_on_attach(bufnr)
+
+					vim.keymap.set("n", "l", api.node.open.edit, opts("Open"))
+					vim.keymap.set("n", "o", api.node.open.edit, opts("Open"))
+					vim.keymap.set("n", "<CR>", api.node.open.edit, opts("Open"))
+					vim.keymap.set("n", "<2-LeftMouse>", api.node.open.edit, opts("Open"))
+					vim.keymap.set("n", "s", api.node.open.vertical, opts("Open in vsplit"))
+					vim.keymap.set("n", "v", api.node.open.horizontal, opts("Open in hsplit"))
+					vim.keymap.set("n", "t", api.node.open.tab, opts("Open in tab"))
+					vim.keymap.set("n", "h", api.node.navigate.parent_close, opts("Close dir"))
+					vim.keymap.set("n", "<BS>", api.node.navigate.parent_close, opts("Close dir"))
+					vim.keymap.set("n", "i", api.tree.toggle_hidden_filter, opts("Toggle Dotfiles"))
+					vim.keymap.set("n", "I", api.tree.toggle_gitignore_filter, opts("Toggle Git Ignore"))
+				end,
+			})
+
+			-- Auto open when a dir is opened
+
+			local function open_nvim_tree(data)
+				-- buffer is a directory
+				local directory = vim.fn.isdirectory(data.file) == 1
+
+				if not directory then
+					return
+				end
+
+				-- create a new, empty buffer
+				vim.cmd.enew()
+
+				-- wipe the directory buffer
+				vim.cmd.bw(data.buf)
+
+				-- change to the directory
+				vim.cmd.cd(data.file)
+
+				-- open the tree
+				require("nvim-tree.api").tree.open()
+			end
+
+			vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
+			vim.api.nvim_create_user_command("Tree", "NvimTreeToggle", {})
+
+			-- bindings
+			-- disabled to discourage the use of this plugin without disabling it
+			-- vim.keymap.set("n", "<leader>e", ":NvimTreeToggle<CR>", { desc = "Toggle file tree", silent = true })
+			-- vim.keymap.set("n", "<C-e>", ":NvimTreeToggle<CR>", { desc = "Toggle file tree", silent = true })
+		end,
+	},
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/file-explorer.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/file-explorer.lua
@ -0,0 +1,66 @@
+return {
+	"rolv-apneseth/tfm.nvim",
+	lazy = false,
+	opts = {
+		-- TFM to use
+		-- Possible choices: "ranger" | "nnn" | "lf" | "vifm" | "yazi" (default)
+		file_manager = "yazi",
+		-- Replace netrw entirely
+		-- Default: false
+		replace_netrw = true,
+		-- Enable creation of commands
+		-- Default: false
+		-- Commands:
+		--   Tfm: selected file(s) will be opened in the current window
+		--   TfmSplit: selected file(s) will be opened in a horizontal split
+		--   TfmVsplit: selected file(s) will be opened in a vertical split
+		--   TfmTabedit: selected file(s) will be opened in a new tab page
+		enable_cmds = true,
+		-- Custom keybindings only applied within the TFM buffer
+		-- Default: {}
+		keybindings = {
+			["<ESC>"] = "q",
+		},
+		-- Customise UI. The below options are the default
+		ui = {
+			border = "rounded",
+			height = 1,
+			width = 1,
+			x = 0.5,
+			y = 0.5,
+		},
+	},
+	keys = {
+		{
+			"<leader>e",
+			function()
+				require("tfm").open()
+			end,
+			desc = "TFM",
+		},
+		{
+			"<leader>mh",
+			function()
+				local tfm = require("tfm")
+				tfm.open(nil, tfm.OPEN_MODE.split)
+			end,
+			desc = "TFM - horizontal split",
+		},
+		{
+			"<leader>mv",
+			function()
+				local tfm = require("tfm")
+				tfm.open(nil, tfm.OPEN_MODE.vsplit)
+			end,
+			desc = "TFM - vertical split",
+		},
+		{
+			"<leader>mt",
+			function()
+				local tfm = require("tfm")
+				tfm.open(nil, tfm.OPEN_MODE.tabedit)
+			end,
+			desc = "TFM - new tab",
+		},
+	},
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/formatter.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/formatter.lua
@ -0,0 +1,120 @@
+return {
+	"stevearc/conform.nvim",
+	event = "VeryLazy",
+	opts = {
+		-- log_level = vim.log.levels.DEBUG,
+
+		-- See aviable formatters in: https://github.com/stevearc/conform.nvim#formatters
+		-- Formatters can be installed by mason
+		formatters_by_ft = {
+			-- Conform will run multiple formatters sequentially
+			-- Use a stop_after_first = true to run only the first available formatter
+			-- Use the "_" filetype to run formatters on filetypes that don't
+			-- have other formatters configured.
+			["_"] = { "trim_whitespace" },
+			blade = { "blade-formatter" },
+			css = { "prettierd", "prettier" },
+			go = { "gofumpt", "goimports_reviser", "golines" },
+			html = { "djlint", "prettierd", stop_after_first = true },
+			javascript = { "prettierd", "prettier", stop_after_first = true },
+			javascriptreact = { "prettierd", "prettier", stop_after_first = true },
+			json = { "prettierd", "prettier", stop_after_first = true },
+			jsonc = { "prettierd", "prettier", stop_after_first = true },
+			lua = { "stylua" },
+			markdown = { "markdownlint" },
+			nim = { "nimpretty" },
+			php = { "pint" },
+			python = { "ruff_format", "ruff_organize_imports" },
+			scss = { "prettierd", "prettier", stop_after_first = true },
+			sh = { "shfmt" },
+			typescript = { "prettierd", "prettier", stop_after_first = true },
+			typescriptreact = { "prettierd", "prettier", stop_after_first = true },
+			xml = { "lemminx" },
+			zsh = { "shfmt" }
+		},
+		formatters = {
+			djlint = {
+				prepend_args = {
+					"--format-css",
+					"--indent-css",
+					"2",
+					"--format-js",
+					"--indent-js",
+					"2",
+					"--indent",
+					"2",
+					"--preserve-blank-lines",
+					"--quiet"
+				}
+			}
+		},
+		format_on_save = function(bufnr)
+			-- Disable with a global or buffer-local variable
+			if vim.g.disable_autoformat or vim.b[bufnr].disable_autoformat then
+				return
+			end
+
+			return { timeout_ms = 2000, lsp_fallback = true }
+		end,
+	},
+	config = function(_, opts)
+		require("conform").setup(opts)
+
+		local function toggleAutoFormat()
+			-- to make this global, change b to g
+			if vim.b.disable_autoformat == nil then
+				vim.b.disable_autoformat = true
+				print("Autoformat set to: " .. tostring(not vim.b.disable_autoformat))
+				return
+			end
+
+			vim.b.disable_autoformat = not vim.b.disable_autoformat
+			print("Autoformat set to: " .. tostring(not vim.b.disable_autoformat))
+		end
+
+		MAP("n", "<leader>uf", toggleAutoFormat, "Toggle auto format")
+
+		vim.api.nvim_create_user_command("Fmt", function(args)
+			local range = nil
+			if args.count ~= -1 then
+				local end_line = vim.api.nvim_buf_get_lines(0, args.line2 - 1, args.line2, true)[1]
+				range = {
+					start = { args.line1, 0 },
+					["end"] = { args.line2, end_line:len() },
+				}
+			end
+
+			local function callback(err, did_edit)
+				if not did_edit then
+					vim.notify("The file was not formatted:\n" .. tostring(err), vim.log.levels.ERROR)
+					return
+				end
+
+				if args.bang then
+					vim.cmd("w")
+				end
+			end
+
+			require("conform").format(
+				{
+					async = true,
+					lsp_format = "fallback",
+					range = range,
+					formatters = args.fargs
+				},
+				callback
+			)
+		end, {
+			range = true,
+			bang = true,
+			force = true,
+			desc = "Format the document",
+			nargs = '*',
+			-- complete = function()
+			-- 	local formatters = require('conform').formatters_by_ft
+			--
+			-- 	return vim.tbl_keys(formatters)
+			-- end
+		})
+	end,
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/git.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/git.lua
@ -0,0 +1,114 @@
+return {
+	{
+		"lewis6991/gitsigns.nvim",
+		event = { "BufReadPre", "BufNewFile" },
+		opts = {
+			-- See `:help gitsigns.txt`
+			signs = {
+				add = { text = "▎" },
+				change = { text = "▎" },
+				delete = { text = "" },
+				topdelete = { text = "" },
+				changedelete = { text = "▎" },
+				untracked = { text = "▎" },
+			},
+			on_attach = function(buffer)
+				local gs = package.loaded.gitsigns
+
+				local function map(mode, l, r, desc)
+					vim.keymap.set(mode, "<leader>g" .. l, r, { buffer = buffer, desc = desc })
+				end
+
+				-- stylua: ignore start
+				map("n", "j", gs.next_hunk, "Next Hunk")
+				map("n", "k", gs.prev_hunk, "Prev Hunk")
+				map({ "n", "v" }, "s", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
+				map({ "n", "v" }, "r", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
+				map("n", "u", gs.undo_stage_hunk, "Undo Stage Hunk")
+				map("n", "R", gs.reset_buffer, "Reset Buffer")
+				map("n", "<TAB>", gs.preview_hunk, "Preview Hunk")
+				map("n", "l", function() gs.blame_line({full = true}) end, "Blame Line")
+				map("n", "d", gs.diffthis, "Diff This")
+			end,
+		},
+	},
+	{
+		"kdheepak/lazygit.nvim",
+		event = "VeryLazy",
+		dependencies = {
+			"nvim-lua/plenary.nvim",
+		},
+		keys = {
+			{ "<leader>gG", ":LazyGit<CR>", desc = "Lazygit" },
+		},
+	},
+	{
+		"NeogitOrg/neogit",
+		dependencies = {
+			"nvim-lua/plenary.nvim", -- required
+			"nvim-telescope/telescope.nvim", -- optional
+			"sindrets/diffview.nvim", -- optional
+		},
+		config = true,
+		opts = {
+			disable_line_numbers = false,
+			console_timeout = 8000,
+			graph_style = "unicode",
+			kind = "tab",
+			ignored_settings = {
+				"NeogitPushPopup--force",
+				"NeogitPullPopup--rebase",
+				"NeogitCommitPopup--allow-empty",
+				"NeogitCommitPopup--reuse-message",
+				"NeogitRevertPopup--no-edit",
+			},
+		},
+		keys = {
+			{
+				"<leader>gg",
+				function()
+					require("neogit").open()
+				end,
+				desc = "Neogit",
+			},
+			{
+				"<leader>gc",
+				function()
+					require("neogit").open({ "commit" })
+				end,
+				desc = "Commit",
+			},
+			{
+				"<leader>gp",
+				function()
+					require("neogit").open({ "pull" })
+				end,
+				desc = "Pull",
+			},
+			{
+				"<leader>gP",
+				function()
+					require("neogit").open({ "push" })
+				end,
+				desc = "Push",
+			},
+		},
+	},
+
+	{
+		"pwntester/octo.nvim",
+		dependencies = {
+			"nvim-lua/plenary.nvim",
+			"nvim-telescope/telescope.nvim",
+			"nvim-tree/nvim-web-devicons",
+		},
+		opts = { enable_builtin = true },
+		keys = {
+			{
+				"<leader>go",
+				"<CMD>Octo<CR>",
+				desc = "Octo.nvim",
+			},
+		},
+	},
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/http.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/http.lua
@ -0,0 +1,38 @@
+return {
+	"jellydn/hurl.nvim",
+	dependencies = {
+		"MunifTanjim/nui.nvim",
+		"nvim-lua/plenary.nvim",
+		"nvim-treesitter/nvim-treesitter"
+	},
+	ft = "hurl",
+	opts = {
+		-- Show debugging info
+		debug = false,
+		-- Show notification on run
+		show_notification = false,
+		-- Show response in popup or split
+		mode = "popup",
+		-- Default formatter
+		formatters = {
+			json = { 'jq' }, -- Make sure you have install jq in your system, e.g: brew install jq
+			html = {
+				'prettierd', -- Make sure you have install prettier in your system, e.g: npm install -g prettier
+				'--parser',
+				'html',
+			},
+		},
+		env_file = {
+			'hurl.env',
+			'.env',
+			'.env.local',
+		},
+	},
+	keys = {
+		-- Run API request
+		{ "<leader>ph", "<cmd>HurlRunnerAt<CR>", desc = "Run HTTP request" },
+		{ "<leader>pH", "<cmd>HurlRunner<CR>",   desc = "Run all HTTP requests" },
+		-- Run Hurl request in visual mode
+		{ "<leader>ph", ":HurlRunner<CR>",       desc = "Run HTTP requests",    mode = "v" },
+	},
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/indent-blankline.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/indent-blankline.lua
@ -0,0 +1,30 @@
+return {
+	-- Add indentation guides even on blank lines
+	"lukas-reineke/indent-blankline.nvim",
+	event = { "BufReadPost", "BufNewFile" },
+	main = "ibl",
+	opts = {
+		-- char = "▏",
+		indent = {
+			char = "│",
+			tab_char = "│",
+		},
+		scope = {
+			enabled = true,
+		},
+		exclude = {
+			filetypes = {
+				"help",
+				"alpha",
+				"dashboard",
+				"neo-tree",
+				"Trouble",
+				"lazy",
+				"mason",
+				"notify",
+				"toggleterm",
+				"lazyterm",
+			},
+		},
+	},
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/init.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/init.lua
@ -0,0 +1,99 @@
+return {
+	-- Detect tabstop and shiftwidth automatically
+	"tpope/vim-sleuth",
+	{ "nvim-tree/nvim-web-devicons", lazy = true },
+	{
+		"mbbill/undotree",
+		config = function()
+			vim.g.undotree_WindowLayout = 2
+			vim.g.undotree_ShortIndicators = 1
+			vim.g.undotree_SetFocusWhenToggle = 1
+		end,
+		keys = {
+			{ "<leader>fu", vim.cmd.UndotreeToggle, desc = "Undo tree" },
+		},
+	},
+	{
+		-- Highlight word under cursor
+		"RRethy/vim-illuminate",
+		event = { "BufReadPost", "BufNewFile" },
+		opts = { delay = 200 },
+		config = function(_, opts)
+			require("illuminate").configure(opts)
+		end,
+	},
+	{
+		-- Color Picker
+		"uga-rosa/ccc.nvim",
+		event = "VeryLazy",
+		opts = {
+			auto_enable = true,
+			lsp = true,
+		},
+		keys = {
+			{ "<leader>uc", "<CMD>CccPick<CR>",              desc = "Open Color picker" },
+			{ "<leader>uC", "<CMD>CccHighlighterToggle<CR>", desc = "Toggle Color highlight" },
+		},
+	},
+	-- Dotfiles management
+	{
+		"xvzc/chezmoi.nvim",
+		dependencies = { "nvim-lua/plenary.nvim", "alker0/chezmoi.vim" },
+		config = function()
+			require("chezmoi").setup({
+				{
+					edit = {
+						watch = false,
+						force = false,
+					},
+					notification = {
+						on_open = true,
+						on_apply = true,
+						on_watch = false,
+					},
+					telescope = {
+						select = { "<CR>" },
+					},
+				},
+			})
+
+			vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
+				-- INFO: this should be the same as $(chezmoi source-path)
+				pattern = { os.getenv("HOME") .. "/.local/share/chezmoi/chezmoi/*" },
+				callback = function()
+					vim.schedule(require("chezmoi.commands.__edit").watch)
+				end,
+			})
+			local telescope = require("telescope")
+
+			telescope.load_extension("chezmoi")
+			vim.keymap.set("n", "<leader>fz", telescope.extensions.chezmoi.find_files, { desc = "Find dotfile" })
+		end,
+	},
+	{
+		"pmizio/typescript-tools.nvim",
+		dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig" },
+		opts = {
+			init_options = {
+				preferences = {
+					disableSuggestions = true,
+				},
+			},
+			settings = {
+				-- array of strings("fix_all"|"add_missing_imports"|"remove_unused"|
+				-- "remove_unused_imports"|"organize_imports") -- or string "all"
+				-- to include all supported code actions
+				-- specify commands exposed as code_actions
+				expose_as_code_action = "all",
+			},
+		},
+	},
+
+	{
+		"olexsmir/gopher.nvim",
+		ft = "go",
+		build = function()
+			vim.cmd([[silent! GoInstallDeps]])
+		end,
+	},
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/key-help.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/key-help.lua
@ -0,0 +1,85 @@
+return {
+	"echasnovski/mini.clue",
+	version = "*",
+	event = "VeryLazy",
+	config = function()
+		local miniclue = require("mini.clue")
+		miniclue.setup({
+			triggers = {
+				-- Leader triggers
+				{ mode = "n", keys = "<Leader>" },
+				{ mode = "v", keys = "<Leader>" },
+				{ mode = "x", keys = "<Leader>" },
+
+				-- Built-in completion
+				{ mode = "i", keys = "<C-x>" },
+
+				-- `g` key
+				{ mode = "n", keys = "g" },
+				{ mode = "x", keys = "g" },
+
+				-- Marks
+				{ mode = "n", keys = "'" },
+				{ mode = "n", keys = "`" },
+				{ mode = "x", keys = "'" },
+				{ mode = "x", keys = "`" },
+
+				-- Registers
+				{ mode = "n", keys = '"' },
+				{ mode = "x", keys = '"' },
+				{ mode = "i", keys = "<C-r>" },
+				{ mode = "c", keys = "<C-r>" },
+
+				-- Window commands
+				{ mode = "n", keys = "<C-w>" },
+
+				-- `z` key
+				{ mode = "n", keys = "z" },
+				{ mode = "x", keys = "z" },
+			},
+
+			-- Add a "postkeys" value to activate those keys after others
+			clues = {
+				miniclue.gen_clues.builtin_completion(),
+				miniclue.gen_clues.g(),
+				miniclue.gen_clues.marks(),
+				miniclue.gen_clues.registers(),
+				miniclue.gen_clues.windows(),
+				miniclue.gen_clues.z(),
+
+				{ mode = "n", keys = "<Leader><Leader>",  desc = "+Bookmarks" },
+				{ mode = "n", keys = "<Leader><Leader>n", postkeys = "<Leader><Leader>" },
+				{ mode = "n", keys = "<Leader><Leader>N", postkeys = "<Leader><Leader>" },
+				{ mode = "n", keys = "<Leader>b",         desc = "+Buffers" },
+				{ mode = "n", keys = "<Leader>bh",        postkeys = "<Leader>b" },
+				{ mode = "n", keys = "<Leader>bl",        postkeys = "<Leader>b" },
+				{ mode = "n", keys = "<Leader>f",         desc = "+Find" },
+				{ mode = "n", keys = "<Leader>g",         desc = "+Git" },
+				{ mode = "n", keys = "<Leader>l",         desc = "+LSP" },
+				{ mode = "n", keys = "<Leader>r",         desc = "+Replace" },
+				{ mode = "n", keys = "<Leader>u",         desc = "+UI & Config" },
+				{ mode = "n", keys = "<Leader>un",        desc = "+Noice" },
+				{ mode = "n", keys = "<Leader>w",         desc = "+Workspace" },
+				{ mode = "n", keys = "<Leader>p",         desc = "+Run stuff" },
+				{ mode = "n", keys = "<Leader>z",         desc = "+ZK" },
+				{ mode = "v", keys = "<Leader>z",         desc = "+ZK" },
+				{ mode = "v", keys = "<Leader>a",         desc = "+AI" },
+				{ mode = "n", keys = "<Leader>a",         desc = "+AI" },
+				{ mode = "n", keys = "g?",                desc = "+Print Debug" },
+			},
+
+			-- Clue window settings
+			window = {
+				-- Floating window config
+				config = {
+					width = "auto",
+				},
+				-- Delay before showing clue window
+				delay = 200,
+				-- Keys to scroll inside the clue window
+				scroll_down = "<C-d>",
+				scroll_up = "<C-u>",
+			},
+		})
+	end,
+}
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/linters.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/linters.lua
@ -8,17 +8,16 @@ return {
 		lint.linters.gitlint.args = { "--contrib", "contrib-title-conventional-commits", "--msg-filename", "-" }

 		lint.linters_by_ft = {
+			javascript = { "eslint_d" },
+			typescript = { "eslint_d" },
+			javascriptreact = { "eslint_d" },
+			typescriptreact = { "eslint_d" },
 			-- astro = { "eslint_d" },
-			kotlin = { "ktlint" },
 			python = { "ruff" },
 			sh = { "shellcheck" },
 			NeogitCommitMessage = { "gitlint" },
 			gitcommit = { "gitlint" },
 			markdown = { "markdownlint" },
-			javascript = { "biomejs" },
-			typescript = { "biomejs" },
-			javascriptreact = { "biomejs" },
-			typescriptreact = { "biomejs" },
 		}

 		vim.api.nvim_create_autocmd({ "BufWritePost" }, {
--- a/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua
+++ b/chezmoi/dot_config/nvim/lua/aleidk/plugins/lsp.lua
@ -0,0 +1,215 @@
+return {
+	-- LSP Configuration & Plugins
+	"neovim/nvim-lspconfig",
+	event = { "BufReadPost", "BufNewFile", "BufWritePre" },
+	dependencies = {
+		-- Automatically install LSPs to stdpath for neovim
+		{ "williamboman/mason.nvim" },
+		"williamboman/mason-lspconfig.nvim",
+		-- Additional lua configuration, makes nvim stuff amazing!
+		{ "folke/neodev.nvim",      opts = {} },
+	},
+
+	config = function()
+		-- LSP settings.
+		local on_attach = function(_, bufnr)
+			local nmap = function(keys, func, desc)
+				if desc then
+					desc = "LSP: " .. desc
+				end
+
+				vim.keymap.set("n", keys, func, { buffer = bufnr, desc = desc })
+			end
+
+			nmap("<leader>lr", vim.lsp.buf.rename, "Rename")
+			-- stylua: ignore
+			vim.keymap.set({ "n", "x", "v" }, "<leader>la", vim.lsp.buf.code_action, { buffer = bufnr, desc = "Code Action" })
+			nmap("<leader>ld", vim.lsp.buf.type_definition, "Go to type definition")
+			nmap("<leader>lf", function()
+				vim.lsp.buf.format()
+			end, "Format")
+
+			nmap("gd", vim.lsp.buf.definition, "Go to definition")
+			nmap("gr", require("telescope.builtin").lsp_references, "Goto References")
+			nmap("gI", vim.lsp.buf.implementation, "Go to Implementation")
+
+			-- See `:help K` for why this keymap
+			nmap("K", vim.lsp.buf.hover, "Hover Documentation")
+			-- nmap("<C-k>", vim.lsp.buf.signature_help, "Signature Documentation")
+
+			-- Lesser used LSP functionality
+			nmap("gD", vim.lsp.buf.declaration, "Goto Declaration")
+
+			nmap("<leader>lj", vim.diagnostic.goto_next, "Go to next diagnostic")
+			nmap("<leader>lk", vim.diagnostic.goto_prev, "Go to prev diagnostic")
+			nmap("<leader>lK", function()
+				-- execute twice to enter the float inmediatly
+				vim.diagnostic.open_float()
+				vim.diagnostic.open_float()
+			end, "Hover current diagnostic")
+
+			-- Create a command `:Format` local to the LSP buffer
+			vim.api.nvim_buf_create_user_command(bufnr, "Format", function(_)
+				vim.lsp.buf.format()
+			end, { desc = "Format current buffer with LSP" })
+		end
+
+		-- Enable the following language servers
+		-- To see options and cofigurations: https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
+		local servers = {
+			astro = {},
+			bashls = {},
+			cssls = {},
+			dockerls = {},
+			emmet_ls = {
+				filetypes = {
+					"astro",
+					"css",
+					"eruby",
+					"html",
+					"htmldjango",
+					"javascriptreact",
+					"less",
+					"pug",
+					"sass",
+					"scss",
+					"svelte",
+					"typescriptreact",
+					"vue",
+					"htmlangular",
+					"php",
+					"blade"
+				},
+			},
+			html = {},
+			["nil_ls"] = {},
+			marksman = {},
+			pyright = {},
+			phpactor = {},
+			gopls = {
+				settings = {
+					gopls = {
+						completeUnimported = true,
+						usePlaceholders = true,
+						analyses = {
+							unusedparams = true,
+						},
+					},
+				},
+			},
+			ruff = {},
+			rust_analyzer = {
+				settings = {
+					["rust-analyzer"] = {
+						imports = {
+							granularity = {
+								group = "module",
+							},
+							prefix = "self",
+						},
+						cargo = {
+							buildScripts = {
+								enable = true,
+							},
+						},
+						procMacro = {
+							enable = true,
+						},
+					},
+				},
+			},
+			sqlls = {},
+			yamlls = {},
+			tsserver = {
+				init_options = {
+					preferences = {
+						disableSuggestions = true,
+					},
+				},
+			},
+			lua_ls = {
+				settings = {
+					Lua = {
+						runtime = {
+							-- Tell the language server which version of Lua you're using
+							-- (most likely LuaJIT in the case of Neovim)
+							version = "LuaJIT",
+						},
+						-- Make the server aware of Neovim runtime files
+						workspace = {
+							checkThirdParty = false,
+							library = {
+								vim.env.VIMRUNTIME,
+								-- "${3rd}/luv/library"
+								-- "${3rd}/busted/library",
+							},
+						},
+					},
+				},
+			},
+		}
+
+		-- nvim-cmp supports additional completion capabilities, so broadcast that to servers
+		local capabilities = vim.lsp.protocol.make_client_capabilities()
+		capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
+
+		-- Ensure the servers above are installed
+		local mason_lspconfig = require("mason-lspconfig")
+
+		mason_lspconfig.setup({
+			ensure_installed = vim.tbl_keys(servers),
+			automatic_installation = { exclude = { "astro", "phpactor", "gopls", "rust_analyzer", "sqlls" } },
+		})
+
+		mason_lspconfig.setup_handlers({
+			function(server_name)
+				local _border = "single"
+
+				local default_config = {
+					capabilities = capabilities,
+					on_attach = on_attach,
+					handlers = {
+						["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {
+							border = _border,
+						}),
+						["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
+							border = _border,
+						}),
+					},
+				}
+
+				require("lspconfig")[server_name].setup(
+					vim.tbl_deep_extend("force", default_config, servers[server_name] or {})
+				)
+			end,
+		})
+
+		vim.diagnostic.config({
+			update_in_insert = false,
+			underline = true,
+			float = {
+				source = true
+			},
+			virtual_text = {
+				severity = vim.diagnostic.severity.ERROR,
+				source = true,
+				spacing = -1,
+				prefix = nil,
+				format = function(diagnostic)
+					-- show small error code instead of whole error that probably won't fit in the screen
+					-- to see the whole error use other keybindings
+					return tostring(diagnostic.code)
+				end,
+				virt_text_hide = true
+			},
+			severity_sort = true,
+		})
+
+		-- Customize gutter icons
+		local signs = require("aleidk.constants").icons.diagnostics
+		for type, icon in pairs(signs) do
+			local hl = "DiagnosticSign" .. type
+			vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
+		end
+	end,
+}
--- a/Show more
+++ b/Show more
				`@ -0,0 +1 @@`
				{"php":"8.1.16","version":"3.14.4","indent":" ","lineEnding":"\n","rules":{"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"braces":{"allow_single_line_anonymous_class_with_empty_body":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_typehint":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"imports_order":["class","function","const"],"sort_algorithm":"none"},"return_type_declaration":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_import_per_statement":{"group_to_single_imports":false},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true},"hashes":{"config\/.null-ls_409243_php-cs-fixer-conf.php":"fb71792ed72df5b2976115b4380ef622","config\/.null-ls_800261_php-cs-fixer-conf.php":"1a554594a4eaa31e7bf231c0a93ad00e","config\/.null-ls_450233_php-cs-fixer-conf.php":"1a554594a4eaa31e7bf231c0a93ad00e","config\/.null-ls_536351_php-cs-fixer-conf.php":"5bfcd97c4bfff433fa6da9d289fd7ef9","config\/.null-ls_121074_php-cs-fixer-conf.php":"c116993e570fd1fd0d8e5ff29103a452"}}
				`@ -0,0 +1 @@`
				`gitdir: ../../../../.git/modules/config/foot/themes/catppuccin`