common: update config

.gitignore

@@ -0,0 +1 @@
+nvim/lazy-lock.json

.zshrc

@@ -0,0 +1,115 @@
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+
+# Lines configured by zsh-newuser-install
+HISTFILE=~/.histfile
+HISTSIZE=1000
+SAVEHIST=1000
+# End of lines configured by zsh-newuser-install
+# The following lines were added by compinstall
+zstyle :compinstall filename '/home/trianta/.zshrc'
+
+autoload -Uz compinit
+
+compinit
+# End of lines added by compinstall
+zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
+
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+
+# Alias
+alias -g vi="nvim"
+alias -g vim="nvim"
+alias -g cmakegd="cmake -B build -S . -DCMAKE_BUILD_TYPE:STRING=Debug"
+alias -g cmakeg="cmake -B build -S ."
+alias -g cmakeb="cmake --build build -j $(nproc)"
+alias -g pcore="taskset -c 1-7"
+alias -g a="notify"
+alias -g af="taskset -c 0-19 notify"
+alias -g tm="tmux new -A -s"
+
+# Plugins from AUR
+source ~/tools/powerlevel10k/powerlevel10k.zsh-theme
+source ~/tools/zsh-autosuggestions/zsh-autosuggestions.zsh
+source ~/tools/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source ~/tools/zsh-history-substring-search/zsh-history-substring-search.zsh
+
+# Enable color support
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias l='ls -la --color -h --group-directories-first'
+    alias ls='ls --color -h --group-directories-first'
+    alias dir='dir --color=auto'
+    alias vdir='vdir --color=auto'
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+
+# Hyprland login
+alias hy='Hyprland'
+
+# Export ~/.config path
+export XDG_CONFIG_HOME="$HOME/.config"
+
+# Created by `pipx` on 2023-10-16 08:33:15
+export PATH="$PATH:/home/trianta/.local/bin"
+
+# Little neat settings
+set colored-stats On
+set completion-ignore-case On
+set completion-prefix-display-length 3
+set mark-symlinked-directories On
+set show-all-if-ambiguous On
+set show-all-if-unmodified On
+set visible-stats On
+
+# Keyboard binds 
+
+# common
+bindkey "^L" forward-word
+bindkey "^[[H" beginning-of-line
+bindkey "^[[F" end-of-line
+bindkey "^[[3~" delete-char
+
+# Alacritty
+bindkey "^B" beginning-of-line
+bindkey "^E" end-of-line
+bindkey ";3D" backward-word
+bindkey ";3C" forward-word
+bindkey ";5D" backward-word
+bindkey ";5C" forward-word
+bindkey "^H" backward-word
+bindkey '^K' history-substring-search-up
+bindkey '^J' history-substring-search-down
+
+# cool-retro-term
+#bindkey '^K' history-substring-search-up
+#bindkey '^J' history-substring-search-down
+#bindkey '^H' backward-delete-char
+#bindkey '^B' backward-word
+#bindkey '^W' forward-word
+
+# Set default editor
+export EDITOR="nvim"
+
+# Global CMake clangd fix
+export CMAKE_EXPORT_COMPILE_COMMANDS=1
+
+if [[ "$(tty)" == /dev/tty1 ]]; then
+    mount -a && Hyprland
+fi
+
+$(&>/dev/null pw-play --volume=2.0 ~/.alert/ready.mp3 &)
+
+## [Completion]
+## Completion scripts setup. Remove the following line to uninstall
+[[ -f /home/trianta/.config/.dart-cli-completion/zsh-config.zsh ]] && . /home/trianta/.config/.dart-cli-completion/zsh-config.zsh || true
+## [/Completion]
+

alacritty/alacritty.toml

@@ -1,13 +0,0 @@
-import = ["~/.config/alacritty/catppuccin/catppuccin-frappe.toml"]
-
-[cursor.style]
-shape = "Underline"
-
-[font]
-size = 23
-
-[font.normal]
-family = "Hack Nerd Font"
-
-[window]
-opacity = 0.2

alacritty/catppuccin/catppuccin-frappe.toml

