repositories / dotfiles

dotfiles

bugabingas dorkfiles

owned by bugabinga

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

34822b01ab816fea26eb121fa346228a3e6b19be

Oliver Jan Krylow <oliver@bugabinga.net> ·

unsigned

Browse filesCompare with HEAD

Changed files (8)

PC-00625.symlinks

Modified
16 16 stackoverflow/so
17 17 ~/AppData/Roaming/Sam Tay/so
19 -subversion/config
19 +subversion/config.win32
20 20 ~/AppData/Roaming/Subversion/config
22 22 subversion/diff
28 28 subversion/merge
29 29 ~/AppData/Roaming/Subversion/merge
31 +subversion/diff.bat
32 +~/AppData/Roaming/Subversion/diff.bat
34 +subversion/diff3.bat
35 +~/AppData/Roaming/Subversion/diff3.bat
37 +subversion/merge.bat
38 +~/AppData/Roaming/Subversion/merge.bat
32 40 cargo/config.toml
33 41 ~/scoop/persist/rustup/.cargo/config.toml
41 49 helix/config.toml
42 50 ~/AppData/Roaming/helix/config.toml
52 +helix/languages.toml
53 +~/AppData/Roaming/helix/languages.toml
44 55 helix/themes
45 56 ~/AppData/Roaming/helix/themes

helix/languages.toml

Modified
1 1 [[language]]
2 2 name = "nasm"
3 3 language-server = { command = "asm-lsp" }
5 +[[language]]
6 +name = "xml"
7 +auto-format = false
8 +language-server = { command = "lemminx" }

subversion/config

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

subversion/config.win32

