repositories / dotfiles

dotfiles

bugabingas dorkfiles

owned by bugabinga

Merge branch 'trunk' of github.com:bugabinga/dotfiles into trunk

1fa02392f3f2bf3dd0b453c8a2bd922dee0e6bd8

Oliver Jan Krylow <oliver@bugabinga.net> ·

unsigned

Browse filesCompare with HEAD

Changed files (30)

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
8 11 ~/.subversion/config
10 13 subversion/diff
11 -~/.subversion/diff
13 -subversion/diff3
14 -~/.subversion/diff3
14 +~/.local/bin/svn.diff
16 16 subversion/merge
17 -~/.subversion/merge
17 +~/.local/bin/svn.merge
19 19 tools/git-info
20 20 ~/.local/bin/git-info
40 40 nushell/scripts
41 41 ~/.config/nushell/scripts
43 +nushell/completions
44 +~/.config/nushell/completions
43 46 topgrade/topgrade.linux.toml
44 47 ~/.config/topgrade.toml
46 -wezterm
47 -/mnt/c/Users/okr/.config/wezterm
49 49 ssh/config
50 50 ~/.ssh/config
52 52 neovim
53 53 ~/.config/nvim
55 +neovide
56 +~/.config/neovide
55 58 fonts
56 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
1 +[alias]
2 + # `git log` with patches shown with difftastic.
3 + dl = -c diff.external=difft log -p --ext-diff
5 + # Show the most recent commit with difftastic.
6 + ds = -c diff.external=difft show --ext-diff
8 + # `git diff` with difftastic.
9 + dft = -c diff.external=difft diff
5 11 [core]
6 12 editor = nvim
39 45 difftool = true
41 47 [merge]
42 - tool = nvim_merge
48 + tool = vim
44 50 [mergetool]
45 51 keepBackup = false
46 52 prompt = false
48 -[mergetool "meld_merge"]
54 +[mergetool "meld"]
49 55 cmd = "meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\" "
51 -[mergetool "nvim_merge"]
57 +[mergetool "vim"]
52 58 cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\" "
54 60 [push]
80 86 [help]
81 87 # try to automatically correct mispelled git commands
82 - 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
84 108 # In order to have host-specific configuration, I include additional settings here.
85 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 +}

neovim/lua/bugabinga/options/behaviour.lua