@@ -1,75 +0,0 @@
-[colors.primary]
-background = "#303446"
-foreground = "#C6D0F5"
-dim_foreground = "#C6D0F5"
-bright_foreground = "#C6D0F5"
-
-[colors.cursor]
-text = "#303446"
-cursor = "#F2D5CF"
-
-[colors.vi_mode_cursor]
-text = "#303446"
-cursor = "#BABBF1"
-
-[colors.search.matches]
-foreground = "#303446"
-background = "#A5ADCE"
-
-[colors.search.focused_match]
-foreground = "#303446"
-background = "#A6D189"
-
-[colors.footer_bar]
-foreground = "#303446"
-background = "#A5ADCE"
-
-[colors.hints.start]
-foreground = "#303446"
-background = "#E5C890"
-
-[colors.hints.end]
-foreground = "#303446"
-background = "#A5ADCE"
-
-[colors.selection]
-text = "#303446"
-background = "#F2D5CF"
-
-[colors.normal]
-black = "#51576D"
-red = "#E78284"
-green = "#A6D189"
-yellow = "#E5C890"
-blue = "#8CAAEE"
-magenta = "#F4B8E4"
-cyan = "#81C8BE"
-white = "#B5BFE2"
-
-[colors.bright]
-black = "#626880"
-red = "#E78284"
-green = "#A6D189"
-yellow = "#E5C890"
-blue = "#8CAAEE"
-magenta = "#F4B8E4"
-cyan = "#81C8BE"
-white = "#A5ADCE"
-
-[colors.dim]
-black = "#51576D"
-red = "#E78284"
-green = "#A6D189"
-yellow = "#E5C890"
-blue = "#8CAAEE"
-magenta = "#F4B8E4"
-cyan = "#81C8BE"
-white = "#B5BFE2"
-
-[[colors.indexed_colors]]
-index = 16
-color = "#EF9F76"
-
-[[colors.indexed_colors]]
-index = 17
-color = "#F2D5CF"

alacritty/catppuccin/catppuccin-latte.toml

@@ -1,75 +0,0 @@
-[colors.primary]
-background = "#EFF1F5"
-foreground = "#4C4F69"
-dim_foreground = "#4C4F69"
-bright_foreground = "#4C4F69"
-
-[colors.cursor]
-text = "#EFF1F5"
-cursor = "#DC8A78"
-
-[colors.vi_mode_cursor]
-text = "#EFF1F5"
-cursor = "#7287FD"
-
-[colors.search.matches]
-foreground = "#EFF1F5"
-background = "#6C6F85"
-
-[colors.search.focused_match]
-foreground = "#EFF1F5"
-background = "#40A02B"
-
-[colors.footer_bar]
-foreground = "#EFF1F5"
-background = "#6C6F85"
-
-[colors.hints.start]
-foreground = "#EFF1F5"
-background = "#DF8E1D"
-
-[colors.hints.end]
-foreground = "#EFF1F5"
-background = "#6C6F85"
-
-[colors.selection]
-text = "#EFF1F5"
-background = "#DC8A78"
-
-[colors.normal]
-black = "#5C5F77"
-red = "#D20F39"
-green = "#40A02B"
-yellow = "#DF8E1D"
-blue = "#1E66F5"
-magenta = "#EA76CB"
-cyan = "#179299"
-white = "#ACB0BE"
-
-[colors.bright]
-black = "#6C6F85"
-red = "#D20F39"
-green = "#40A02B"
-yellow = "#DF8E1D"
-blue = "#1E66F5"
-magenta = "#EA76CB"
-cyan = "#179299"
-white = "#BCC0CC"
-
-[colors.dim]
-black = "#5C5F77"
-red = "#D20F39"
-green = "#40A02B"
-yellow = "#DF8E1D"
-blue = "#1E66F5"
-magenta = "#EA76CB"
-cyan = "#179299"
-white = "#ACB0BE"
-
-[[colors.indexed_colors]]
-index = 16
-color = "#FE640B"
-
-[[colors.indexed_colors]]
-index = 17
-color = "#DC8A78"

alacritty/catppuccin/catppuccin-macchiato.toml

@@ -1,75 +0,0 @@
-[colors.primary]
-background = "#24273A"
-foreground = "#CAD3F5"
-dim_foreground = "#CAD3F5"
-bright_foreground = "#CAD3F5"
-
-[colors.cursor]
-text = "#24273A"
-cursor = "#F4DBD6"
-
-[colors.vi_mode_cursor]
-text = "#24273A"
-cursor = "#B7BDF8"
-
-[colors.search.matches]
-foreground = "#24273A"
-background = "#A5ADCB"
-
-[colors.search.focused_match]
-foreground = "#24273A"
-background = "#A6DA95"
-
-[colors.footer_bar]
-foreground = "#24273A"
-background = "#A5ADCB"
-
-[colors.hints.start]
-foreground = "#24273A"
-background = "#EED49F"
-
-[colors.hints.end]
-foreground = "#24273A"
-background = "#A5ADCB"
-
-[colors.selection]
-text = "#24273A"
-background = "#F4DBD6"
-
-[colors.normal]
-black = "#494D64"
-red = "#ED8796"
-green = "#A6DA95"
-yellow = "#EED49F"
-blue = "#8AADF4"
-magenta = "#F5BDE6"
-cyan = "#8BD5CA"
-white = "#B8C0E0"
-
-[colors.bright]
-black = "#5B6078"
-red = "#ED8796"
-green = "#A6DA95"
-yellow = "#EED49F"
-blue = "#8AADF4"
-magenta = "#F5BDE6"
-cyan = "#8BD5CA"
-white = "#A5ADCB"
-
-[colors.dim]
-black = "#494D64"
-red = "#ED8796"
-green = "#A6DA95"
-yellow = "#EED49F"
-blue = "#8AADF4"
-magenta = "#F5BDE6"
-cyan = "#8BD5CA"
-white = "#B8C0E0"
-
-[[colors.indexed_colors]]
-index = 16
-color = "#F5A97F"
-
-[[colors.indexed_colors]]
-index = 17
-color = "#F4DBD6"

