Compare commits
No commits in common. "ba66d19968bd72e85e5bf1dde0203c387de0d876" and "fd7c6f0ace94e4297e40ad68be9b574a04eddeda" have entirely different histories.
ba66d19968
...
fd7c6f0ace
5 changed files with 131 additions and 71 deletions
45
.gitconfig
45
.gitconfig
|
@ -1,40 +1,41 @@
|
||||||
[user]
|
[user]
|
||||||
name = Michael Grote
|
name = Michael Grote
|
||||||
email = michael.grote@posteo.de
|
email = michael.grote@posteo.de
|
||||||
[credential]
|
[credential]
|
||||||
helper = store
|
helper = store
|
||||||
[alias]
|
[alias]
|
||||||
remote = remote -v
|
remote = remote -v
|
||||||
[core]
|
[core]
|
||||||
autocrlf = input
|
autocrlf = input
|
||||||
whitespace = blank-at-eol,space-before-tab,blank-at-eof
|
whitespace = blank-at-eol,space-before-tab,blank-at-eof
|
||||||
[help]
|
[help]
|
||||||
autocorrect = 20 # https://opensource.com/article/20/11/git-aliases
|
autocorrect = 20 # https://opensource.com/article/20/11/git-aliases
|
||||||
[status]
|
[status]
|
||||||
showUntrackedFiles = all
|
showUntrackedFiles = all
|
||||||
[push]
|
[push]
|
||||||
default = simple
|
default = simple
|
||||||
[pull]
|
[pull]
|
||||||
rebase = true
|
rebase = true
|
||||||
autostash = true
|
autostash = true
|
||||||
[merge]
|
[merge]
|
||||||
conflictStyle = diff3
|
conflictStyle = diff3
|
||||||
autostash = true
|
autostash = true
|
||||||
[rebase]
|
[rebase]
|
||||||
autostash = true
|
autostash = true
|
||||||
[diff]
|
[diff]
|
||||||
renames = true
|
renames = true
|
||||||
wsErrorHighlight = all
|
wsErrorHighlight = all
|
||||||
[fetch]
|
[fetch]
|
||||||
prune = true
|
prune = true
|
||||||
[safe]
|
[safe]
|
||||||
directory = ~/dotfiles
|
directory = ~/dotfiles
|
||||||
[advice]
|
[advice]
|
||||||
addIgnoredFile = true
|
addIgnoredFile = true
|
||||||
addEmptyPathspec = false
|
addEmptyPathspec = false
|
||||||
[commit]
|
[commit]
|
||||||
verbose = true
|
verbose = true
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
[diff]
|
[diff]
|
||||||
tool = vimdiff
|
tool = vimdiff
|
||||||
|
|
||||||
|
|
24
.ssh/config
24
.ssh/config
|
@ -20,28 +20,28 @@ Host pbs-test.mgrote.net
|
||||||
Host pbs.mgrote.net
|
Host pbs.mgrote.net
|
||||||
Host blocky.mgrote.net
|
Host blocky.mgrote.net
|
||||||
Host *.mgrote.net
|
Host *.mgrote.net
|
||||||
IdentityFile ~/.ssh/mgrote.net
|
IdentityFile ~/.ssh/mgrote.net
|
||||||
|
|
||||||
### Ubiquity
|
### Ubiquity
|
||||||
Host nanohd-wohnzimmer.mgrote.net
|
Host nanohd-wohnzimmer.mgrote.net
|
||||||
User ubi_ssh_admin
|
User ubi_ssh_admin
|
||||||
HostKeyAlgorithms=+ssh-dss
|
HostKeyAlgorithms=+ssh-dss
|
||||||
|
|
||||||
### Mikrotik
|
### Mikrotik
|
||||||
Host rb5009.mgrote.net crs305.mgrote.net hex.mgrote.net
|
Host rb5009.mgrote.net crs309.mgrote.net crs305.mgrote.net hex.mgrote.net
|
||||||
User admin
|
User admin
|
||||||
IdentityFile ~/.ssh/mikrotik_ed25519
|
IdentityFile ~/.ssh/mikrotik_ed25519
|
||||||
|
|
||||||
### papa.lan
|
### papa.lan
|
||||||
Host qnap-nas
|
Host qnap-nas
|
||||||
HostName 192.168.3.108
|
HostName 192.168.3.108
|
||||||
User extraadmin
|
User extraadmin
|
||||||
IdentityFile ~/.ssh/qnap_papa
|
IdentityFile ~/.ssh/qnap_papa
|
||||||
|
|
||||||
### ssh-key für git clone
|
### ssh-key für git clone
|
||||||
Host git.mgrote.net
|
Host git.mgrote.net
|
||||||
IdentityFile ~/.ssh/git.mgrote.net
|
IdentityFile ~/.ssh/git.mgrote.net
|
||||||
|
|
||||||
Host github.com
|
Host github.com
|
||||||
User git
|
User git
|
||||||
IdentityFile ~/.ssh/github.com
|
IdentityFile ~/.ssh/github.com
|
||||||
|
|
|
@ -1,29 +0,0 @@
|
||||||
---
|
|
||||||
steps:
|
|
||||||
gitleaks:
|
|
||||||
image: zricethezav/gitleaks:v8.18.2
|
|
||||||
commands:
|
|
||||||
- gitleaks detect --no-git --verbose --source $CI_WORKSPACE
|
|
||||||
when:
|
|
||||||
- evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"'
|
|
||||||
|
|
||||||
hadolint:
|
|
||||||
image: pipelinecomponents/hadolint:0.26.1
|
|
||||||
commands:
|
|
||||||
- hadolint Dockerfile
|
|
||||||
when:
|
|
||||||
- evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"'
|
|
||||||
|
|
||||||
shellcheck:
|
|
||||||
image: "koalaman/shellcheck-alpine:v0.10.0"
|
|
||||||
commands:
|
|
||||||
- |
|
|
||||||
find . -type f -not -path './.git/*' -not -path './collections/*' -exec file {} \; | while IFS= read -r line; do
|
|
||||||
if echo "$line" | grep -q "shell script"; then
|
|
||||||
file_path=$(echo "$line" | awk -F':' '{print $1}')
|
|
||||||
shellcheck "$file_path"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
when:
|
|
||||||
- evaluate: 'CI_COMMIT_AUTHOR_EMAIL != "renovate@mgrote.net"'
|
|
||||||
...
|
|
96
README.md
Normal file
96
README.md
Normal file
|
@ -0,0 +1,96 @@
|
||||||
|
# dotfiles
|
||||||
|
|
||||||
|
|
||||||
|
## vim
|
||||||
|
|
||||||
|
Leader = `,`
|
||||||
|
|
||||||
|
| Keybinding | Aktion | |
|
||||||
|
| --------------- | ----------------------------------------------------------------------------- | ------ |
|
||||||
|
| Leader+z | Toggle Line Numbers | |
|
||||||
|
| Leader+m | Toggle Markdown Preview | |
|
||||||
|
| Leader+p | Toggle Paste-Mode | |
|
||||||
|
| Leader+h | Toggle Cursorline | |
|
||||||
|
| Leader+dh | Setze Highlighting + Suche neu | |
|
||||||
|
| Leader+sc | Öffnet ShellCheck; gb öffnet die Definition auf github | |
|
||||||
|
| Leader+cn/cp | Wechsle durch Quickfix-Windows hoch/runter | |
|
||||||
|
| Ctrl+j/k | wechsle Buffer ab/aufwärts | |
|
||||||
|
| Ctrl+s | Speichern | |
|
||||||
|
| Ctrl+w | Schließen | |
|
||||||
|
| Ctrl+f | Fuzzy Search nach Dateien | |
|
||||||
|
| Ctrl+l | Fuzzy Search nach Zeilen in Datei | |
|
||||||
|
| Ctrl+k/l | wechsle Buffer ab/aufwärts | |
|
||||||
|
| \\\\\ | Setze mehrfachen Cursor oder Ctrl-n dann Enter pro Cursor | # 3x \ |
|
||||||
|
| * | Suche Wort unter dem Cursor | |
|
||||||
|
| `s<char><char>` | Sucht nach dem nächsten Vorkommen der beiden Buchstaben, Wiederholung mit `s` | |
|
||||||
|
| viw/yiw | Markiere/Kopiere Wort unter Cursor | |
|
||||||
|
|
||||||
|
### Tipps
|
||||||
|
|
||||||
|
| Aktion | Erklärung |
|
||||||
|
| ------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------- |
|
||||||
|
| `viw/vi'/vi$/vaX` | Visual Selection bis x |
|
||||||
|
| 'V 10 j/k' | Visual Selection 10 Zeilen runter |
|
||||||
|
| ```args `find . -type f -name *.sh` danach argsdo %s/suche/ersetze/ge``` | Suchen ersetzen in allen Dateien |
|
||||||
|
| In `Visual-Mode` `ga` | öffnet EasyAlign |
|
||||||
|
| In `Visual-Mode` `:sort` oder `:sort u` | sortieren/sortieren und doppelte löschen |
|
||||||
|
| In `Visual-Block` `I` <Zeichen> `Esc` | Text ein/auskommentieren |
|
||||||
|
| mark setzen `m<zeichen>`, hinspringen `'<zeichen>'` | Marks |
|
||||||
|
| ``cs"'`` // ``ds"`` // ``ysiw"`` | Tausche Anführunsgzeichen um Wort gegen Ticks, entferne umschließende Anführungszeichen, füge umschließende Anführungszeichen hinzu |
|
||||||
|
| ``Ctrl+x Ctrl+f`` im `Insert-Mode` | Pfadvervollständigung |
|
||||||
|
|
||||||
|
|
||||||
|
## tmux
|
||||||
|
|
||||||
|
| Shortcut | Befehl |
|
||||||
|
| ------------------ | ------------------------------------------------------------------- |
|
||||||
|
| Präfix+w | Schließe Windows |
|
||||||
|
| Präfix+c/t | Öffne Windows |
|
||||||
|
| Präfix+f | Suche in Pane Buffer |
|
||||||
|
| Präfix :attach -d | Hängt sich and die Session und entfernt alle anderen Sessions daran |
|
||||||
|
| Präfix+<Leertaste> | Wechselt zwischen vertikalen/horizontalen Layout |
|
||||||
|
|
||||||
|
# i3 Keybindings
|
||||||
|
|
||||||
|
- mod1 = Win/Super
|
||||||
|
- mod2 = Alt
|
||||||
|
|
||||||
|
### Normal-Mode
|
||||||
|
|
||||||
|
| mod1 + l | Lock Screen | Bemerkung |
|
||||||
|
| ------------------------------- | ----------------------------------------------------------------------------- | ----------- |
|
||||||
|
| Maus + mod1 | Move floating Window | |
|
||||||
|
| mod2 + F4 | kill Window | |
|
||||||
|
| mod1+shift+q | kill Window | |
|
||||||
|
| mod1 + d | rofi | |
|
||||||
|
| mod1 + p | Screenshot Full Screen | |
|
||||||
|
| mod1 + shift + p | Open Flameshot | |
|
||||||
|
| mod1 + hjkl/pfeiltasten | change focus | |
|
||||||
|
| mod1 + shift + hjkl/pfeiltasten | move focused window | |
|
||||||
|
| mod1+Strg+hjkl/pfeiltasten | resize focused window | |
|
||||||
|
| mod1 + v | Split horizontal | # umbelegen |
|
||||||
|
| mod1 + h | split vertical | # umbelegen |
|
||||||
|
| mod1 + Strg + </> | move Workspace to on the left/right | |
|
||||||
|
| mod1 + Shift+ f | fullscreen | |
|
||||||
|
| mod1+t/s | change container layout (tabbed, toggle split) | |
|
||||||
|
| mod1+shift+<leertaste> | toggle tiling / floating | |
|
||||||
|
| mod1 + <leertaste> | change focus between tiling / floating windows | |
|
||||||
|
| mod1+a | focus the parent container | |
|
||||||
|
| mod1+{1..0} | switch to workspace 1-10 | |
|
||||||
|
| mod1+shift+{1..0} | move focused container to workspace | |
|
||||||
|
| mod1+ctrl+{1..0} | move focused container to workspace and follow it | |
|
||||||
|
| mod1+Shift+c | reload the configuration file | |
|
||||||
|
| mod1+Shift+r | restart i3 inplace (preserves your layout/session, can be used to upgrade i3) | |
|
||||||
|
| mod1+Shift+e | exit i3 | |
|
||||||
|
| mod1+r/mod1 + enter | starte alacritty | |
|
||||||
|
| mod1 + Shift + Pfeiltasten | Tausche Fenster | |
|
||||||
|
|
||||||
|
|
||||||
|
## alacritty
|
||||||
|
|
||||||
|
* Links mit <Shift+Linksklick> anklickbar
|
||||||
|
|
||||||
|
## polybar
|
||||||
|
|
||||||
|
* Fenster mit mausradklick schließen
|
||||||
|
* Floating Fenster mit Mausrad vergrößern/verkleinern
|
|
@ -1,8 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
for i in $(zfs get -Ht snapshot userrefs | grep -v $'\t'0 | cut -d $'\t' -f 1 | cut -f1 -d @ | uniq -d) ; do
|
|
||||||
for j in $(zfs list -H -t snapshot "$i" | awk '{ print $1 }') ; do
|
|
||||||
for k in $(zfs holds -H "$j") ; do
|
|
||||||
echo sudo zfs release syncoid_pbs "$k" | grep "@"
|
|
||||||
done
|
|
||||||
done
|
|
||||||
done
|
|
Loading…
Reference in a new issue