Compare commits

..

5 commits

Author SHA1 Message Date
6d67c096b3 vim: disable auto indent in insert mode
Signed-off-by: Michael Grote <michael.grote@posteo.de>
2024-11-12 22:33:08 +01:00
2663f8a594 setup: add git and ssh symlinks
Signed-off-by: Michael Grote <michael.grote@posteo.de>
2024-11-12 22:21:44 +01:00
3690d11118 add .gitignore
Signed-off-by: Michael Grote <michael.grote@posteo.de>
2024-11-12 21:50:23 +01:00
868a666c2a tmux: switch binds
Signed-off-by: Michael Grote <michael.grote@posteo.de>
2024-11-10 10:01:18 +01:00
c54411a2d9 tmux: open pane in same dir
Signed-off-by: Michael Grote <michael.grote@posteo.de>
2024-11-10 09:56:04 +01:00
19 changed files with 77 additions and 374 deletions

View file

@ -26,7 +26,7 @@ alias glast="git log -1 HEAD --stat"
alias gd="git difftool"
alias gsp="git stage -p"
alias gflog="git log -- "
alias gb="git --no-pager branch -l"
alias gb="git branch"
# docker
alias dcu="docker compose up"
alias dlogs="docker compose logs -f"

View file

@ -4,35 +4,27 @@
unalias ll 2>/dev/null
# source extra files
source "${HOME}/repos/dotfiles/.bash_aliases"
source "${HOME}/repos/dotfiles/.bash_functions"
source "${HOME}/repos/dotfiles/.bash_ps1"
source "${HOME}/dotfiles/.bash_aliases"
source "${HOME}/dotfiles/.bash_functions"
source "${HOME}/dotfiles/.bash_ps1"
### PATH
# add my scripts to PATH
PATH=$PATH:"${HOME}/repos/dotfiles/scripts"
PATH=$PATH:"${HOME}/dotfiles/scripts"
## check interactive shell https://unix.stackexchange.com/questions/26676/how-to-check-if-a-shell-is-login-interactive-batch
if [[ $- == *i* ]] ; then
### root alias
alias root='sudo -H -u root /usr/bin/sudo2uls'
if [ "$HOSTNAME" = lzeorpt001 ]; then
### git-bash
source /usr/share/git-core/contrib/completion/git-prompt.sh
### keychain
export GPG_TTY=$(tty)
# git commit usw.
export EDITOR="/usr/bin/vim"
fi
### tmux auto attach
### tmux auto attach
# Check if the user ID is not 0 (root)
if [ "$EUID" -ne 0 ]; then
# then auto attach
if command -v tmux &> /dev/null && [ -z "$TMUX" ]; then
tmux attach -t default || tmux new -s default
fi
if [ "$HOSTNAME" == "lzeorpt001" ] || [ "$HOSTNAME" == "lbdlspa001" ]; then
eval $(keychain -q --eval --timeout 60 --agents ssh,gpg)
fi
fi
### keychain
eval "$(keychain -q --eval --timeout 60 --agents ssh,gpg)"
export GPG_TTY=$(tty)
### Praktische Dinge
# Deaktiviere FlowControl
# https://unix.stackexchange.com/questions/332791/how-to-permanently-disable-ctrl-s-in-terminal
@ -59,4 +51,5 @@ export HISTCONTROL=ignoreboth:erasedups
# typo bei cd entfernen
shopt -s cdspell
export LESS='eFRX'
# less mit maus scrollen
export LESS='--mouse --wheel-lines=3 eFRX'

View file

@ -10,3 +10,7 @@ function ssh {
tmux rename-window "$(hostname -f)"
fi
}
function gp {
git pull "$@"
}

View file

@ -1,8 +0,0 @@
# .bash_profile
# Get the aliases and functions
if [ -f ~/.bashrc ]; then
. ~/.bashrc
fi
# User specific environment and startup programs

View file

@ -8,6 +8,7 @@ BLACK='\[\e[30m\]'
RESET='\[\e[0m\]'
ORANGE='\[\e[0;33m\]'
# git-symbole: * unstaged, + staged, $ stashed, % untracked
source /usr/lib/git-core/git-sh-prompt
export GIT_PS1_SHOWUNTRACKEDFILES=1
export GIT_PS1_SHOWDIRTYSTATE=1
export GIT_PS1_SHOWSTASHSTATE=1

View file

@ -1 +0,0 @@
source ~/repos/dotfiles/.bash_extra

View file

@ -1,7 +1,6 @@
[user]
name = Michael Grote
email = michael.grote@dataport.de
signingkey = 61CCE602D9EC9A33
email = michael.grote@posteo.de
[credential]
helper = store
[alias]

7
.gitignore vendored Normal file
View file

@ -0,0 +1,7 @@
git.mgrote.net*
github*
github.pub*
mgrote.net*
mikrotik_ed25519*
qnap_papa*
known_hosts*

