From 58089f5259dbbbe9f01c038eebddb4a0d1cb505a Mon Sep 17 00:00:00 2001 From: wholteza Date: Mon, 8 Dec 2025 08:02:34 +0000 Subject: [PATCH] dev1 changes --- .bashrc | 10 ++++++---- .config/nvim/init.lua | 10 +++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.bashrc b/.bashrc index 72181e7..e8d2dbd 100644 --- a/.bashrc +++ b/.bashrc @@ -116,6 +116,10 @@ if ! shopt -oq posix; then fi ## Modified by me +### Start tmux if not already in a session +if [[ -z "$TMUX" ]]; then + tmux attach || tmux new +fi ### GPG and SSH agent configurations for yubikey # This is now disabled since i use bw #export GPG_TTY="$(tty)" @@ -192,13 +196,11 @@ fi export ompPath="$HOME/.config/oh-my-posh/theme.omp.json" ### Start oh my posh + eval "$(oh-my-posh init bash --config $ompPath)" + if [ -d "$HOME/.cargo/env" ]; then . "$HOME/.cargo/env" fi -### Start tmux if not already in a session -if [[ -z "$TMUX" ]]; then - tmux attach || tmux new -fi diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 7c98c63..d0224f0 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -218,7 +218,7 @@ require('lazy').setup({ -- Then, because we use the `opts` key (recommended), the configuration runs -- after the plugin has been loaded as `require(MODULE).setup(opts)`. - { -- Useful plugin to show you pending keybinds. + { -- Useful plugin to show you pending keybinds. 'folke/which-key.nvim', event = 'VimEnter', -- Sets the loading event to 'VimEnter' opts = { @@ -299,7 +299,7 @@ require('lazy').setup({ { 'nvim-telescope/telescope-ui-select.nvim' }, -- Useful for getting pretty icons, but requires a Nerd Font. - { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, + { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, }, config = function() -- Telescope is a fuzzy finder that comes with a lot of different things that @@ -407,7 +407,7 @@ require('lazy').setup({ 'WhoIsSethDaniel/mason-tool-installer.nvim', -- Useful status updates for LSP. - { 'j-hui/fidget.nvim', opts = {} }, + { 'j-hui/fidget.nvim', opts = {} }, -- Allows extra capabilities provided by blink.cmp 'saghen/blink.cmp', @@ -657,9 +657,9 @@ require('lazy').setup({ -- for you, so that they are available from within Neovim. local ensure_installed = vim.tbl_keys(servers or {}) vim.list_extend(ensure_installed, { - 'stylua', -- Used to format Lua code + 'stylua', -- Used to format Lua code 'vue-language-server', - 'eslint_d', -- Used in lint.lua + 'eslint_d', -- Used in lint.lua 'markdownlint', -- Used in lint.lua }) require('mason-tool-installer').setup { ensure_installed = ensure_installed }