From bbb6d66a99ceddd65aa7d943684364af02ab3044 Mon Sep 17 00:00:00 2001
From: nold <nold@gnu.one>
Date: Fri, 13 Mar 2020 18:00:12 +0100
Subject: [PATCH] new stuff

---
 bashrc    | 16 +++++++++++++++-
 gitconfig | 50 ++++----------------------------------------------
 2 files changed, 19 insertions(+), 47 deletions(-)

diff --git a/bashrc b/bashrc
index e6d1e37..c01457c 100644
--- a/bashrc
+++ b/bashrc
@@ -42,6 +42,7 @@ eval $(dircolors -b $HOME/.dircolors)
 export LS_OPTIONS=""
 export LESS='-R'
 export TERM=xterm-256color
+export MC_SKIN=$HOME/.mc/lib/solarized.ini
 
 # Aliases
 alias ls="ls --color=always --time-style=long-iso -F"
@@ -56,4 +57,17 @@ alias gpull="git pull"
 alias dcu="docker-compose up -d --remove-orphans"
 alias dcd="docker-compose down"
 alias dcp="docker-compose pull"
-alias dcb="docker build ."
+alias dcb="docker-compose build"
+alias dcl="docker-compose logs"
+alias dclf="docker-compose logs --tail=50 -f"
+
+# k3s / k8s / helm
+alias k="kubectl"
+alias kga="kubectl get all --all-namespaces -o wide"
+alias kgn="kubectl get nodes -o wide"
+alias kgp="kubectl get pods -o wide"
+
+alias dfh="df -hT -t ext4 -t zfs"
+alias lsof='lsof 2>/dev/null | grep'
+#source <(kubectl completion bash)
+#source <(helm completion bash)
diff --git a/gitconfig b/gitconfig
index 33fb261..9614683 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,47 +1,5 @@
- [user]
+# Das ist Git's benutzerspezifische Konfiguraionsdatei.
+[user]
+# Bitte passen Sie die folgenden Zeilen an und kommentieren Sie diese aus:
+	name = nold
 	email = nold@gnu.one
-	name = Gerrit Pannek
- 
- [status]
-         showUntrackedFiles = all
-
-[alias]
-    f   = fetch -v
-    l   = log --all --graph --decorate=full --pretty=fuller --date-order --full-history
-    r   = rebase origin/master master
-    c   = commit -m
-    s   = status
-    logv  = log --graph --decorate=full --date-order --full-history --date=local master HEAD
-    logvr = log --graph --decorate=full --date-order --full-history --date=local master HEAD origin/master
-    logva = log --graph --decorate=full --date-order --full-history --date=local --all
-    logpf = log --patch --follow
-    dt    = difftool
-    mt    = mergetool
-
-[push]
-	#default = current
-    default = simple
-
-[core]
-    autocrlf = input
-
-[color]
-    ui = auto
-
-#[color "diff"]
-#    whitespace = red reverse
-[pull]
-    rebase = true
-[clean]
-    requireForce = true
-[merge]
-    tool = vimdiff3
-    conflictstyle = diff3
-    ff = only
-#[diff]
-#    tool = vimdiff
-[mergetool]
-    prompt = false
-[difftool]
-    prompt = false
-