mirror of
https://github.com/vhaudiquet/mymachine.git
synced 2026-02-02 07:06:07 +00:00
Multiple changes towards better Ubuntu support :)
This commit is contained in:
@@ -1,10 +1,13 @@
|
||||
#
|
||||
# mymachine
|
||||
# ~/.bashrc
|
||||
#
|
||||
|
||||
# If not running interactively, don't do anything
|
||||
[[ $- != *i* ]] && return
|
||||
|
||||
# OS-specific information
|
||||
source /etc/os-release
|
||||
|
||||
# History file settings
|
||||
# No duplicate lines / lines starting with space in history
|
||||
HISTCONTROL=ignoreboth
|
||||
@@ -34,7 +37,12 @@ fi
|
||||
source /home/${USER}/.config/prompt.sh
|
||||
|
||||
# Bitwarden SSH agent
|
||||
export SSH_AUTH_SOCK=/home/${USER}/.bitwarden-ssh-agent.sock
|
||||
if [ "${ID}" = "ubuntu" ]; then
|
||||
# On Ubuntu, Bitwarden snap is used, which changes the sock path
|
||||
export SSH_AUTH_SOCK=/home/${USER}/snap/bitwarden/current/.bitwarden-ssh-agent.sock
|
||||
else
|
||||
export SSH_AUTH_SOCK=/home/${USER}/.bitwarden-ssh-agent.sock
|
||||
fi
|
||||
|
||||
# PATH modifications
|
||||
# Local binaries
|
||||
@@ -48,3 +56,5 @@ alias e=${EDITOR}
|
||||
alias l="ls -lla"
|
||||
alias c="clear"
|
||||
alias k="kubectl"
|
||||
|
||||
### End of default bashrc, append anything here
|
||||
|
||||
@@ -26,5 +26,9 @@
|
||||
"workbench.preferredDarkColorTheme": "Adwaita Dark",
|
||||
"workbench.preferredLightColorTheme": "Adwaita Light",
|
||||
"editor.renderLineHighlight": "none",
|
||||
"workbench.tree.indent": 12
|
||||
"workbench.tree.indent": 12,
|
||||
"redhat.telemetry.enabled": false,
|
||||
"telemetry.feedback.enabled": false,
|
||||
"telemetry.telemetryLevel": "off",
|
||||
"docker.lsp.telemetry": "off",
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source /etc/os-release
|
||||
|
||||
parse_git_branch()
|
||||
{
|
||||
branch=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ <\1>/')
|
||||
|
||||
Reference in New Issue
Block a user