alacritty/catppuccin/catppuccin-mocha.toml

@@ -1,75 +0,0 @@
-[colors.primary]
-background = "#1E1E2E"
-foreground = "#CDD6F4"
-dim_foreground = "#CDD6F4"
-bright_foreground = "#CDD6F4"
-
-[colors.cursor]
-text = "#1E1E2E"
-cursor = "#F5E0DC"
-
-[colors.vi_mode_cursor]
-text = "#1E1E2E"
-cursor = "#B4BEFE"
-
-[colors.search.matches]
-foreground = "#1E1E2E"
-background = "#A6ADC8"
-
-[colors.search.focused_match]
-foreground = "#1E1E2E"
-background = "#A6E3A1"
-
-[colors.footer_bar]
-foreground = "#1E1E2E"
-background = "#A6ADC8"
-
-[colors.hints.start]
-foreground = "#1E1E2E"
-background = "#F9E2AF"
-
-[colors.hints.end]
-foreground = "#1E1E2E"
-background = "#A6ADC8"
-
-[colors.selection]
-text = "#1E1E2E"
-background = "#F5E0DC"
-
-[colors.normal]
-black = "#45475A"
-red = "#F38BA8"
-green = "#A6E3A1"
-yellow = "#F9E2AF"
-blue = "#89B4FA"
-magenta = "#F5C2E7"
-cyan = "#94E2D5"
-white = "#BAC2DE"
-
-[colors.bright]
-black = "#585B70"
-red = "#F38BA8"
-green = "#A6E3A1"
-yellow = "#F9E2AF"
-blue = "#89B4FA"
-magenta = "#F5C2E7"
-cyan = "#94E2D5"
-white = "#A6ADC8"
-
-[colors.dim]
-black = "#45475A"
-red = "#F38BA8"
-green = "#A6E3A1"
-yellow = "#F9E2AF"
-blue = "#89B4FA"
-magenta = "#F5C2E7"
-cyan = "#94E2D5"
-white = "#BAC2DE"
-
-[[colors.indexed_colors]]
-index = 16
-color = "#FAB387"
-
-[[colors.indexed_colors]]
-index = 17
-color = "#F5E0DC"

deploy.sh

@@ -1,9 +1,31 @@
 #!/bin/bash
 
-echo "Syncing user with alacritty..."
-rsync --recursive $(dirname "$0")/alacritty/ ~/.config/alacritty 
-echo "Syncing user with hypr..."
-rsync --recursive $(dirname "$0")/hypr/ ~/.config/hypr 
-echo "Syncing user with waybar..."
-rsync --recursive $(dirname "$0")/waybar/ ~/.config/waybar 
+echo "Setting up git user..."
+git config --global user.name "trianta"
+git config --global user.email "gregcraw2001@gmail.com"
+git config --global gpg.format ssh
+git config --global user.signingkey ~/.ssh/id_ed25519.pub
+git config --global pull.rebase true
+
+
+echo "Getting tools for environment..."
+if test -d ~/tools;
+then
+    mkdir ~/tools;
+fi
+git clone --depth 1 https://github.com/zsh-users/zsh-autosuggestions.git ~/tools/zsh-autosuggestions
+git clone --depth 1 https://github.com/zsh-users/zsh-history-substring-search.git ~/tools/zsh-history-substring-search
+git clone --depth 1 https://github.com/zsh-users/zsh-syntax-highlighting.git ~/tools/zsh-syntax-highlighting
+git clone --depth 1 https://github.com/romkatv/powerlevel10k.git ~/tools/powerlevel10k
+
+echo "Syncing user with nvim..."
+rsync --delete --recursive $(dirname "$0")/nvim/ ~/.config/nvim 
+
+echo "Syncing user with tmux..."
+echo "  Note: prefix + I for tmux setup"
+mkdir -p ~/tmux
+rsync --recursive $(dirname "$0")/tmux/tmux.conf ~/.config/tmux/tmux.conf
+
+rsync $(dirname "$0")/.zshrc ~/.zshrc
+
 echo "Syncing complete!"

hypr/hyprland.conf