View file

@ -1,33 +1,47 @@
StrictHostKeyChecking no
### ssh-agent
IgnoreUnknown UseKeychain
UseKeychain yes
AddKeysToAgent yes
LogLevel ERROR
SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION LC_ALL
Host l*.mgmt.dpaor.org l*.landsh.de l*.stadt.hamburg.de l*.hb-netz.de l*.lsa-net.de 10.62.*
User grotemi-admin@mgmt.dpaor.org
### keys
StrictHostKeyChecking=accept-new
# https://stackoverflow.com/questions/21383806/how-can-i-force-ssh-to-accept-a-new-host-fingerprint-from-the-command-line
Host *.dpaor.net *.dpaorinp.de 10.61.* 10.65.*
User grotemi-admin@dpaor.net
### mgrote.net
Host fileserver3.mgrote.net
Host docker10.mgrote.net
Host pve5.mgrote.net
Host forgejo.mgrote.net
Host ldap.mgrote.net
Host pve5-test.mgrote.net
Host vm-test-2404.mgrote.net
Host pbs-test.mgrote.net
Host pbs.mgrote.net
Host munin.mgrote.net
Host blocky.mgrote.net
Host *.mgrote.net
IdentityFile ~/.ssh/mgrote.net
Host git.dataport.de
HostName git.dataport.de
User git
PreferredAuthentications publickey
Port 2200
IdentityFile ~/.ssh/zcdi-gitlab
### Ubiquity
Host nanohd-wohnzimmer.mgrote.net
User ubi_ssh_admin
HostKeyAlgorithms=+ssh-dss
Host gitlab.dataport.de
Hostname gitlab.dataport.de
User git
PreferredAuthentications publickey
IdentityFile ~/.ssh/adminptf-gitlab
AddKeysToAgent yes
### Mikrotik
Host rb5009.mgrote.net crs305.mgrote.net hex.mgrote.net
User admin
IdentityFile ~/.ssh/mikrotik_ed25519
Host gitlab.cicd.apps.okd001.mcmp-stage.dsc.dataport.de
User git
PreferredAuthentications publickey
IdentityFile ~/.ssh/rz40_gitlab
AddKeysToAgent yes
### papa.lan
Host qnap-nas
HostName 192.168.3.108
User extraadmin
IdentityFile ~/.ssh/qnap_papa
### ssh-key für git clone
Host git.mgrote.net
IdentityFile ~/.ssh/git.mgrote.net
Host github.com
User git
IdentityFile ~/.ssh/github.com

View file

@ -44,8 +44,10 @@ set -g status-left-length 20
# Splits
unbind '"'
unbind %
bind | split-window -h
bind - split-window -v
# setze Bind auf logische Zeichen & öffne in Pane in aktuellen Dir
# https://github.com/jbranchaud/til/blob/master/tmux/open-new-splits-to-the-current-directory.md
bind - split-window -v -c "#{pane_current_path}"
bind | split-window -h -c "#{pane_current_path}"
# Address vim mode switching delay (http://superuser.com/a/252717/65504)
set -s escape-time 0

10
.vimrc
View file

@ -255,11 +255,7 @@ endif
augroup spell
autocmd!
autocmd FileType * highlight SpellBad cterm=underline ctermfg=red ctermbg=NONE
if $HOSTNAME == "lbdlspa001"
autocmd FileType * set spellfile=~/repos/dotfiles/vim/spell/own.add
elseif $HOSTNAME == "lzeorpt001"
autocmd FileType * set spellfile=/homes/MGMT/grotemi-admin/repos/dotfiles/vim/spell/own.add
endif
autocmd FileType * set spellfile=~/dotfiles/vim/spell/own.add
autocmd FileType * set spellsuggest=fast,10
autocmd FileType * set spell spelllang=de_de,en
augroup END
@ -272,3 +268,7 @@ autocmd!
autocmd FileType yml setlocal ai ts=2 sw=2 et
autocmd FileType yaml,yml setlocal ai ts=2 sw=2 et
augroup END
" polyglot
" disable reindenting of the current line in insert mode
autocmd BufEnter * set indentexpr=

View file

@ -1,9 +0,0 @@
#!/bin/bash
if [ -n "${TMUX}" ]; then
remotename=$(git remote -v | cut -f2 -d"@" | cut -f1 -d":" | head -n1)
tmux rename-window "SSH: $remotename"
fi
git pull
if [ -n "${TMUX}" ]; then
tmux rename-window "$(basename $(pwd))"
fi

View file

@ -1 +0,0 @@
git_pull

Binary file not shown.

Binary file not shown.

View file

