Compare commits
No commits in common. "3fb9ea31ca8a0e140d3a2a0800c41518a32174d0" and "0b93f1d42d7386d2eebc0b7e50e0b9611254270e" have entirely different histories.
3fb9ea31ca
...
0b93f1d42d
|
@ -5,7 +5,5 @@
|
||||||
"editor.fontLigatures": true,
|
"editor.fontLigatures": true,
|
||||||
"[jsonc]": {
|
"[jsonc]": {
|
||||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||||
},
|
}
|
||||||
"kerneldev.experimental.newDtsEngine": true,
|
|
||||||
"ctags.disable": true,
|
|
||||||
}
|
}
|
|
@ -1,11 +1,3 @@
|
||||||
if status is-interactive
|
if status is-interactive
|
||||||
# Commands to run in interactive sessions can go here
|
# Commands to run in interactive sessions can go here
|
||||||
end
|
end
|
||||||
|
|
||||||
alias g=git
|
|
||||||
alias gt=goto
|
|
||||||
|
|
||||||
function 0file; curl -F"file=@$argv" https://envs.sh; end
|
|
||||||
function 0pb; curl -F"file=@-;" https://envs.sh; end
|
|
||||||
function 0url; curl -F"url=$argv" https://envs.sh; end
|
|
||||||
function 0short; curl -F"shorten=$argv" https://envs.sh; end
|
|
||||||
|
|
25
.gitconfig
25
.gitconfig
|
@ -6,6 +6,8 @@
|
||||||
signingKey = 7231804B052C670F15A6771DB918086ED8045B91
|
signingKey = 7231804B052C670F15A6771DB918086ED8045B91
|
||||||
[commit]
|
[commit]
|
||||||
gpgSign = true
|
gpgSign = true
|
||||||
|
[push]
|
||||||
|
gpgSign = if-asked
|
||||||
[tag]
|
[tag]
|
||||||
gpgSign = true
|
gpgSign = true
|
||||||
[core]
|
[core]
|
||||||
|
@ -16,26 +18,3 @@
|
||||||
rebase = false
|
rebase = false
|
||||||
[merge]
|
[merge]
|
||||||
conflictstyle = diff3
|
conflictstyle = diff3
|
||||||
[diff]
|
|
||||||
tool = difftastic
|
|
||||||
[difftool]
|
|
||||||
prompt = false
|
|
||||||
[difftool "difftastic"]
|
|
||||||
cmd = difft "$LOCAL" "$REMOTE"
|
|
||||||
[pager]
|
|
||||||
difftool = true
|
|
||||||
[alias]
|
|
||||||
dft = difftool
|
|
||||||
logt = "!f() { GIT_EXTERNAL_DIFF=difft git log -p --ext-diff $@; }; f"
|
|
||||||
l = log
|
|
||||||
lt = logt
|
|
||||||
ol = "log --oneline"
|
|
||||||
c = commit
|
|
||||||
p = push
|
|
||||||
g = pull
|
|
||||||
f = fetch
|
|
||||||
s = status
|
|
||||||
a = add
|
|
||||||
d = diff
|
|
||||||
dt = difftool
|
|
||||||
cp = cherry-pick
|
|
||||||
|
|
8
.gitignore
vendored
8
.gitignore
vendored
|
@ -1,19 +1,19 @@
|
||||||
*
|
*
|
||||||
|
!*/
|
||||||
|
|
||||||
!/.gitignore
|
!/.gitignore
|
||||||
!/.gitconfig
|
!/.gitconfig
|
||||||
!/.profile
|
!/.profile
|
||||||
!/.gdbinit
|
!/.gdbinit
|
||||||
|
|
||||||
!/.ssh/
|
|
||||||
!/.ssh/authorized_keys
|
!/.ssh/authorized_keys
|
||||||
!/.ssh/config
|
!/.ssh/config
|
||||||
|
|
||||||
!/.config/
|
|
||||||
!/.config/*/
|
|
||||||
!/.config/user-dirs.dirs
|
!/.config/user-dirs.dirs
|
||||||
!/.config/autostart/ssh-add.desktop
|
!/.config/autostart/ssh-add.desktop
|
||||||
!/.config/environment.d/
|
!/.config/environment.d/sdk.conf
|
||||||
|
!/.config/environment.d/editor.conf
|
||||||
|
!/.config/environment.d/ssh.conf
|
||||||
!/.config/Code - Exploration/User/settings.json
|
!/.config/Code - Exploration/User/settings.json
|
||||||
!/.config/Code - Insiders/User/settings.json
|
!/.config/Code - Insiders/User/settings.json
|
||||||
!/.config/fish/config.fish
|
!/.config/fish/config.fish
|
||||||
|
|
|
@ -1,10 +1,2 @@
|
||||||
ServerAliveInterval=5
|
ServerAliveInterval=5
|
||||||
IdentityFile=~/.ssh/id_ed25519
|
IdentityFile=~/.ssh/id_ed25519
|
||||||
|
|
||||||
Host 192.168.0.*
|
|
||||||
StrictHostKeyChecking no
|
|
||||||
UserKnownHostsFile=/dev/null
|
|
||||||
|
|
||||||
Host 172.16.42.1
|
|
||||||
StrictHostKeyChecking no
|
|
||||||
UserKnownHostsFile=/dev/null
|
|
||||||
|
|
Loading…
Reference in a new issue