@@ -1,137 +0,0 @@
-# Monitor
-monitor=,highrr,auto,1.00
-
-# Startup
-exec-once = hyprpaper
-exec-once = waybar -c ~/.config/waybar/config.json
-exec-once = pulseaudio
-exec-once = linux-discord-rich-presence --config ~/.config/linux-discord-rich-presencerc
-exec-once = syncthing --no-browser
-
-# Settings
-input {
-    kb_layout = us
-    kb_variant =
-    kb_model =
-    kb_options =
-    kb_rules =
-
-    follow_mouse = 2
-
-    touchpad {
-        natural_scroll = no
-    }
-
-    sensitivity = 0 
-}
-
-general {
-    gaps_in = 5
-    gaps_out = 10
-    border_size = 0
-    layout = dwindle
-}
-
-decoration {
-    rounding = 10
-    blur {
-        enabled = false
-        size = 3
-        passes = 1
-    }
-    drop_shadow = false 
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = rgba(1a1a1aee)
-    active_opacity = 0.75
-    inactive_opacity = 0.75
-}
-
-animations {
-    enabled = yes
-    animation = windows, 1, 8, default
-    animation = windowsOut, 1, 8, default
-    animation = border, 1, 8, default
-    animation = borderangle, 1, 8, default
-    animation = fade, 1, 8, default
-    animation = workspaces, 1, 8, default, slidefade 80%
-}
-
-dwindle {
-    pseudotile = yes 
-    preserve_split = yes 
-}
-
-master {
-    new_is_master = true
-}
-
-gestures {
-    workspace_swipe = off
-}
-
-misc {
-    vfr = true
-    disable_hyprland_logo = true
-    disable_splash_rendering = true
-    force_default_wallpaper = 0
-}
-
-device:epic-mouse-v1 {
-    sensitivity = -0.5
-}
-
-# Window rules
-windowrule = float, ^(SnakePlusPlus)$
-windowrule = center, ^(SnakePlusPlus)$
-
-# General binds
-$mainMod = SUPER
-bind = $mainMod, RETURN, exec, alacritty
-bind = $mainMod SHIFT, P, pseudo
-bind = $mainMod SHIFT, Q, killactive
-bind = $mainMod SHIFT, L, exec, swaylock -e -c 000000
-bind = $mainMod, M, exit, 
-bind = $mainMod, F, fullscreen
-bind = $mainMod, SPACE, togglefloating
-bind = $mainMod, S, exec, wofi --show drun
-bind = $mainMod SHIFT, S, exec, hyprshot -m region --clipboard-only
-
-# Laptop binds
-binde = , XF86MonBrightnessDown, exec, brightnessctl set 5%-
-binde = , XF86MonBrightnessUp, exec, brightnessctl set 5%+
-binde = , XF86AudioMute, exec, pulseaudio-ctl mute
-binde = , XF86AudioLowerVolume, exec, pulseaudio-ctl down
-binde = , XF86AudioRaiseVolume, exec, pulseaudio-ctl up
-
-
-# Move focus 
-bind = $mainMod, h, movefocus, l
-bind = $mainMod, l, movefocus, r
-bind = $mainMod, k, movefocus, u
-bind = $mainMod, j, movefocus, d
-
-# 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
-
-# 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
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
-# sets repeatable binds for resizing the active window
-binde = $mainMod, right, resizeactive, 10 0
-binde = $mainMod, left, resizeactive, -10 0
-binde = $mainMod, up, resizeactive, 0 -10
-binde = $mainMod, down, resizeactive, 0 10
-

hypr/hyprpaper.conf

@@ -1,5 +0,0 @@
-splash = false
-# Single monitor setup
-preload=~/pics/dharmx/nord/holy-arch-nordic.png
-wallpaper=eDP-1,~/pics/dharmx/nord/holy-arch-nordic.png
-ipc = off

hypr/mocha.conf

@@ -1,61 +0,0 @@
-$rosewaterAlpha = fff5e0dc
-$flamingoAlpha  = fff2cdcd
-$pinkAlpha      = fff5c2e7
-$mauveAlpha     = ffcba6f7
-$redAlpha       = fff38ba8
-$maroonAlpha    = ffeba0ac
-$peachAlpha     = fffab387
-$yellowAlpha    = fff9e2af
-$greenAlpha     = ffa6e3a1
-$tealAlpha      = ff94e2d5
-$skyAlpha       = ff89dceb
-$sapphireAlpha  = ff74c7ec
-$blueAlpha      = ff89b4fa
-$lavenderAlpha  = ffb4befe
-
-$textAlpha      = ffcdd6f4
-$subtext1Alpha  = ffbac2de
-$subtext0Alpha  = ffa6adc8
-
-$overlay2Alpha  = ff9399b2
-$overlay1Alpha  = ff7f849c
-$overlay0Alpha  = ff6c7086
-
-$surface2Alpha  = ff585b70
-$surface1Alpha  = ff45475a
-$surface0Alpha  = ff313244
-
-$baseAlpha      = ff1e1e2e
-$mantleAlpha    = ff181825
-$crustAlpha     = ff11111b
-
-$rosewater = 0xfff5e0dc
-$flamingo  = 0xfff2cdcd
-$pink      = 0xfff5c2e7
-$mauve     = 0xffcba6f7
-$red       = 0xfff38ba8
-$maroon    = 0xffeba0ac
-$peach     = 0xfffab387
-$yellow    = 0xfff9e2af
-$green     = 0xffa6e3a1
-$teal      = 0xff94e2d5
-$sky       = 0xff89dceb
-$sapphire  = 0xff74c7ec
-$blue      = 0xff89b4fa
-$lavender  = 0xffb4befe
-
-$text      = 0xffcdd6f4
-$subtext1  = 0xffbac2de
-$subtext0  = 0xffa6adc8
-
-$overlay2  = 0xff9399b2
-$overlay1  = 0xff7f849c
-$overlay0  = 0xff6c7086
-
-$surface2  = 0xff585b70
-$surface1  = 0xff45475a
-$surface0  = 0xff313244
-
-$base      = 0xff1e1e2e
-$mantle    = 0xff181825
-$crust     = 0xff11111b

