repositories / dotfiles

dotfiles

bugabingas dorkfiles

owned by bugabinga

me: create identity file for personal and work

26dbe4ffed665de423024065fc8a1537c37e7bea

Oliver Krylow <o.krylow@isp-insoft.de> ·

unsigned

Browse filesCompare with HEAD

also cleans up git config with same id's.

Changed files (18)

NB-00718-WSL.symlinks

Modified
1 +me/isp.nuon
2 +~/.config/me/id.nuon
1 4 git/gitconfig
2 5 ~/.config/git/config
4 -git/gitconfig.linux
7 +git/gitconfig.isp
5 8 ~/.config/git/.gitconfig.include
7 10 subversion/config
49 52 neovim
50 53 ~/.config/nvim
55 +neovide
56 +~/.config/neovide
52 58 fonts
53 59 ~/.local/share/fonts

fedora.symlinks

Modified
1 1 git/gitconfig
2 2 ~/.config/git/config
4 -git/gitconfig.linux
4 +git/gitconfig.bugabinga
5 5 ~/.config/git/.gitconfig.include
7 7 subversion/config

git/gitconfig

Modified
1 -[user]
2 - name = Oliver Jan Krylow
3 - email = oliver@bugabinga.net
5 1 [alias]
6 2 # `git log` with patches shown with difftastic.
7 3 dl = -c diff.external=difft log -p --ext-diff
49 45 difftool = true
51 47 [merge]
52 - tool = nvim_merge
48 + tool = vim
54 50 [mergetool]
55 51 keepBackup = false
56 52 prompt = false
58 -[mergetool "meld_merge"]
54 +[mergetool "meld"]
59 55 cmd = "meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\" "
61 -[mergetool "nvim_merge"]
57 +[mergetool "vim"]
62 58 cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\" "
64 60 [push]
90 86 [help]
91 87 # try to automatically correct mispelled git commands
92 - autocorrect = 7
88 + autocorrect = 1
90 +[difftool "difftastic"]
91 + # See `man git-difftool` for a description of MERGED, LOCAL and REMOTE.
92 + cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644"
94 +[difftool]
95 + # Run the difftool immediately, don't ask 'are you sure' each time.
96 + prompt = false
98 +[pager]
99 + # Use a pager if the difftool output is larger than one screenful,
100 + # consistent with the behaviour of `git diff`.
101 + difftool = true
103 +[diff]
104 + # Set difftastic as the default difftool, so we don't need to specify
105 + # `-t difftastic` every time.
106 + tool = difftastic
94 108 # In order to have host-specific configuration, I include additional settings here.
95 109 # On each host a different file might be symlinked into '.gitconfig.include'.

git/gitconfig.EJ-PC-00363

Deleted
deleted file mode 100644
1 -[user]
2 - name = Oliver Krylow
3 - email = o.krylow@isp-insoft.de
5 -[credential]
6 - helper = manager-core

git/gitconfig.NB-00718

Deleted
deleted file mode 100644
1 -[core]
2 - symlinks = true
4 -[user]
5 - name = Oliver Krylow
6 - email = o.krylow@isp-insoft.de
8 -[credential]
9 - helper = manager-core

git/gitconfig.PC-00625

Deleted
deleted file mode 100644
1 -[user]
2 - name = Oliver Krylow
3 - email = o.krylow@isp-insoft.de

git/gitconfig.bugabinga

Added
new file mode 100644
1 +[user]
2 + name = Oliver Jan Krylow
3 + email = oliver@bugabinga.net
5 +[sendemail]
6 + smtpserver = box.bugabinga.net
7 + smtpuser = oliver@bugabinga.net
8 + smtpencryption = tls
9 + smtpserverport = 587
10 + annotate = yes

git/gitconfig.isp

Added
new file mode 100644
1 +[user]
2 + name = Oliver Krylow
3 + email = o.krylow@isp-insoft.de
5 +[sendemail]
6 + smtpserver = sslout.df.eu
7 + smtpuser = o.krylow@isp-insoft.de
8 + smtpencryption = ssl
9 + smtpserverport = 465
10 + annotate = yes

git/gitconfig.linux

Deleted
deleted file mode 100644
1 -[sendemail]
2 - smtpserver = box.bugabinga.net
3 - smtpuser = oliver@bugabinga.net
4 - smtpencryption = tls
5 - smtpserverport = 587
6 - annotate = yes

me/bugabinga.nuon

Added
new file mode 100644
1 +{
2 + id: bugabinga
3 + name: 'Oliver Jan Krylow'
4 + email: oliver@bugabinga.net
5 +}

me/isp.nuon

Added
new file mode 100644
1 +{
2 + id: okr
3 + name: 'Oliver Krylow'
4 + email: o.krylow@isp-insoft.de
5 +}

nushell/config.nu

Modified
1 -# TODO: use nugu colors
2 -# for more information on themes see
3 -# https://github.com/nushell/nushell/blob/main/docs/How_To_Coloring_and_Theming.md
5 1 $env.config = {
6 2 show_banner: false
7 3 table: {

nushell/env.nu

Modified
89 89 carapace _carapace nushell | save --force ~/.cache/carapace/init.nu
92 +def --env wslg [] {
93 + load-env {
94 + DISPLAY:':0'
95 + WAYLAND_DISPLAY:'wayland-0'
96 + PULSE_SERVER:'/mnt/wslg/PulseServer'
97 + XDG_RUNTIME_DIR:'/mnt/wslg/runtime-dir'
98 + }
101 +if ( $env.WSLENV | is-not-empty ) { wslg }

nushell/gen-aliases.nu

Modified
17 17 # Start defining your aliases here
19 19 aka cat bat
20 -aka list eza '--long' '--git'
21 20 aka tar bsdtar
22 21 aka walk yazi
23 -aka tree tre
22 +aka list eza '--long' '--git'
23 +aka tree eza '--tree' '--icons' '--git' '--all' '--long'
24 24 aka imgcat wezterm imgcat
26 26 aka ll ls '--long'
36 36 aka vi nvim '--clean'
37 37 aka bb bartib
39 -# TODO write bak command
40 -# aka backup bak
42 39 aka userctl systemctl '--user'
44 41 # https://gist.github.com/mullnerz/9fff80593d6b442d5c1b

nushell/login.nu

Modified
2 2 use prompt.nu *
3 3 use commands.nu *
4 4 use sy.nu
5 5 use bw.nu
6 +use md.nu
6 7 use todo.nu
7 8 use ssh-keygen-ed.nu
8 9 use md.nu

nushell/scripts/start.nu

Modified
2 1 # Opens the given resource in the operating systems preferred application.
3 2 export def main [
4 3 ...rest: string # Paths or URLs the OS should open for you.

termux.symlinks

Deleted
deleted file mode 100644
1 -git/gitconfig
2 -~/.config/git/config
4 -git/gitconfig.linux
5 -~/.config/git/.gitconfig.include
7 -nushell
8 -~/.config/nushell
10 -topgrade/topgrade.termux.toml
11 -~/.config/topgrade.toml
13 -helix/config.toml
14 -~/.config/helix/config.toml
16 -helix/themes
17 -~/.config/helix/themes
19 -ssh/config
20 -~/.ssh/config

x230.symlinks

Modified
1 1 git/gitconfig
2 2 ~/.config/git/config
4 -git/gitconfig.linux
4 +git/gitconfig.bugabinga
5 5 ~/.config/git/.gitconfig.include
7 7 cargo/config.toml