diff --git a/.config/plasmavaultrc b/.config/plasmavaultrc index fe3272e..b91b48e 100644 --- a/.config/plasmavaultrc +++ b/.config/plasmavaultrc @@ -2,7 +2,7 @@ activities= backend=cryfs lastError=Unknown device (code: 1) -lastStatus=2 +lastStatus=254 mountPoint=/home/joe/Vaults/Blackmail name=Blackmail offlineOnly=false @@ -11,7 +11,7 @@ offlineOnly=false activities= backend=cryfs lastError=Cannot create the mount point (code: 0) -lastStatus=2 +lastStatus=254 mountPoint=/home/joe/Vaults/NSFW name=NSFW offlineOnly=false diff --git a/.gitconfig b/.gitconfig index 6b00285..576a469 100644 --- a/.gitconfig +++ b/.gitconfig @@ -3,10 +3,10 @@ name = KenwoodFox [alias] add-commit = !git add -A && git commit -[credential] - helper = store [global] [push] default = current [init] defaultBranch = main +[pull] + rebase = false diff --git a/.ssh/config b/.ssh/config index b71050f..37f1508 100644 --- a/.ssh/config +++ b/.ssh/config @@ -72,3 +72,8 @@ Host devserver Host stdocker1 HostName 10.20.30.225 IdentityFile ~/.ssh/stdocker + +# Argen pi +Host argen + HostName 10.20.30.224 +