nvim/after/plugin/binds.lua

@@ -0,0 +1,32 @@
+-- Telescope
+local builtin = require('telescope.builtin')
+vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
+vim.keymap.set('n', '<C-p>', builtin.git_files, {})
+vim.keymap.set('n', '<leader>ps', function()
+    builtin.grep_string({ search = vim.fn.input("Grep > ") })
+end)
+
+-- Harpoon 2
+local harpoon = require("harpoon")
+-- REQUIRED
+harpoon:setup()
+-- REQUIRED
+vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
+vim.keymap.set("n", "<C-t>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
+vim.keymap.set("n", "<C-q>", function() harpoon:list():select(1) end)
+vim.keymap.set("n", "<C-w>", function() harpoon:list():select(2) end)
+vim.keymap.set("n", "<C-e>", function() harpoon:list():select(3) end)
+vim.keymap.set("n", "<C-r>", function() harpoon:list():select(4) end)
+
+-- Fix annoying binds
+vim.keymap.del("n", "<C-W><C-D>")
+vim.keymap.del("n", "<C-W>d")
+
+-- Zenmode
+vim.keymap.set("n", "<leader>pz", function()
+  require("zen-mode").toggle({
+      window = {
+          width = 90,
+      }
+  })
+end)

nvim/after/plugin/settings.lua

@@ -0,0 +1,59 @@
+-- lsp-zero
+local lsp_zero = require('lsp-zero')
+
+lsp_zero.on_attach(function(client, bufnr)
+    local opts = {buffer = bufnr, remap = false}
+
+    vim.keymap.set("n", "<leader>gd", function() vim.lsp.buf.definition() end, opts)
+    vim.keymap.set("n", "<leader>vd", function() vim.lsp.buf.hover() end, opts)
+    vim.keymap.set("n", "<leader>ve", function() vim.diagnostic.open_float() end, opts)
+    vim.diagnostic.config({virtual_text = false})
+end)
+
+-- Cmp
+local cmp = require('cmp')
+local cmp_select = {behavior = cmp.SelectBehavior.Select}
+
+cmp.setup({
+    sources = {
+        {name = 'nvim_lsp'},
+        {name = 'nvim_lsp_signature_help'},
+        {name = 'nvim_lua'},
+        {name = 'luasnip', keyword_length = 2},
+        {name = 'buffer', keyword_length = 3},
+        {name = 'path'},
+    },
+    formatting = lsp_zero.cmp_format(),
+    completion = {
+        completeopt = 'menu,menuone,noinsert'
+    },
+    mapping = cmp.mapping.preset.insert({
+        ['<C-k>'] = cmp.mapping.select_prev_item(cmp_select),
+        ['<C-j>'] = cmp.mapping.select_next_item(cmp_select),
+        ['<C-l>'] = cmp.mapping.confirm({ select = true }),
+        ['<C-Space>'] = cmp.mapping.complete(),
+    }),
+})
+
+-- Treesitter
+vim.opt.runtimepath:append("~/.local/share/nvim/parsers")
+
+require('nvim-treesitter.configs').setup {
+    ensure_installed = {
+        "c", "lua", "vim", "c_sharp", "cpp", "python", "json", "json5",
+        "bibtex", "query" },
+    sync_install = false,
+    auto_install = true,
+    parser_install_dir = "~/.local/share/nvim/parsers",
+    highlight = {
+        enable = true,
+        additional_vim_regex_highlighting = false,
+    },
+}
+
+-- Obsidian
+vim.opt.conceallevel = 1
+
+-- Colors
+vim.o.background = "light" -- or "dark" for dark mode
+vim.cmd([[colorscheme gruvbox]])

nvim/init.lua

@@ -0,0 +1,2 @@
+require('trianta')
+

nvim/lua/trianta/init.lua

@@ -0,0 +1,3 @@
+require("trianta.vim")
+require("trianta.lazy")
+

nvim/lua/trianta/lazy.lua

@@ -0,0 +1,92 @@
+-- Lazy
+
+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)
+
+return require('lazy').setup({
+    {
+        "folke/lazy.nvim",
+        tag = "stable",
+    },
+    {
+        "folke/todo-comments.nvim",
+        dependencies = { "nvim-lua/plenary.nvim" },
+        opts = {
+            -- your configuration comes here
+            -- or leave it empty to use the default settings
+            -- refer to the configuration section below
+        }
+    },
+    { 
+        "ellisonleao/gruvbox.nvim", 
+        name = "gruvbox", 
+        priority = 1000 
+    },
+    -- colors
+    {
+        "nvim-treesitter/nvim-treesitter",
+        lazy = false,
+        build = ":TSUpdate",
+    },
+    {
+        'VonHeikemen/lsp-zero.nvim',
+        branch = 'v3.x',
+        dependencies = {
+            -- LSP Support
+            "neovim/nvim-lspconfig",             -- Required
+
+            -- Autocompletion
+            'hrsh7th/nvim-cmp',         -- Required
+            'hrsh7th/cmp-nvim-lsp',     -- Required
+            'hrsh7th/cmp-buffer',       -- Optional
+            'hrsh7th/cmp-path',         -- Optional
+
+            -- Snippets
+            'L3MON4D3/LuaSnip',             -- Required
+            'rafamadriz/friendly-snippets', -- Optional
+        }
+    },
+    -- navigation
+    {
+        "nvim-telescope/telescope.nvim", 
+        version = '*',
+        dependencies = { "nvim-lua/plenary.nvim" },
+    },
+    {
+        "ThePrimeagen/harpoon",
+        branch = "harpoon2",
+        dependencies = { "nvim-lua/plenary.nvim" },
+    },
+    -- obsidian
+    {
+        "epwalsh/obsidian.nvim",
+        version = "v3.2.0",
+        lazy = true,
+        ft = "markdown",
+        dependencies = {
+            "nvim-lua/plenary.nvim",
+        },
+        opts = {
+            workspaces = {
+                {
+                    name = "trinote",
+                    path = "~/sync/obsidian/Trinote/",
+                },
+            },
+            disable_frontmatter = true,
+        },
+        ui = {
+            enable = true
+        }
+    },
+})