Modified
119 119 vim.opt.confirm = true
121 121 if const.wsl then
122 + -- vim.g.clipboard = {
123 + -- name = 'WslClipboard',
124 + -- copy = {
125 + -- ['+'] = 'clip.exe',
126 + -- ['*'] = 'clip.exe',
127 + -- },
128 + -- paste = {
129 + -- ['+'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))',
130 + -- ['*'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))',
131 + -- },
132 + -- cache_enabled = 0,
133 + -- }
122 134 vim.g.clipboard = {
123 - name = 'WslClipboard',
135 + name = 'win32yank-wsl',
124 136 copy = {
125 - ['+'] = 'clip.exe',
126 - ['*'] = 'clip.exe',
137 + ['+'] = 'win32yank.exe -i --crlf',
138 + ['*'] = 'win32yank.exe -i --crlf',
128 140 paste = {
129 - ['+'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))',
130 - ['*'] = 'powershell.exe -c [Console]::Out.Write($(Get-Clipboard -Raw).tostring().replace("`r", ""))',
141 + ['+'] = 'win32yank.exe -o --lf',
142 + ['*'] = 'win32yank.exe -o --lf',
132 - cache_enabled = 0,
144 + cache_enabled = true,

neovim/spell/nerd.utf-8.add

Modified
108 108 ast-grep
109 109 >>>>>>> 313efcb717d937c279f95a0b48804aedd210e3ae
110 +JavaDoc
111 +CiaoCiao
112 +EntwicklerQuiz
113 +Toolchain
114 +Rätselantworten

neovim/spell/nerd.utf-8.add.spl

Modified

Previous version contains binary or non-UTF-8 data.

Current version contains binary or non-UTF-8 data.

nushell/completions/svn-completions.nu

Added
new file mode 100644
1 +def "complete svn subcommands" [] {
2 + ^svn help
3 + | lines
4 + | skip until { str starts-with "Available subcommands:" }
5 + | skip 1
6 + | each { str trim }
7 + | take until { is-empty }
8 + | split column " "
9 + | get column1
12 +def "complete svn add paths" [] {
13 + ^svn status --depth infinity
14 + | lines
15 + | parse "{mode} {file}"
16 + | str trim
17 + | where mode == '?'
18 + | get file
21 +def "complete svn revert paths" [] {
22 + ^svn status --depth infinity
23 + | lines
24 + | parse "{mode} {file}"
25 + | where mode == 'M'
26 + | str trim
27 + | get file
30 +def "complete svn depth" [] { ['empty', 'files', 'immediates', 'infinity'] }
32 +def "complete svn changelists" [] {
33 + ^svn status --depth infinity
34 + | lines
35 + | parse "--- Changelist '{changelist}':"
36 + | get --ignore-errors changelist
39 +# FIXME: This is commented out in order to leave unexterne'd commands be.
40 +#
41 +# Subversion is a tool for version control.
42 +# For additional information, see http://subversion.apache.org/
43 +#export extern svn [
44 + #subcommand?: string@"complete svn subcommands" # for help on a specific subcommand.
45 + #--version # to see the program version and RA modules
46 + #--quiet # to see just the version number
47 + #--verbose # to see dependency versions as well
48 +#]
50 +# help (?, h): Describe the usage of this program or its subcommands.
51 +# usage: help [SUBCOMMAND...]
52 +export extern "svn help" [
53 + subcommand?: string@"complete svn subcommands" # for help on a specific subcommand.
54 + --verbose(-v) # also show experimental subcommands and options
57 +# Print the status of working copy files and directories.
58 +export extern "svn status" [
59 + ...paths: path # PATHs
60 + --show-updates(-u) # display update information
61 + --verbose(-v) # print extra information
62 + --depth: string@"complete svn depth" # limit operation by depth ARG ('empty', 'files', 'immediates', or 'infinity')
63 + --revision(-r): string # ARG (some commands also take ARG1:ARG2 range)
64 + --quiet(-q) # don't print unversioned items
65 + --no-ignore # disregard default and svn:ignore and svn:global-ignores property ignores
66 + --incremental # give output suitable for concatenation
67 + --xml # output in XML
68 + --ignore-externals # ignore externals definitions
69 + --changelist:string@"complete svn changelists" # operate only on members of changelist ARG
72 +# FIXME: https://github.com/nushell/nushell/issues/5012
73 +# rest parameters do not play well with completions yet
74 +# the `paths` parameter should be `...paths`
76 +# Put new files and directories under version control.
77 +export extern "svn add" [
78 + paths: path@"complete svn add paths" # unversioned PATHs for addition
79 + --targets: path # pass contents of file ARG as additional args
80 + --non-recursive(-N) # obsolete; same as --depth=empty
81 + --depth: string@"complete svn depth" # limit operation by depth ARG ('empty', 'files', 'immediates', or 'infinity')
82 + --quiet(-q) # print nothing, or only summary information
83 + --force # ignore already versioned paths
84 + --no-ignore # disregard default and svn:ignore and svn:global-ignores property ignores
85 + --auto-props # enable automatic properties
86 + --no-auto-props # disable automatic properties
87 + --parents # add intermediate parents
90 +# Restore pristine working copy state (undo local changes).
91 +export extern "svn revert" [
92 + paths: path@"complete svn revert paths"
93 + --targets: path # pass contents of file as additional args
94 + --recursive(-R) # descend recursively, same as --depth=infinity
95 + --depth: string@"complete svn depth" # limit operation by depth ARG ('empty', 'files', 'immediates', or 'infinity')
96 + --quiet(-q) # print nothing, or only summary information
97 + --changelist: string@"complete svn changelists" # operate only on members of changelist ARG
98 + --remove-added # reverting an added item will remove it from disk
101 +# FIXME
102 +# SVN uses aliases for subcommands. E.g. `co` for `checkout`.
103 +# How to express that with nu extern commands?
105 +# Check out a working copy from a repository.
106 +export extern "svn checkout" [
107 + ...url_with_rev:string # source
108 + path: path # destination
109 + --revision(-r) # ARG (some commands also take ARG1:ARG2 range)
110 + --quiet(-q) # print nothing, or only summary information
111 + --depth: string@"complete svn depth" # limit operation by depth ARG ('empty', 'files', 'immediates', or 'infinity')
112 + --force # force operation to run
113 + --ignore-externals # ignore externals definitions

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
72 72 $env.NU_LIB_DIRS = [
73 73 ($nu.default-config-dir | path join 'scripts')
74 + ($nu.default-config-dir | path join 'completions')
76 77 # generate aliases here and now, so that we can apply conditions.
82 83 zoxide init nushell | save -f ($nu.default-config-dir | path join 'zoxide.nu')
86 +if not (which carapace | is-empty) {
87 + $env.CARAPACE_BRIDGES = 'zsh,fish,bash,inshellisense' # TODO: figure out sensible bridges
88 + mkdir ~/.cache/carapace
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
12 13 use fedora_bootstrip.nu
13 14 use notes.nu
16 +use svn-completions.nu *
15 18 if $env.WIN32 {
16 19 use refreshenv.nu *
22 25 # this will fail if zoxide is not installed yet
23 26 source ($nu.default-config-dir | path join "zoxide.nu")
28 +# FIXME: just like the zoxide script, this will fail if carapace is not around
29 +# in both cases an empty file needs to be genereated, if the commands are not in PATH
30 +# so that this source never fails
31 +source ( [$nu.home-path '.cache' 'carapace' 'init.nu'] | path join)
25 33 source ($nu.default-config-dir | path join "scripts/direnv.nu")
27 35 todo commands

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.

subversion/config

Modified
51 51 ### Set diff-cmd to the absolute path of your 'diff' program.
52 52 ### This will override the compile-time default, which is to use
53 53 ### Subversion's internal diff implementation.
54 -#diff-cmd = /home/oli/.subversion/diff
54 +diff-cmd = svn.diff
55 55 ### Diff-extensions are arguments passed to an external diff
56 56 ### program or to Subversion's internal diff implementation.
57 57 ### Set diff-extensions to override the default arguments ('-u').
59 59 ### Set diff3-cmd to the absolute path of your 'diff3' program.
60 60 ### This will override the compile-time default, which is to use
61 61 ### Subversion's internal diff3 implementation.
62 -#diff3-cmd = /home/oli/.subversion/diff3
62 +diff3-cmd = svn.diff3
63 63 ### Set diff3-has-program-arg to 'yes' if your 'diff3' program
64 64 ### accepts the '--diff-program' option.
65 65 # diff3-has-program-arg = no
66 66 ### Set merge-tool-cmd to the command used to invoke your external
67 67 ### merging tool of choice. Subversion will pass 5 arguments to
68 68 ### the specified command: base theirs mine merged wcfile
69 -#merge-tool-cmd = /home/oli/.subversion/merge
69 +merge-tool-cmd = svn.merge
71 71 ### Section for configuring tunnel agents.
72 72 [tunnels]

subversion/config.win32

Deleted
deleted file mode 100644
1 -### This file configures various client-side behaviors.
2 -###
3 -### The commented-out examples below are intended to demonstrate
4 -### how to use this file.
6 -### Section for authentication and authorization customizations.
7 -[auth]
8 -### Set password stores used by Subversion. They should be
9 -### delimited by spaces or commas. The order of values determines
10 -### the order in which password stores are used.
11 -### Valid password stores:
12 -### gnome-keyring (Unix-like systems)
13 -### kwallet (Unix-like systems)
14 -### gpg-agent (Unix-like systems)
15 -### keychain (Mac OS X)
16 -### windows-cryptoapi (Windows)
17 -# password-stores = gpg-agent,gnome-keyring,kwallet
18 -### To disable all password stores, use an empty list:
19 -# password-stores =
20 -###
21 -### Set KWallet wallet used by Subversion. If empty or unset,
22 -### then the default network wallet will be used.
23 -# kwallet-wallet =
24 -###
25 -### Include PID (Process ID) in Subversion application name when
26 -### using KWallet. It defaults to 'no'.
27 -# kwallet-svn-application-name-with-pid = yes
28 -###
29 -### Set ssl-client-cert-file-prompt to 'yes' to cause the client
30 -### to prompt for a path to a client cert file when the server
31 -### requests a client cert but no client cert file is found in the
32 -### expected place (see the 'ssl-client-cert-file' option in the
33 -### 'servers' configuration file). Defaults to 'no'.
34 -# ssl-client-cert-file-prompt = no
35 -###
36 -### The rest of the [auth] section in this file has been deprecated.
37 -### Both 'store-passwords' and 'store-auth-creds' can now be
38 -### specified in the 'servers' file in your config directory
39 -### and are documented there. Anything specified in this section
40 -### is overridden by settings specified in the 'servers' file.
41 -# store-passwords = no
42 -# store-auth-creds = no
44 -### Section for configuring external helper applications.
45 -[helpers]
46 -### Set editor-cmd to the command used to invoke your text editor.
47 -### This will override the environment variables that Subversion
48 -### examines by default to find this information ($EDITOR,
49 -### et al).
50 -editor-cmd = nvim
51 -### Set diff-cmd to the absolute path of your 'diff' program.
52 -### This will override the compile-time default, which is to use
53 -### Subversion's internal diff implementation.
54 -#diff-cmd = C:/Users/okr/AppData/Roaming/Subversion/diff.bat
55 -### Diff-extensions are arguments passed to an external diff
56 -### program or to Subversion's internal diff implementation.
57 -### Set diff-extensions to override the default arguments ('-u').
58 -# diff-extensions =
59 -### Set diff3-cmd to the absolute path of your 'diff3' program.
60 -### This will override the compile-time default, which is to use
61 -### Subversion's internal diff3 implementation.
62 -#diff3-cmd = C:/Users/okr/AppData/Roaming/Subversion/diff3.bat
63 -### Set diff3-has-program-arg to 'yes' if your 'diff3' program
64 -### accepts the '--diff-program' option.
65 -# diff3-has-program-arg = no
66 -### Set merge-tool-cmd to the command used to invoke your external
67 -### merging tool of choice. Subversion will pass 5 arguments to
68 -### the specified command: base theirs mine merged wcfile
69 -#merge-tool-cmd = C:/Users/okr/AppData/Roaming/Subversion/merge.bat
71 -### Section for configuring tunnel agents.
72 -[tunnels]
73 -### Configure svn protocol tunnel schemes here. By default, only
74 -### the 'ssh' scheme is defined. You can define other schemes to
75 -### be used with 'svn+scheme://hostname/path' URLs. A scheme
76 -### definition is simply a command, optionally prefixed by an
77 -### environment variable name which can override the command if it
78 -### is defined. The command (or environment variable) may contain
79 -### arguments, using standard shell quoting for arguments with
80 -### spaces. The command will be invoked as:
81 -### <command> <hostname> svnserve -t
82 -### (If the URL includes a username, then the hostname will be
83 -### passed to the tunnel agent as <user>@<hostname>.) If the
84 -### built-in ssh scheme were not predefined, it could be defined
85 -### as:
86 -# ssh = $SVN_SSH ssh -q -o ControlMaster=no --
87 -### If you wanted to define a new 'rsh' scheme, to be used with
88 -### 'svn+rsh:' URLs, you could do so as follows:
89 -# rsh = rsh --
90 -### Or, if you wanted to specify a full path and arguments:
91 -# rsh = /path/to/rsh -l myusername --
92 -### On Windows, if you are specifying a full path to a command,
93 -### use a forward slash (/) or a paired backslash (\\) as the
94 -### path separator. A single backslash will be treated as an
95 -### escape for the following character.
97 -### Section for configuring miscellaneous Subversion options.
98 -[miscellany]
99 -### Set global-ignores to a set of whitespace-delimited globs
100 -### which Subversion will ignore in its 'status' output, and
101 -### while importing or adding files and directories.
102 -### '*' matches leading dots, e.g. '*.rej' matches '.foo.rej'.
103 -# global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__
104 -# *.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db
105 -### Set log-encoding to the default encoding for log messages
106 -# log-encoding = latin1
107 -### Set use-commit-times to make checkout/update/switch/revert
108 -### put last-committed timestamps on every file touched.
109 -# use-commit-times = yes
110 -### Set no-unlock to prevent 'svn commit' from automatically
111 -### releasing locks on files.
112 -# no-unlock = yes
113 -### Set mime-types-file to a MIME type registry file, used to
114 -### provide hints to Subversion's MIME type auto-detection
115 -### algorithm.
116 -# mime-types-file = /path/to/mime.types
117 -### Set preserved-conflict-file-exts to a whitespace-delimited
118 -### list of patterns matching file extensions which should be
119 -### preserved in generated conflict file names. By default,
120 -### conflict files use custom extensions.
121 -# preserved-conflict-file-exts = doc ppt xls od?
122 -### Set enable-auto-props to 'yes' to enable automatic properties
123 -### for 'svn add' and 'svn import', it defaults to 'no'.
124 -### Automatic properties are defined in the section 'auto-props'.
125 -# enable-auto-props = yes
126 -### Set interactive-conflicts to 'no' to disable interactive
127 -### conflict resolution prompting. It defaults to 'yes'.
128 -# interactive-conflicts = no
129 -### Set memory-cache-size to define the size of the memory cache
130 -### used by the client when accessing a FSFS repository via
131 -### ra_local (the file:// scheme). The value represents the number
132 -### of MB used by the cache.
133 -# memory-cache-size = 16
134 -### Set diff-ignore-content-type to 'yes' to cause 'svn diff' to
135 -### attempt to show differences of all modified files regardless
136 -### of their MIME content type. By default, Subversion will only
137 -### attempt to show differences for files believed to have human-
138 -### readable (non-binary) content. This option is especially
139 -### useful when Subversion is configured (via the 'diff-cmd'
140 -### option) to employ an external differencing tool which is able
141 -### to show meaningful differences for binary file formats. [New
142 -### in 1.9]
143 -# diff-ignore-content-type = no
145 -### Section for configuring automatic properties.
146 -[auto-props]
147 -### The format of the entries is:
148 -### file-name-pattern = propname[=value][;propname[=value]...]
149 -### The file-name-pattern can contain wildcards (such as '*' and
150 -### '?'). All entries which match (case-insensitively) will be
151 -### applied to the file. Note that auto-props functionality
152 -### must be enabled, which is typically done by setting the
153 -### 'enable-auto-props' option.
154 -# *.c = svn:eol-style=native
155 -# *.cpp = svn:eol-style=native
156 -# *.h = svn:keywords=Author Date Id Rev URL;svn:eol-style=native
157 -# *.dsp = svn:eol-style=CRLF
158 -# *.dsw = svn:eol-style=CRLF
159 -# *.sh = svn:eol-style=native;svn:executable
160 -# *.txt = svn:eol-style=native;svn:keywords=Author Date Id Rev URL;
161 -# *.png = svn:mime-type=image/png
162 -# *.jpg = svn:mime-type=image/jpeg
163 -# Makefile = svn:eol-style=native
165 -### Section for configuring working copies.
166 -[working-copy]
167 -### Set to a list of the names of specific clients that should use
168 -### exclusive SQLite locking of working copies. This increases the
169 -### performance of the client but prevents concurrent access by
170 -### other clients. Third-party clients may also support this
171 -### option.
172 -### Possible values:
173 -### svn (the command line client)
174 -# exclusive-locking-clients =
175 -### Set to true to enable exclusive SQLite locking of working
176 -### copies by all clients using the 1.8 APIs. Enabling this may
177 -### cause some clients to fail to work properly. This does not have
178 -### to be set for exclusive-locking-clients to work.
179 -# exclusive-locking = false
180 -### Set the SQLite busy timeout in milliseconds: the maximum time
181 -### the client waits to get access to the SQLite database before
182 -### returning an error. The default is 10000, i.e. 10 seconds.
183 -### Longer values may be useful when exclusive locking is enabled.
184 -# busy-timeout = 10000

subversion/diff

Modified
1 -#!/usr/bin/java --source 17
1 +#!/usr/bin/java --source 17 -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xms32m -Xmx32m -XX:+AlwaysPreTouch -Xshare:on
3 3 import static java.lang.System.* ;
4 4 import java.util.*;

subversion/diff.bat

Deleted
deleted file mode 100644
1 -@echo off
2 -java --source 17 %~dp0/diff %*

subversion/diff3

Deleted
deleted file mode 100755
1 -#!/usr/bin/java --source 17
3 -import static java.lang.System.* ;
4 -import java.util.*;
6 -class diff3 {
7 - public static void main(String[] command_line_arguments) throws Throwable
8 - {
9 - if(command_line_arguments.length != 9)
10 - throw fail("svn diff3 was supposed to give us 9 arguments. did the interface change? we got %s arguments.", command_line_arguments.length);
12 - //some old gnudiff flag, which meld ignores
13 - var ignored_unified_flag = command_line_arguments[0];
15 - if(!ignored_unified_flag.equals("-u"))
16 - throw fail("the first argument should be the `-u` flag, which meld will ignore, but was %s.", ignored_unified_flag);
18 - var left_label_flag = command_line_arguments[1];
19 - var left_label = command_line_arguments[2];
20 - var right_label_flag = command_line_arguments[3];
21 - var right_label = command_line_arguments[4];
23 - if(!(left_label_flag.equals("-L") && right_label_flag.equals("-L")))
24 - throw fail("flags for the labes should have been `-L`, but were %s and %s.", left_label_flag, right_label_flag);
26 - var left_file = command_line_arguments[5];
27 - var right_file = command_line_arguments[6];
29 - out.printf("%s --label '%s' '%s' --label '%s' '%s'%n", emphasize_global("meld"), left_label, left_file, right_label, right_file);
30 - throw fail("not yet");
31 - // var code = call("meld","--auto-merge", "--label", left_label, left_file, "--label", right_label, right_file);
32 - // throw exit(code);
33 - }
35 - static int call( String... command) throws Exception
36 - {
37 - return new ProcessBuilder()
38 - .command(command)
39 - .inheritIO()
40 - .start()
41 - .onExit()
42 - .join()
43 - .exitValue();
44 - }
46 - static Throwable exit(int code) {
47 - System.exit(code);
48 - //abuse control flow to make compiler realize `exit` will never return
49 - return new Throwable();
50 - }
52 - static String emphasize_global(String message) {
53 - return "\033[4m" + message + "\033[0m";
54 - }
56 - static String emphasize_local(String message) {
57 - return "\033[3m" + message + "\033[0m";
58 - }
60 - static Throwable fail(String message, Object... arguments) {
61 - out.printf(message, arguments);
62 - System.exit(1);
63 - //abuse control flow to make compiler realize `exit` will never return
64 - return new Throwable();
65 - }
67 - static Throwable fail() {
68 - System.exit(1);
69 - //abuse control flow to make compiler realize `exit` will never return
70 - return new Throwable();
71 - }
72 -}
74 -// vim:ft=java

subversion/diff3.bat

Deleted
deleted file mode 100644
1 -@echo off
2 -java --source 17 %~dp0/diff3 %*

subversion/merge

Modified
15 15 var merged_file = command_line_arguments[3];
16 16 var wcpath_file = command_line_arguments[4];
18 - var code = call("meld", "--label", "Mine", mine_file, "--label", "WC", wcpath_file, "--label", "Theirs", theirs_file, "--output", merged_file);
19 - throw exit(code);
18 + //TODO: use neovide, once my WSL can du GUI
19 + var code = call("nvim", "-d", wcpath_file, merged_file, theirs_file );
20 + throw exit(code);
22 23 static int call( String... command) throws Exception
33 34 static Throwable exit(int code) {
34 35 System.exit(code);
35 36 //abuse control flow to make compiler realize `exit` will never return
36 - return new Throwable();
37 + return new Throwable();
39 40 static String emphasize_global(String message) {
48 49 out.printf(message, arguments);
49 50 System.exit(1);
50 51 //abuse control flow to make compiler realize `exit` will never return
51 - return new Throwable();
52 + return new Throwable();
54 55 static Throwable fail() {
55 56 System.exit(1);
56 57 //abuse control flow to make compiler realize `exit` will never return
57 - return new Throwable();
58 + return new Throwable();
60 61 // vim:ft=java

subversion/merge.bat

Deleted
deleted file mode 100644
1 -@echo off
2 -java --source 17 %~dp0/merge %*

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