dev1 changes
This commit is contained in:
10
.bashrc
10
.bashrc
@@ -116,6 +116,10 @@ if ! shopt -oq posix; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
## Modified by me
|
## 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
|
### GPG and SSH agent configurations for yubikey
|
||||||
# This is now disabled since i use bw
|
# This is now disabled since i use bw
|
||||||
#export GPG_TTY="$(tty)"
|
#export GPG_TTY="$(tty)"
|
||||||
@@ -192,13 +196,11 @@ fi
|
|||||||
export ompPath="$HOME/.config/oh-my-posh/theme.omp.json"
|
export ompPath="$HOME/.config/oh-my-posh/theme.omp.json"
|
||||||
|
|
||||||
### Start oh my posh
|
### Start oh my posh
|
||||||
|
|
||||||
eval "$(oh-my-posh init bash --config $ompPath)"
|
eval "$(oh-my-posh init bash --config $ompPath)"
|
||||||
|
|
||||||
if [ -d "$HOME/.cargo/env" ]; then
|
if [ -d "$HOME/.cargo/env" ]; then
|
||||||
. "$HOME/.cargo/env"
|
. "$HOME/.cargo/env"
|
||||||
fi
|
fi
|
||||||
### Start tmux if not already in a session
|
|
||||||
if [[ -z "$TMUX" ]]; then
|
|
||||||
tmux attach || tmux new
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -218,7 +218,7 @@ require('lazy').setup({
|
|||||||
-- Then, because we use the `opts` key (recommended), the configuration runs
|
-- Then, because we use the `opts` key (recommended), the configuration runs
|
||||||
-- after the plugin has been loaded as `require(MODULE).setup(opts)`.
|
-- 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',
|
'folke/which-key.nvim',
|
||||||
event = 'VimEnter', -- Sets the loading event to 'VimEnter'
|
event = 'VimEnter', -- Sets the loading event to 'VimEnter'
|
||||||
opts = {
|
opts = {
|
||||||
@@ -299,7 +299,7 @@ require('lazy').setup({
|
|||||||
{ 'nvim-telescope/telescope-ui-select.nvim' },
|
{ 'nvim-telescope/telescope-ui-select.nvim' },
|
||||||
|
|
||||||
-- Useful for getting pretty icons, but requires a Nerd Font.
|
-- 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()
|
config = function()
|
||||||
-- Telescope is a fuzzy finder that comes with a lot of different things that
|
-- 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',
|
'WhoIsSethDaniel/mason-tool-installer.nvim',
|
||||||
|
|
||||||
-- Useful status updates for LSP.
|
-- Useful status updates for LSP.
|
||||||
{ 'j-hui/fidget.nvim', opts = {} },
|
{ 'j-hui/fidget.nvim', opts = {} },
|
||||||
|
|
||||||
-- Allows extra capabilities provided by blink.cmp
|
-- Allows extra capabilities provided by blink.cmp
|
||||||
'saghen/blink.cmp',
|
'saghen/blink.cmp',
|
||||||
@@ -657,9 +657,9 @@ require('lazy').setup({
|
|||||||
-- for you, so that they are available from within Neovim.
|
-- for you, so that they are available from within Neovim.
|
||||||
local ensure_installed = vim.tbl_keys(servers or {})
|
local ensure_installed = vim.tbl_keys(servers or {})
|
||||||
vim.list_extend(ensure_installed, {
|
vim.list_extend(ensure_installed, {
|
||||||
'stylua', -- Used to format Lua code
|
'stylua', -- Used to format Lua code
|
||||||
'vue-language-server',
|
'vue-language-server',
|
||||||
'eslint_d', -- Used in lint.lua
|
'eslint_d', -- Used in lint.lua
|
||||||
'markdownlint', -- Used in lint.lua
|
'markdownlint', -- Used in lint.lua
|
||||||
})
|
})
|
||||||
require('mason-tool-installer').setup { ensure_installed = ensure_installed }
|
require('mason-tool-installer').setup { ensure_installed = ensure_installed }
|
||||||
|
|||||||
Reference in New Issue
Block a user