@ -9,6 +9,8 @@ git clone https://git.mgrote.net/mg/dotfiles ~/dotfiles
ln -s ~/dotfiles/.tmux.conf ~/.tmux.conf
ln -s ~/dotfiles/.vimrc ~/.vimrc
ln -s ~/dotfiles/.gitconfig ~/.gitconfig
ln -s ~/dotfiles/.ssh ~/.ssh
ln -s ~/dotfiles/vim/spell/ ~/.vim/

View file

@ -1,4 +0,0 @@
#!/bin/bash
if [ "$HOSTNAME" = lbdlspa001 ]; then
rsync -av --delete -e ssh /home/.autofs/lunixpf001/home-linux/grotemi-admin/repos/ lzeorpt001.mgmt.dpaor.org:/homes/MGMT/grotemi-admin/repos
fi

View file

@ -1,298 +1,2 @@
dotfiles
Ansible
LVM
PV
LV
YAML
Orchestrierungs
Konfigmanagementools
Patchmanagement
TDC
Konfigmanagment
Ausbildungscloud
TOML
yaml
lvm
ansible
Shellcheck
committen
gitlab
dataport
linux
Gruppenkeepass
ARTIFACTORY
Tokenname
Paketrepository
Installierbarkeit
Skripte
Artifactory
Paketrepo
config
forken
PRs
ci
Baseimage
buildcontainer
yml
Hauptbranch
shellcheck
gitleaks
StackOverflow
yamllint
gepushed
tl
dr
Monorepository
Grote
Paketrepos
comitted
gemerged
Mitgeltende
Protokollierungskonzeptes
fachbereichsbezogenen
BHB
BD
Basisinfrastrukturdienst
Multiverfahrensdienst
MVD
RZ
Protokollierungskonzept
Mandantenkonzept
TST
LDN
zzeor
d001
PSQL
TZ4
RHEL9
QS
awx
keycloak
RDP
Kubernetes
Webhook
FluxCD
Quellrepository
OCI
Containerregistry
SHA256
Checksummen
SSO
ZEOR
Loadbalancer
Fileservice
artifactory
CMDB
OCP
Releasemanagementkonzept
Patchmanagementkonzept
lzeor
Patchfenster
zLinux
Postgres
gepatcht
Notfallvorsorgemanagement
Multiverfahrensdienste
OpenShift
RedHat
NTP
PTR
FQDN
Infoblox
WinRM
ALG
ESXi
ServiceCMBD
MGMT
SLA
BSI
Notfallhandbücher
checkMK
S3
etcd
zcdi
CONFIGFILE
shyaml
xargs
amd64
fi
podman
Herstellerrepositories
Multiline
debian12
ubuntu20
ubuntu22
rhel7
rhel8
rhel9
sles12
sles15
dists
Configdatei
baseimages
microdnf
ubi7
ubi8
ubi9
dnf
txt
tmp
mv
fpm
SHA
env
EOF
dpkg
usr
opensuse
zypper
test
RHEL
SLES
reddit
localhost
hostname
Tanium
shawn
huebner
hostvars
tanium
Hospitationsanfragen
Timeboxing
Ditmar
FVM
JIRA
TQ
grundschutzkonform
dSecurecloud
Präsenzrunde
Postinstall
Releasekonzept
Ressourcelimits
OOM
KIMs
zzeorqd001
zzeorpd001
AAP
TODO
ServiceCMDB
Fur/!
EE
ee
zeor
Patchlaufs
Paketrepositories
md
Replikationsdatenbank
vorgefiltert
#in
ein/!
ein
Shortnames
Datacenter
apiVersion
nfs
subdir
argocd
argoproj
enableAutoSync
#eyCloak
ArgoCD
KeyCloak/!
FFMPEG
grotemi
lbdlspa001
mgmt
dpaor
ctrl
#uestion
quote
tmux
Workaround/!
Workaround
TVM
DCS
TZ
PoC
CoreOS
Konfigurationsmgmt
IPv6
HANA
KRB
SMB
Hiera
Puppetversion
SuMa
GSC
sysctl
Cloudera
Feldhoff
Entwicklungssharepoint
vllt
rsync
chown
chmod
ed25519
scp
sudo
systemctl
sshd
X11
buildah
zentro
python3
pip3
releasever
basearch
fedoraepel
EPEL
nodejs
baseurl
gpgcheck
gpgkey
lzeorpt001
noqa
k8s
mkdir
cp
ln
kommandozeilentools1
url
github
SLB
hostet
heredoc
#uestion
question/!
question
#TDOUT
Kommandozeilentools/!
STDOUT/!
#ur/!
fur/!
eingegebende
bashrc
sourcen
Sharepoint
GitLab
Anderungen/!
#rstmal
#rstmal/!
#rstmal
postinstall
Systeminfrastrukturdiagramm
Dederke
Mezger
SLES12
#rstmal
#rstmal
erstmal/!
erstmal
PaaS
CMP
SelfService
MarkDown
RHEL7
VFAT
HW
FHHNET

Binary file not shown.