Added
new 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 = hx
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 +# TODO windows versions as bat files
55 +diff-cmd = C:/Users/okr/AppData/Roaming/Subversion/diff.bat
56 +### Diff-extensions are arguments passed to an external diff
57 +### program or to Subversion's internal diff implementation.
58 +### Set diff-extensions to override the default arguments ('-u').
59 +# diff-extensions =
60 +### Set diff3-cmd to the absolute path of your 'diff3' program.
61 +### This will override the compile-time default, which is to use
62 +### Subversion's internal diff3 implementation.
63 +diff3-cmd = C:/Users/okr/AppData/Roaming/Subversion/diff3.bat
64 +### Set diff3-has-program-arg to 'yes' if your 'diff3' program
65 +### accepts the '--diff-program' option.
66 +# diff3-has-program-arg = no
67 +### Set merge-tool-cmd to the command used to invoke your external
68 +### merging tool of choice. Subversion will pass 5 arguments to
69 +### the specified command: base theirs mine merged wcfile
70 +merge-tool-cmd = C:/Users/okr/AppData/Roaming/Subversion/merge.bat
72 +### Section for configuring tunnel agents.
73 +[tunnels]
74 +### Configure svn protocol tunnel schemes here. By default, only
75 +### the 'ssh' scheme is defined. You can define other schemes to
76 +### be used with 'svn+scheme://hostname/path' URLs. A scheme
77 +### definition is simply a command, optionally prefixed by an
78 +### environment variable name which can override the command if it
79 +### is defined. The command (or environment variable) may contain
80 +### arguments, using standard shell quoting for arguments with
81 +### spaces. The command will be invoked as:
82 +### <command> <hostname> svnserve -t
83 +### (If the URL includes a username, then the hostname will be
84 +### passed to the tunnel agent as <user>@<hostname>.) If the
85 +### built-in ssh scheme were not predefined, it could be defined
86 +### as:
87 +# ssh = $SVN_SSH ssh -q -o ControlMaster=no --
88 +### If you wanted to define a new 'rsh' scheme, to be used with
89 +### 'svn+rsh:' URLs, you could do so as follows:
90 +# rsh = rsh --
91 +### Or, if you wanted to specify a full path and arguments:
92 +# rsh = /path/to/rsh -l myusername --
93 +### On Windows, if you are specifying a full path to a command,
94 +### use a forward slash (/) or a paired backslash (\\) as the
95 +### path separator. A single backslash will be treated as an
96 +### escape for the following character.
98 +### Section for configuring miscellaneous Subversion options.
99 +[miscellany]
100 +### Set global-ignores to a set of whitespace-delimited globs
101 +### which Subversion will ignore in its 'status' output, and
102 +### while importing or adding files and directories.
103 +### '*' matches leading dots, e.g. '*.rej' matches '.foo.rej'.
104 +# global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__
105 +# *.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db
106 +### Set log-encoding to the default encoding for log messages
107 +# log-encoding = latin1
108 +### Set use-commit-times to make checkout/update/switch/revert
109 +### put last-committed timestamps on every file touched.
110 +# use-commit-times = yes
111 +### Set no-unlock to prevent 'svn commit' from automatically
112 +### releasing locks on files.
113 +# no-unlock = yes
114 +### Set mime-types-file to a MIME type registry file, used to
115 +### provide hints to Subversion's MIME type auto-detection
116 +### algorithm.
117 +# mime-types-file = /path/to/mime.types
118 +### Set preserved-conflict-file-exts to a whitespace-delimited
119 +### list of patterns matching file extensions which should be
120 +### preserved in generated conflict file names. By default,
121 +### conflict files use custom extensions.
122 +# preserved-conflict-file-exts = doc ppt xls od?
123 +### Set enable-auto-props to 'yes' to enable automatic properties
124 +### for 'svn add' and 'svn import', it defaults to 'no'.
125 +### Automatic properties are defined in the section 'auto-props'.
126 +# enable-auto-props = yes
127 +### Set interactive-conflicts to 'no' to disable interactive
128 +### conflict resolution prompting. It defaults to 'yes'.
129 +# interactive-conflicts = no
130 +### Set memory-cache-size to define the size of the memory cache
131 +### used by the client when accessing a FSFS repository via
132 +### ra_local (the file:// scheme). The value represents the number
133 +### of MB used by the cache.
134 +# memory-cache-size = 16
135 +### Set diff-ignore-content-type to 'yes' to cause 'svn diff' to
136 +### attempt to show differences of all modified files regardless
137 +### of their MIME content type. By default, Subversion will only
138 +### attempt to show differences for files believed to have human-
139 +### readable (non-binary) content. This option is especially
140 +### useful when Subversion is configured (via the 'diff-cmd'
141 +### option) to employ an external differencing tool which is able
142 +### to show meaningful differences for binary file formats. [New
143 +### in 1.9]
144 +# diff-ignore-content-type = no
146 +### Section for configuring automatic properties.
147 +[auto-props]
148 +### The format of the entries is:
149 +### file-name-pattern = propname[=value][;propname[=value]...]
150 +### The file-name-pattern can contain wildcards (such as '*' and
151 +### '?'). All entries which match (case-insensitively) will be
152 +### applied to the file. Note that auto-props functionality
153 +### must be enabled, which is typically done by setting the
154 +### 'enable-auto-props' option.
155 +# *.c = svn:eol-style=native
156 +# *.cpp = svn:eol-style=native
157 +# *.h = svn:keywords=Author Date Id Rev URL;svn:eol-style=native
158 +# *.dsp = svn:eol-style=CRLF
159 +# *.dsw = svn:eol-style=CRLF
160 +# *.sh = svn:eol-style=native;svn:executable
161 +# *.txt = svn:eol-style=native;svn:keywords=Author Date Id Rev URL;
162 +# *.png = svn:mime-type=image/png
163 +# *.jpg = svn:mime-type=image/jpeg
164 +# Makefile = svn:eol-style=native
166 +### Section for configuring working copies.
167 +[working-copy]
168 +### Set to a list of the names of specific clients that should use
169 +### exclusive SQLite locking of working copies. This increases the
170 +### performance of the client but prevents concurrent access by
171 +### other clients. Third-party clients may also support this
172 +### option.
173 +### Possible values:
174 +### svn (the command line client)
175 +# exclusive-locking-clients =
176 +### Set to true to enable exclusive SQLite locking of working
177 +### copies by all clients using the 1.8 APIs. Enabling this may
178 +### cause some clients to fail to work properly. This does not have
179 +### to be set for exclusive-locking-clients to work.
180 +# exclusive-locking = false
181 +### Set the SQLite busy timeout in milliseconds: the maximum time
182 +### the client waits to get access to the SQLite database before
183 +### returning an error. The default is 10000, i.e. 10 seconds.
184 +### Longer values may be useful when exclusive locking is enabled.
185 +# busy-timeout = 10000

subversion/diff

Modified
26 26 var left_file = command_line_arguments[5];
27 27 var right_file = command_line_arguments[6];
29 - var code = call("difft", "--tab-width","2", right_file, left_file);
29 + var code = call("difft", "--display", "inline", "--tab-width", "2", right_file, left_file);
30 30 throw exit(code);

subversion/diff.bat

Added
new file mode 100644
1 +@echo off
2 +java --source 17 %~dp0/diff %*

subversion/diff3.bat

Added
new file mode 100644
1 +@echo off
2 +java --source 17 %~dp0/diff3 %*

subversion/merge.bat

Added
new file mode 100644
1 +@echo off
2 +java --source 17 %~dp0/merge %*