nvim/lua/trianta/vim.lua

@@ -0,0 +1,33 @@
+-- vim core settings
+vim.opt.nu = true
+
+vim.opt.tabstop = 4
+vim.opt.softtabstop = 4
+vim.opt.shiftwidth = 4
+vim.opt.expandtab = true
+
+vim.opt.smartindent = true
+
+vim.opt.wrap = false
+
+vim.opt.hlsearch = false
+vim.opt.incsearch = true
+
+vim.opt.termguicolors = true
+
+vim.opt.scrolloff = 8
+vim.opt.signcolumn = "yes"
+
+vim.opt.updatetime = 50
+
+-- Original limit
+vim.opt.colorcolumn = "80"
+-- Obisidian limit
+-- vim.opt.colorcolumn = "55"
+
+vim.g.mapleader = " "
+
+vim.opt.mouse = ""
+
+vim.g.mapleader = " "
+vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)

tmux/tmux.conf

@@ -0,0 +1,20 @@
+# Start panels at 1
+set -g base-index 1
+set -g pane-base-index 1
+set-window-option -g pane-base-index 1
+set-option -g renumber-windows on
+
+# vi visual bindings
+setw -g mode-keys vi
+bind-key -T copy-mode-vi 'v' send -X begin-selection     # Begin selection in copy mode.
+bind-key -T copy-mode-vi 'C-v' send -X rectangle-toggle  # Begin selection in copy mode.
+bind-key -T copy-mode-vi 'y' send -X copy-selection      # Yank selection in copy mode.
+set-option -g status-keys vi
+set-option -g mouse on 
+
+# Plugins
+set -g @plugin 'catppuccin/tmux'
+set -g @catppuccin_flavour 'mocha' # or frappe, latte, mocha
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+run '/usr/share/tmux-plugin-manager/tpm'

update.sh

@@ -1,9 +1,12 @@
 #!/bin/bash
 
-echo "Syncing dotfiles with alacritty..."
-rsync --recursive ~/.config/alacritty $(dirname "$0")
-echo "Syncing dotfiles with hypr..."
-rsync --recursive ~/.config/hypr $(dirname "$0")
-echo "Syncing dotfiles with waybar..."
-rsync --recursive ~/.config/waybar $(dirname "$0")
+echo "Syncing dotfiles with nvim..."
+rsync --delete --recursive ~/.config/nvim $(dirname "$0")
+
+echo "Syncing dotfiles with tmux..."
+rsync ~/.config/tmux/tmux.conf $(dirname "$0")/tmux/tmux.conf
+
+echo "Syncing dotfiles with zshrc..."
+rsync ~/.zshrc $(dirname "$0")/.zshrc
+
 echo "Syncing complete!"

