repositories / dotfiles

dotfiles

bugabingas dorkfiles

owned by bugabinga

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

3b7725477784b7b2eedde116c19e53981884ba82

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

unsigned

Browse filesCompare with HEAD

Changed files (19)

.gitignore

Modified
7 7 neovim/profile.log
8 8 neovim/plugin
9 9 neovim/profile.svg
10 +.aider.chat.history.md

PC-00625.symlinks

Modified
19 19 subversion/config
20 20 ~/AppData/Roaming/Subversion/config
22 +subversion/diff
23 +~/AppData/Roaming/Subversion/diff
25 +subversion/diff3
26 +~/AppData/Roaming/Subversion/diff3
28 +subversion/merge
29 +~/AppData/Roaming/Subversion/merge
22 32 cargo/config.toml
23 33 ~/scoop/persist/rustup/.cargo/config.toml

bootstripper.java

Modified
160 160 continue;
161 161 output.append((char) character);
163 - return output.toString();
163 + var name = output.toString();
164 + if( "localhost".equals(name) ) {
165 + // we are inside termux
166 + assert System.getenv("PREFIX") != null;
167 + return "termux";
169 + return name;

git/gitconfig

Modified
19 19 [difftool "meld"]
20 20 cmd = "meld \"$LOCAL\" \"$REMOTE\""
22 +[difftool "difftastic"]
23 + cmd = "difft \"$LOCAL\" \"$REMOTE\""
25 +[pager]
26 + difftool = true
22 28 [merge]
23 29 tool = meld_merge

helix/themes/nugu-dark.toml

Modified
33 33 "bold",
34 34 ], underline.style = "double_line" }
35 35 "markup.heading.marker" = { fg = "minor" }
36 -"markup.list" = "minor"
36 +"markup.list" = { fg = "minor" }
37 37 "markup.bold" = { modifiers = ["bold"] }
38 38 "markup.italic" = { modifiers = ["italic"] }
39 39 "markup.strikethrough" = { modifiers = ["crossed_out"] }
40 -"markup.link.url" = "accent"
41 -"markup.link.text" = "important_local"
42 -"markup.link.label" = "important_global"
40 +"markup.link.url" = { fg = "accent" }
41 +"markup.link.text" = { fg = "important_local" }
42 +"markup.link.label" = { fg = "important_global" }
43 43 "markup.quote" = { fg = "important_local", modifiers = ["italic"] }
44 44 "markup.raw.inline" = { fg = "important_local" }
45 45 "markup.raw.block" = { fg = "important_global" }
48 48 "diff.delta" = { fg = "unfocus" }
49 49 "diff.minus" = { fg = "focus", modifiers = ["crossed_out"] }
51 +"ui" = { fg = "ui_normal", bg = "ui_backdrop" }
51 52 "ui.background" = { fg = "normal", bg = "backdrop" }
52 53 "ui.background.separator" = { fg = "ui_minor" }
75 76 "ui.bufferline.active" = { fg = "ui_important_global", bg = "ui_unfocus", modifiers = [
76 77 "bold",
77 78 ], underline = { style = "double_line", color = "ui_important_global" } }
79 79 "ui.gutter" = { bg = "backdrop" }
81 81 "ui.debug.breakpoint" = { fg = "ui_important_global" }
82 82 "ui.debug.active" = { fg = "ui_important_global" }
84 -"ui.window" = { fg = "ui_unfocus", bg = "ui_backdrop" }
84 +"ui.window" = { fg = "ui_important_global", bg = "ui_backdrop" }
86 86 "ui.help" = { fg = "ui_important_global", bg = "ui_backdrop" }
88 -"ui.text" = { fg = "normal", bg = "backdrop" }
89 -"ui.text.focus" = { fg = "ui_focus" }
90 -"ui.text.info" = { fg = "ui_normal", bg = "ui_backdrop" }
88 +"ui.text" = { fg = "normal" }
89 +"ui.text.focus" = { fg = "ui_focus", modifiers = [
90 + "bold",
91 +], underline = { style = "line" } }
92 +"ui.text.info" = { fg = "ui_normal" }
91 93 "ui.text.inactive" = { fg = "ui_minor" }
93 95 "ui.menu" = { fg = "ui_normal", bg = "ui_backdrop" }
94 -"ui.menu.selected" = { fg = "ui_focus", bg = "ui_backdrop", modifiers = [
96 +"ui.menu.selected" = { fg = "ui_focus", modifiers = [
95 97 "bold",
96 -] }
97 -"ui.menu.scroll" = { fg = "ui_accent", bg = "ui_backdrop" }
98 +], underline = { style = "line" } }
99 +"ui.menu.scroll" = { fg = "ui_minor", bg = "ui_unfocus" }
99 -"ui.popup" = { fg = "normal", bg = "backdrop" }
100 -"ui.popup.info" = { fg = "ui_minor", bg = "ui_backdrop" }
101 +"ui.popup" = { fg = "normal", bg = "ui_backdrop" }
102 +"ui.popup.info" = { fg = "ui_important_local", bg = "ui_backdrop" }
102 104 "ui.highlight" = { bg = "ui_focus" }
103 105 "ui.highlight.frameline" = { bg = "ui_important_global" }
105 -"ui.virtual.ruler" = { bg = "ui_unfocus" }
107 +"ui.virtual.wrap" = { fg = "ui_unfocus" }
108 +"ui.virtual.ruler" = { fg = "ui_unfocus" }
106 109 "ui.virtual.whitespace" = { fg = "ui_unfocus" }
107 -"ui.virtual.inlay-hint" = { fg = "ui_minor" }
110 +"ui.virtual.inlay-hint" = { fg = "minor", modifiers = ["italic"] }
109 112 "error" = { bg = "error" }
110 113 "warning" = { bg = "warning" }
116 119 "diagnostic.hint" = { underline = { style = "double_line", color = "info" }, modifiers = [
117 120 "dim",
119 123 "special" = { fg = "debug" }
121 125 [palette]

helix/themes/nugu-light.toml

Modified
33 33 "bold",
34 34 ], underline.style = "double_line" }
35 35 "markup.heading.marker" = { fg = "minor" }
36 -"markup.list" = "minor"
36 +"markup.list" = { fg = "minor" }
37 37 "markup.bold" = { modifiers = ["bold"] }
38 38 "markup.italic" = { modifiers = ["italic"] }
39 39 "markup.strikethrough" = { modifiers = ["crossed_out"] }
40 -"markup.link.url" = "accent"
41 -"markup.link.text" = "important_local"
42 -"markup.link.label" = "important_global"
40 +"markup.link.url" = { fg = "accent" }
41 +"markup.link.text" = { fg = "important_local" }
42 +"markup.link.label" = { fg = "important_global" }
43 43 "markup.quote" = { fg = "important_local", modifiers = ["italic"] }
44 44 "markup.raw.inline" = { fg = "important_local" }
45 45 "markup.raw.block" = { fg = "important_global" }
48 48 "diff.delta" = { fg = "unfocus" }
49 49 "diff.minus" = { fg = "focus", modifiers = ["crossed_out"] }
51 +"ui" = { fg = "ui_normal", bg = "ui_backdrop" }
51 52 "ui.background" = { fg = "normal", bg = "backdrop" }
52 53 "ui.background.separator" = { fg = "ui_minor" }
75 76 "ui.bufferline.active" = { fg = "ui_important_global", bg = "ui_unfocus", modifiers = [
76 77 "bold",
77 78 ], underline = { style = "double_line", color = "ui_important_global" } }
79 79 "ui.gutter" = { bg = "backdrop" }
81 81 "ui.debug.breakpoint" = { fg = "ui_important_global" }
82 82 "ui.debug.active" = { fg = "ui_important_global" }
84 -"ui.window" = { fg = "ui_unfocus", bg = "ui_backdrop" }
84 +"ui.window" = { fg = "ui_important_global", bg = "ui_backdrop" }
86 86 "ui.help" = { fg = "ui_important_global", bg = "ui_backdrop" }
88 -"ui.text" = { fg = "normal", bg = "backdrop" }
89 -"ui.text.focus" = { fg = "ui_focus" }
90 -"ui.text.info" = { fg = "ui_normal", bg = "ui_backdrop" }
88 +"ui.text" = { fg = "normal" }
89 +"ui.text.focus" = { fg = "ui_focus", modifiers = [
90 + "bold",
91 +], underline = { style = "line" } }
92 +"ui.text.info" = { fg = "ui_normal" }
91 93 "ui.text.inactive" = { fg = "ui_minor" }
93 95 "ui.menu" = { fg = "ui_normal", bg = "ui_backdrop" }
94 -"ui.menu.selected" = { fg = "ui_focus", bg = "ui_backdrop", modifiers = [
96 +"ui.menu.selected" = { fg = "ui_focus", modifiers = [
95 97 "bold",
96 -] }
97 -"ui.menu.scroll" = { fg = "ui_accent", bg = "ui_backdrop" }
98 +], underline = { style = "line" } }
99 +"ui.menu.scroll" = { fg = "ui_minor", bg = "ui_unfocus" }
99 -"ui.popup" = { fg = "normal", bg = "backdrop" }
100 -"ui.popup.info" = { fg = "ui_minor", bg = "ui_backdrop" }
101 +"ui.popup" = { fg = "normal", bg = "ui_backdrop" }
102 +"ui.popup.info" = { fg = "ui_important_local", bg = "ui_backdrop" }
102 104 "ui.highlight" = { bg = "ui_focus" }
103 105 "ui.highlight.frameline" = { bg = "ui_important_global" }
105 -"ui.virtual.ruler" = { bg = "ui_unfocus" }
107 +"ui.virtual.wrap" = { fg = "ui_unfocus" }
108 +"ui.virtual.ruler" = { fg = "ui_unfocus" }
106 109 "ui.virtual.whitespace" = { fg = "ui_unfocus" }
107 -"ui.virtual.inlay-hint" = { fg = "ui_minor" }
110 +"ui.virtual.inlay-hint" = { fg = "minor", modifiers = ["italic"] }
109 112 "error" = { bg = "error" }
110 113 "warning" = { bg = "warning" }
116 119 "diagnostic.hint" = { underline = { style = "double_line", color = "info" }, modifiers = [
117 120 "dim",
119 123 "special" = { fg = "debug" }
121 125 [palette]

nushell/config.nu

Modified
292 292 # must be done, after defining config, since zoxide mutates it
293 293 use zoxide.nu *
295 +overlay use coreutils.nu

nushell/modules/aliases.nu

Modified
4 4 # Semantic aliases
5 5 export alias show = bat
6 6 export def list [] { ls --all --long --du --mime-type | where type == dir | append (ls --all --long --du --mime-type | where type != dir) }
7 7 export def tree [] { ls | each { if $in.type == dir { tree $in.name } else { $in }} | flatten | table -e }
8 8 export alias browse = firefox
9 9 export alias edit = hx
10 +# TODO ewrite bak command
11 +export alias backup = bak
11 13 # TODO: HOST SPECIFIC ALIASES
12 14 # I do not see a way right now the have different aliases per host with nu.

nushell/modules/coreutils.nu

Added
new file mode 100644
1 +export def coreutils-check [] {
2 + # assert rust coreutils exist
3 + use std assert
4 + assert (not (which coreutils | is-empty))
5 +}
7 +# nu builtins are commented out but not forgotten about
8 +export alias b2sum = coreutils b2sum
9 +export alias b3sum = coreutils b3sum
10 +export alias base32 = coreutils base32
11 +export alias base64 = coreutils base64
12 +export alias basename = coreutils basename
13 +export alias basenc = coreutils basenc
14 +export alias cat = coreutils cat
15 +export alias cksum = coreutils cksum
16 +export alias comm = coreutils comm
17 +# export alias cp = coreutils cp
18 +export alias csplit = coreutils csplit
19 +export alias cut = coreutils cut
20 +# export alias date = coreutils date
21 +export alias dd = coreutils dd
22 +export alias df = coreutils df
23 +export alias dir = coreutils dir
24 +export alias dircolors = coreutils dircolors
25 +export alias dirname = coreutils dirname
26 +# export alias du = coreutils du
27 +# export alias echo = coreutils echo
28 +# export alias env = coreutils env
29 +export alias expand = coreutils expand
30 +export alias expr = coreutils expr
31 +export alias factor = coreutils factor
32 +# export alias false = coreutils false
33 +# export alias fmt = coreutils fmt
34 +export alias fold = coreutils fold
35 +export alias hashsum = coreutils hashsum
36 +export alias head = coreutils head
37 +# export alias join = coreutils join
38 +export alias link = coreutils link
39 +export alias ln = coreutils ln
40 +# export alias ls = coreutils ls
41 +export alias md5sum = coreutils md5sum
42 +export alias mkdir = coreutils mkdir
43 +export alias mktemp = coreutils mktemp
44 +export alias more = coreutils more
45 +# export alias mv = coreutils mv
46 +export alias nl = coreutils nl
47 +export alias numfmt = coreutils numfmt
48 +export alias od = coreutils od
49 +export alias paste = coreutils paste
50 +export alias pr = coreutils pr
51 +export alias printenv = coreutils printenv
52 +export alias printf = coreutils printf
53 +export alias ptx = coreutils ptx
54 +export alias pwd = coreutils pwd
55 +export alias readlink = coreutils readlink
56 +export alias realpath = coreutils realpath
57 +export alias relpath = coreutils relpath
58 +# export alias rm = coreutils rm
59 +export alias rmdir = coreutils rmdir
60 +# export alias seq = coreutils seq
61 +export alias sha1sum = coreutils sha1sum
62 +export alias sha224sum = coreutils sha224sum
63 +export alias sha256sum = coreutils sha256sum
64 +export alias sha3 = coreutils sha3-224sum
65 +export alias sha3 = coreutils sha3-256sum
66 +export alias sha3 = coreutils sha3-384sum
67 +export alias sha3 = coreutils sha3-512sum
68 +export alias sha384sum = coreutils sha384sum
69 +export alias sha3sum = coreutils sha3sum
70 +export alias sha512sum = coreutils sha512sum
71 +export alias shake128sum = coreutils shake128sum
72 +export alias shake256sum = coreutils shake256sum
73 +export alias shred = coreutils shred
74 +export alias shuf = coreutils shuf
75 +# export alias sleep = coreutils sleep
76 +# export alias sort = coreutils sort
77 +# export alias split = coreutils split
78 +export alias sum = coreutils sum
79 +export alias tac = coreutils tac
80 +export alias tail = coreutils tail
81 +export alias tee = coreutils tee
82 +export alias test = coreutils test
83 +# export alias touch = coreutils touch
84 +export alias tr = coreutils tr
85 +# export alias true = coreutils true
86 +export alias truncate = coreutils truncate
87 +export alias tsort = coreutils tsort
88 +export alias unexpand = coreutils unexpand
89 +# export alias uniq = coreutils uniq
90 +export alias unlink = coreutils unlink
91 +export alias vdir = coreutils vdir
92 +export alias wc = coreutils wc
93 +export alias yes = coreutils yes

pop-os.symlinks

Modified
4 4 git/gitconfig
5 5 ~/.config/git/config
7 7 git/gitconfig.linux
8 8 ~/.config/git/.gitconfig.include
10 +subversion/config
11 +~/.subversion/config
13 +subversion/diff
14 +~/.subversion/diff
16 +subversion/diff3
17 +~/.subversion/diff3
19 +subversion/merge
20 +~/.subversion/merge
10 22 tools/git-info
11 23 ~/.local/bin/git-info

ssh/config

Modified
3 3 # SSH client configuration
4 4 # defines bookmarks/templates for hosts and options to quickly connect to known hosts
7 7 Host box
8 - HostName box.bugabinga.net
9 - IdentityFile ~/.ssh/box_do.key
8 + HostName 46.101.206.216
9 + IdentityFile ~/.ssh/box.bugabinga.net.key
11 11 Host github.com
12 12 HostName github.com
12 12 IdentityFile ~/.ssh/github.key
14 14 Host codeberg.org
15 - HostName codeberg.org
16 - User git
17 - IdentityFile ~/.ssh/codeberg.key
15 + HostName codeberg.org
16 + User git
17 + IdentityFile ~/.ssh/codeberg.key
20 20 # catch-all pattern

subversion/config

Modified
14 14 ### gpg-agent (Unix-like systems)
15 15 ### keychain (Mac OS X)
16 16 ### windows-cryptoapi (Windows)
17 -password-stores = windows-cryptoapi
17 +# password-stores = gpg-agent,gnome-keyring,kwallet
18 18 ### To disable all password stores, use an empty list:
19 19 # password-stores =
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 +###
21 29 ### Set ssl-client-cert-file-prompt to 'yes' to cause the client
22 30 ### to prompt for a path to a client cert file when the server
23 31 ### requests a client cert but no client cert file is found in the
28 36 ### The rest of the [auth] section in this file has been deprecated.
29 37 ### Both 'store-passwords' and 'store-auth-creds' can now be
30 38 ### specified in the 'servers' file in your config directory
31 -### and are documented there. Anything specified in this section
39 +### and are documented there. Anything specified in this section
32 40 ### is overridden by settings specified in the 'servers' file.
33 41 # store-passwords = no
34 42 # store-auth-creds = no
37 45 [helpers]
38 46 ### Set editor-cmd to the command used to invoke your text editor.
39 47 ### This will override the environment variables that Subversion
40 -### examines by default to find this information ($EDITOR,
48 +### examines by default to find this information ($EDITOR,
41 49 ### et al).
42 50 editor-cmd = hx
43 51 ### Set diff-cmd to the absolute path of your 'diff' program.
44 52 ### This will override the compile-time default, which is to use
45 53 ### Subversion's internal diff implementation.
46 -# diff-cmd = delta
54 +# TODO windows versions as bat files
55 +diff-cmd = /home/oli/.subversion/diff
47 56 ### Diff-extensions are arguments passed to an external diff
48 57 ### program or to Subversion's internal diff implementation.
49 58 ### Set diff-extensions to override the default arguments ('-u').
50 -# diff-extensions = --tabs 2
59 +# diff-extensions =
51 60 ### Set diff3-cmd to the absolute path of your 'diff3' program.
52 61 ### This will override the compile-time default, which is to use
53 62 ### Subversion's internal diff3 implementation.
54 -# diff3-cmd = diff3_program (diff3, gdiff3, etc.)
63 +# diff3-cmd = /home/oli/.subversion/diff3
55 64 ### Set diff3-has-program-arg to 'yes' if your 'diff3' program
56 65 ### accepts the '--diff-program' option.
57 -# diff3-has-program-arg = [yes | no]
66 +# diff3-has-program-arg = no
58 67 ### Set merge-tool-cmd to the command used to invoke your external
59 68 ### merging tool of choice. Subversion will pass 5 arguments to
60 69 ### the specified command: base theirs mine merged wcfile
61 -# merge-tool-cmd = merge_command
70 +merge-tool-cmd = /home/oli/.subversion/merge
63 72 ### Section for configuring tunnel agents.
64 73 [tunnels]
75 84 ### passed to the tunnel agent as <user>@<hostname>.) If the
76 85 ### built-in ssh scheme were not predefined, it could be defined
77 86 ### as:
78 -# ssh = $SVN_SSH ssh -q
87 +# ssh = $SVN_SSH ssh -q -o ControlMaster=no --
79 88 ### If you wanted to define a new 'rsh' scheme, to be used with
80 89 ### 'svn+rsh:' URLs, you could do so as follows:
81 -# rsh = rsh
90 +# rsh = rsh --
82 91 ### Or, if you wanted to specify a full path and arguments:
83 -# rsh = /path/to/rsh -l myusername
92 +# rsh = /path/to/rsh -l myusername --
84 93 ### On Windows, if you are specifying a full path to a command,
85 94 ### use a forward slash (/) or a paired backslash (\\) as the
86 95 ### path separator. A single backslash will be treated as an
89 98 ### Section for configuring miscellaneous Subversion options.
90 99 [miscellany]
91 -encoding = UTF-8
92 100 ### Set global-ignores to a set of whitespace-delimited globs
93 101 ### which Subversion will ignore in its 'status' output, and
94 102 ### while importing or adding files and directories.
96 104 # global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__
97 105 # *.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db
98 106 ### Set log-encoding to the default encoding for log messages
99 -log-encoding = UTF-8
107 +# log-encoding = latin1
100 108 ### Set use-commit-times to make checkout/update/switch/revert
101 109 ### put last-committed timestamps on every file touched.
102 110 # use-commit-times = yes

subversion/diff

Added
new file mode 100755
1 +#!/usr/bin/java --source 17
3 +import static java.lang.System.* ;
4 +import java.util.*;
6 +class diff {
7 + public static void main(String[] command_line_arguments) throws Throwable
8 + {
9 + if(command_line_arguments.length != 7)
10 + throw fail("svn diff was supposed to give us 7 arguments. did the interface change? we got %s arguments.", command_line_arguments.length);
12 + //some old gnudiff flag, which newer tools ignore
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 will be ignored, 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 + var code = call("difft", "--tab-width","2", right_file, left_file);
30 + throw exit(code);
31 + }
33 + static int call( String... command) throws Exception
34 + {
35 + return new ProcessBuilder()
36 + .command(command)
37 + .inheritIO()
38 + .start()
39 + .onExit()
40 + .join()
41 + .exitValue();
42 + }
44 + static Throwable exit(int code) {
45 + System.exit(code);
46 + //abuse control flow to make compiler realize `exit` will never return
47 + return new Throwable();
48 + }
50 + static String emphasize_global(String message) {
51 + return "\033[4m" + message + "\033[0m";
52 + }
54 + static String emphasize_local(String message) {
55 + return "\033[3m" + message + "\033[0m";
56 + }
58 + static Throwable fail(String message, Object... arguments) {
59 + out.printf(message, arguments);
60 + System.exit(1);
61 + //abuse control flow to make compiler realize `exit` will never return
62 + return new Throwable();
63 + }
65 + static Throwable fail() {
66 + System.exit(1);
67 + //abuse control flow to make compiler realize `exit` will never return
68 + return new Throwable();
69 + }
71 +// vim:ft=java

subversion/diff3

Added
new 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 + }
74 +// vim:ft=java

subversion/merge

Added
new file mode 100755
1 +#!/usr/bin/java --source 17
3 +import static java.lang.System.* ;
4 +import java.util.*;
6 +class merge {
7 + public static void main(String[] command_line_arguments) throws Throwable
8 + {
9 + if(command_line_arguments.length != 5)
10 + throw fail("svn diff was supposed to give us 5 arguments. did the interface change? we got %s arguments.", command_line_arguments.length);
12 + var base_file = command_line_arguments[0];
13 + var theirs_file = command_line_arguments[1];
14 + var mine_file = command_line_arguments[2];
15 + var merged_file = command_line_arguments[3];
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);
20 + }
22 + static int call( String... command) throws Exception
23 + {
24 + return new ProcessBuilder()
25 + .command(command)
26 + .inheritIO()
27 + .start()
28 + .onExit()
29 + .join()
30 + .exitValue();
31 + }
33 + static Throwable exit(int code) {
34 + System.exit(code);
35 + //abuse control flow to make compiler realize `exit` will never return
36 + return new Throwable();
37 + }
39 + static String emphasize_global(String message) {
40 + return "\033[4m" + message + "\033[0m";
41 + }
43 + static String emphasize_local(String message) {
44 + return "\033[3m" + message + "\033[0m";
45 + }
47 + static Throwable fail(String message, Object... arguments) {
48 + out.printf(message, arguments);
49 + System.exit(1);
50 + //abuse control flow to make compiler realize `exit` will never return
51 + return new Throwable();
52 + }
54 + static Throwable fail() {
55 + System.exit(1);
56 + //abuse control flow to make compiler realize `exit` will never return
57 + return new Throwable();
58 + }
60 +// vim:ft=java

termux.symlinks

Added
new 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

topgrade/topgrade.termux.toml

Added
new file mode 100644
1 +# Don't ask for confirmations
2 +#assume_yes = true
4 +# Disable specific steps - same options as the command line flag
5 +#disable = ["system", "emacs"]
7 +# Ignore failures for these steps
8 +#ignore_failures = ["powershell"]
10 +# Run specific steps - same options as the command line flag
11 +#only = ["system", "emacs"]
13 +# Do not ask to retry failed steps (default: false)
14 +#no_retry = true
16 +# Sudo command to be used
17 +#sudo_command = "sudo"
19 +# Run `sudo -v` to cache credentials at the start of the run; this avoids a
20 +# blocking password prompt in the middle of a possibly-unattended run.
21 +#pre_sudo = false
23 +# Run inside tmux
24 +#run_in_tmux = true
26 +# List of remote machines with Topgrade installed on them
27 +#remote_topgrades = ["toothless", "pi", "parnas"]
29 +# Arguments to pass SSH when upgrading remote systems
30 +#ssh_arguments = "-o ConnectTimeout=2"
32 +# Path to Topgrade executable on remote machines
33 +#remote_topgrade_path = ".cargo/bin/topgrade"
35 +# Arguments to pass tmux when pulling Repositories
36 +#tmux_arguments = "-S /var/tmux.sock"
38 +# Do not set the terminal title
39 +#set_title = false
41 +# Display the time in step titles
42 +# display_time = true
44 +# Cleanup temporary or old files
45 +#cleanup = true
47 +# Skip sending a notification at the end of a run
48 +#skip_notify = true
50 +# Skip the preamble displayed when topgrade is run
51 +#display_preamble = false
53 +[git]
54 +#max_concurrency = 5
55 +# Additional git repositories to pull
56 +#repos = [
57 +# "~/src/*/",
58 +# "~/.config/something"
59 +#]
61 +# Don't pull the predefined git repos
62 +#pull_predefined = false
64 +# Arguments to pass Git when pulling Repositories
65 +#arguments = "--rebase --autostash"
67 +[composer]
68 +#self_update = true
70 +# Commands to run before anything
71 +[pre_commands]
72 +#"Emacs Snapshot" = "rm -rf ~/.emacs.d/elpa.bak && cp -rl ~/.emacs.d/elpa ~/.emacs.d/elpa.bak"
74 +# Custom commands
75 +[commands]
76 +#"Python Environment" = "~/dev/.env/bin/pip install -i https://pypi.python.org/simple -U --upgrade-strategy eager jupyter"
78 +[brew]
79 +#greedy_cask = true
80 +#autoremove = true
82 +[linux]
83 +# Arch Package Manager to use. Allowed values: autodetect, aura, garuda_update, pacman, pamac, paru, pikaur, trizen, yay.
84 +#arch_package_manager = "pacman"
85 +# Arguments to pass yay (or paru) when updating packages
86 +#yay_arguments = "--nodevel"
87 +# Arguments to pass dnf when updating packages
88 +#dnf_arguments = "--refresh"
89 +#aura_aur_arguments = "-kx"
90 +#aura_pacman_arguments = ""
91 +#garuda_update_arguments = ""
92 +#show_arch_news = true
93 +#trizen_arguments = "--devel"
94 +#pikaur_arguments = ""
95 +#pamac_arguments = "--no-devel"
96 +#enable_tlmgr = true
97 +#emerge_sync_flags = "-q"
98 +#emerge_update_flags = "-uDNa --with-bdeps=y world"
99 +#redhat_distro_sync = false
100 +#rpm_ostree = false
101 +#nix_arguments = "--flake"
103 +[python]
104 +#enable_pip_review = true ###disabled by default
105 +#enable_pipupgrade = true ###disabled by default
107 +[windows]
108 +# Manually select Windows updates
109 +#accept_all_updates = false
110 +#open_remotes_in_new_terminal = true
111 +#wsl_update_pre_release = true
112 +#wsl_update_use_web_download = true
114 +# Causes Topgrade to rename itself during the run to allow package managers
115 +# to upgrade it. Use this only if you installed Topgrade by using a package
116 +# manager such as Scoop or Cargo
117 +#self_rename = true
119 +[npm]
120 +# Use sudo if the NPM directory isn't owned by the current user
121 +#use_sudo = true
123 +[firmware]
124 +# Offer to update firmware; if false just check for and display available updates
125 +#upgrade = true
127 +[flatpak]
128 +# Use sudo for updating the system-wide installation
129 +#use_sudo = true
131 +[distrobox]
132 +#use_root = false
133 +#containers = ["archlinux-latest"]

wezterm/bugabinga/key_binds.lua

Modified
1 1 local wez = require 'wezterm'
2 -local leader = { key = 'raw:255'}
2 +local leader = { key = 'VoidSymbol'}
4 4 local resize_pane_mode = 'ﭕ Resize Pane Mode'
5 5 local activate_pane_mode = ' Activate Pane Mode'

wezterm/wezterm.service

Modified
1 1 [Unit]
2 2 Description=Wezterm Multiplexing Server
3 +After=gnome-session.target
4 5 [Service]
5 -# start with system shell as parent in order to inherit environment variables
6 -ExecStart=/bin/bash -c /usr/bin/wezterm-mux-server
6 +ExecStart=/usr/bin/wezterm-mux-server
7 7 Restart=on-failure
9 9 [Install]
10 -WantedBy=default.target
10 +WantedBy=gnome-session.target