From 4d3a501413b9228aedd89286a504325e9f8e4a5f Mon Sep 17 00:00:00 2001 From: trianta Date: Thu, 5 Feb 2026 03:11:23 -0600 Subject: [PATCH] common: update config --- .zshrc | 10 +++++++++- nvim/after/plugin/settings.lua | 11 ++--------- nvim/lua/trianta/lazy.lua | 4 ++-- nvim/lua/trianta/vim.lua | 7 +++++-- tmux/tmux.conf | 8 ++++++++ 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/.zshrc b/.zshrc index b995a73..620564f 100644 --- a/.zshrc +++ b/.zshrc @@ -102,6 +102,14 @@ export EDITOR="nvim" # Global CMake clangd fix export CMAKE_EXPORT_COMPILE_COMMANDS=1 -[[ "$(tty)" == /dev/tty1 ]] && Hyprland +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] + diff --git a/nvim/after/plugin/settings.lua b/nvim/after/plugin/settings.lua index f185d6e..cff7806 100644 --- a/nvim/after/plugin/settings.lua +++ b/nvim/after/plugin/settings.lua @@ -55,12 +55,5 @@ require('nvim-treesitter.configs').setup { vim.opt.conceallevel = 1 -- Colors -function ColorMyPencils(color) - color = color or "catppuccin-frappe" - vim.cmd.colorscheme(color) - - vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) - vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) -end - -ColorMyPencils() +vim.o.background = "light" -- or "dark" for dark mode +vim.cmd([[colorscheme gruvbox]]) diff --git a/nvim/lua/trianta/lazy.lua b/nvim/lua/trianta/lazy.lua index 1e0e26c..e9799a2 100644 --- a/nvim/lua/trianta/lazy.lua +++ b/nvim/lua/trianta/lazy.lua @@ -28,8 +28,8 @@ return require('lazy').setup({ } }, { - "catppuccin/nvim", - name = "catppuccin", + "ellisonleao/gruvbox.nvim", + name = "gruvbox", priority = 1000 }, -- colors diff --git a/nvim/lua/trianta/vim.lua b/nvim/lua/trianta/vim.lua index 61e5b22..8ec7321 100644 --- a/nvim/lua/trianta/vim.lua +++ b/nvim/lua/trianta/vim.lua @@ -8,7 +8,7 @@ vim.opt.expandtab = true vim.opt.smartindent = true -vim.opt.wrap = true +vim.opt.wrap = false vim.opt.hlsearch = false vim.opt.incsearch = true @@ -20,7 +20,10 @@ vim.opt.signcolumn = "yes" vim.opt.updatetime = 50 -vim.opt.colorcolumn = "80" +-- Original limit +-- vim.opt.colorcolumn = "80" +-- Obisidian limit +vim.opt.colorcolumn = "65" vim.g.mapleader = " " diff --git a/tmux/tmux.conf b/tmux/tmux.conf index fd1c1c3..01434c7 100755 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -4,6 +4,14 @@ 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