waybar/config.json

@@ -1,141 +0,0 @@
-[
-    {
-        "name": "main",
-        "layer": "top",
-        "position": "top",
-        "height": 38,
-        "spacing": 4,
-        "margin-top": 4,
-        "margin-bottom": 0,
-        "output": "eDP-1",
-        "modules-left": [
-            "disk", 
-            "memory", 
-            "cpu", 
-            "temperature",
-            "pulseaudio"
-        ],
-        "modules-center": ["hyprland/workspaces"],
-        "modules-right": [
-            "tray", 
-            "network#wifi", 
-            "custom/weather", 
-            "battery",
-            "clock",
-            "custom/poweroff"
-        ],
-        "battery": {
-            "interval": 60,
-            "states": {
-                "warning": 30,
-                "critical": 15
-            },
-            "format": "{icon} {capacity}%",
-            "format-icons": ["", "", "", "", "", ""],
-            "max-length": 25
-        },
-        "clock": {
-            "interval": 1,
-            "format": "<b>{:%H:%M:%S}</b>",
-            "format-alt": "{:%Y-%m-%d}",
-            "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
-        },
-        "cpu": {
-            "format": " {usage}%",
-            "tooltip": false
-        },
-        "disk": {
-            "format": " {}%",
-            "tooltip-format": "{used} / {total} used"
-        },
-        "idle_inhibitor": {
-            "format": "{icon}",
-            "format-icons": {
-                "activated": "",
-                "deactivated": ""
-            }
-        },
-        "memory": {
-            "format": " {}%",
-            "tooltip-format": "{used:0.1f}G / {total:0.1f}G used"
-        },
-        "temperature": {
-            "critical-threshold": 80,
-            "format": "{icon} {temperatureC}°C",
-            "format-icons": ["", "", "", "", ""],
-            "hwmon-path": "/sys/class/thermal/thermal_zone2/temp"
-        },
-        "network#wifi": {
-            "interface": "wlo1",
-            "format-wifi": " {essid} ({signalStrength})%",
-            "format-disconnected": "",
-            "tooltip-format": "{ifname}: {ipaddr}/{cidr}"
-        },
-        "hyprland/workspaces": {
-            "format": "{icon}",
-            "sort-by-number": true,
-            "all-outputs": true,
-            "disable-scroll": true,
-            "active-only": false,
-            "format-icons": {
-                "default": "",
-                "persistent": "",
-                "active": ""
-            },
-            "persistent-workspaces": {
-                "1": [ ],
-                "2": [ ],
-                "3": [ ],
-                "4": [ ],
-                "5": [ ]
-            }
-        },
-        "wlr/taskbar": {
-            "format": "{name}",
-            "icon-size": 32,
-            "tooltip": false,
-            "on-click": "activate",
-            "on-click-right": "close",
-            "all-outputs": true,
-            "ignore-list": [
-                "xwaylandvideobridge"
-            ],
-            "rewrite": {
-                "(.*)Firefox Web Browser": "",
-                "(.*)Discord": "󰙯",
-                "(.*)Alacritty": "",
-                "Steam(.*)": "",
-                "(.*)Spotify": ""
-            }
-        },
-        "pulseaudio": {
-            "format": " {volume}%",
-            "format-muted": " 0%",
-            "max-volume": 100,
-            "scroll-step": 0
-        },
-        "tray": {
-            "icon-size": 21,
-            "spacing": 10
-        },
-        "custom/spotify": {
-            "interval": 1,
-            "return-type": "json",
-            "exec": "~/.config/waybar/scripts/spotify.sh",
-            "exec-if": "pgrep spotify",
-            "escape": true
-        },
-        "custom/poweroff": {
-            "tooltip": false,
-            "format": " ",
-            "on-click": "bash ~/.config/waybar/scripts/poweroff.sh"
-        },
-        "custom/weather": {
-            "exec": "~/.config/waybar/scripts/get_weather.sh Belleville+Illinois",
-            "return-type": "json",
-            "format": "{}",
-            "tooltip": true,
-            "interval": 3600
-        }
-    }
-]

waybar/frappe.css

@@ -1,37 +0,0 @@
-/*
-*
-* Catppuccin Frappe palette
-* Maintainer: rubyowo
-*
-*/
-
-@define-color base   #303446;
-@define-color mantle #292c3c;
-@define-color crust  #232634;
-
-@define-color text     #c6d0f5;
-@define-color subtext0 #a5adce;
-@define-color subtext1 #b5bfe2;
-
-@define-color surface0 #414559;
-@define-color surface1 #51576d;
-@define-color surface2 #626880;
-
-@define-color overlay0 #737994;
-@define-color overlay1 #838ba7;
-@define-color overlay2 #949cbb;
-
-@define-color blue      #8caaee;
-@define-color lavender  #babbf1;
-@define-color sapphire  #85c1dc;
-@define-color sky       #99d1db;
-@define-color teal      #81c8be;
-@define-color green     #a6d189;
-@define-color yellow    #e5c890;
-@define-color peach     #ef9f76;
-@define-color maroon    #ea999c;
-@define-color red       #e78284;
-@define-color mauve     #ca9ee6;
-@define-color pink      #f4b8e4;
-@define-color flamingo  #eebebe;
-@define-color rosewater #f2d5cf;

waybar/mocha.css

@@ -1,37 +0,0 @@
-/*
-*
-* Catppuccin Mocha palette
-* Maintainer: rubyowo
-*
-*/
-
-@define-color base   #1e1e2e;
-@define-color mantle #181825;
-@define-color crust  #11111b;
-
-@define-color text     #cdd6f4;
-@define-color subtext0 #a6adc8;
-@define-color subtext1 #bac2de;
-
-@define-color surface0 #313244;
-@define-color surface1 #45475a;
-@define-color surface2 #585b70;
-
-@define-color overlay0 #6c7086;
-@define-color overlay1 #7f849c;
-@define-color overlay2 #9399b2;
-
-@define-color blue      #89b4fa;
-@define-color lavender  #b4befe;
-@define-color sapphire  #74c7ec;
-@define-color sky       #89dceb;
-@define-color teal      #94e2d5;
-@define-color green     #a6e3a1;
-@define-color yellow    #f9e2af;
-@define-color peach     #fab387;
-@define-color maroon    #eba0ac;
-@define-color red       #f38ba8;
-@define-color mauve     #cba6f7;
-@define-color pink      #f5c2e7;
-@define-color flamingo  #f2cdcd;
-@define-color rosewater #f5e0dc;

waybar/scripts/get_weather.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-# get_weather.sh
-for i in {1..5}
-do
-    text=$(curl -s "https://wttr.in/$1?format=1")
-    if [[ $? == 0 ]]
-    then
-        text=$(echo "$text" | sed -E "s/\s+/ /g")
-        tooltip=$(curl -s "https://wttr.in/$1?format=4")
-        if [[ $? == 0 ]]
-        then
-            tooltip=$(echo "$tooltip" | sed -E "s/\s+/ /g")
-            echo "{\"text\":\"$text\", \"tooltip\":\"$tooltip\"}"
-            exit
-        fi
-    fi
-    sleep 2
-done
-echo "{\"text\":\"error\", \"tooltip\":\"error\"}"

waybar/scripts/poweroff.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-case $(wofi -d -L 6 -l 3 -W 100 -x -100 -y 10 \
-    -D dynamic_lines=true << EOF | sed 's/^ *//'
-    Shutdown
-    Reboot
-    Log off
-    Sleep
-    Lock
-    Cancel
-EOF
-) in
-    "Shutdown")
-        systemctl poweroff
-        ;;
-    "Reboot")
-        systemctl reboot
-        ;;
-    "Sleep")
-        systemctl suspend
-        ;;
-    "Lock")
-        loginctl lock-session
-        ;;
-    "Log off")
-        hyprctl dispatch exit
-        ;;
-esac

waybar/scripts/spotify.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-class=$(playerctl metadata --player=spotify --format '{{lc(status)}}')
-icon=""
-
-if [[ $class == "playing" ]]; then
-  info=$(playerctl metadata --player=spotify --format '{{artist}} - {{title}}')
-  if [[ ${#info} > 40 ]]; then
-    info=$(echo $info | cut -c1-40)"..."
-  fi
-  text=$info" "$icon
-elif [[ $class == "paused" ]]; then
-  text=$icon
-elif [[ $class == "stopped" ]]; then
-  text=""
-fi
-
-echo -e "{\"text\":\""$text"\", \"class\":\""$class"\"}"

waybar/style.css

@@ -1,61 +0,0 @@
-@import "frappe.css";
-
-* {
-    border: none;
-    border-radius: 0px;
-    min-height: 0;
-	font-size: 14px;
-	font-family: "Hack Nerd Font";
-}
-
-window#waybar {
-    background-color: transparent;
-	color: @text;
-}
-
-#workspaces {
-    margin: 4px 0;
-    border-radius: 5px;
-    background: transparent;
-}
-
-#workspaces button {
-    color: @overlay0;
-    background: transparent;
-    transition: all 0.1s ease;
-}
-
-#workspaces button.active {
-    color: @lavender;
-    border-top: 2px solid @lavender;
-    transition: all 0.1s ease;
-}
-
-#clock,
-#cpu,
-#disk,
-#memory,
-#network,
-#temperature,
-#tray,
-#pulseaudio,
-#custom-poweroff,
-#custom-weather {
-	padding: 0 10px;
-}
-
-#pulseaudio {
-	color: @sapphire;
-}
-#disk {
-	color: @peach;
-}
-#memory {
-	color: @teal;
-}
-#cpu {
-	color: @lavender;
-}
-#temperature {
-    color: @sky;
-}