dotfiles
bugabingas dorkfiles
owned by bugabinga
Merge branch 'trunk' of github.com:bugabinga/dotfiles into trunk
b1f3fe131f7ecee1799f8566755dbdc38df184c2
Oliver Jan Krylow <oliver@bugabinga.net> ·
unsigned
Browse filesCompare with HEAD
Changed files (14)
2 - name
= Oliver Jan Krylow 3 - email
= oliver@bugabinga.net 2 + name
= Oliver Jan Krylow 3 + email
= oliver@bugabinga.net 13 13 preloadIndex
= true 26 - colorMoved
= default 26 + colorMoved
= default 33 - cmd
= "meld \"$LOCAL\" \"$REMOTE\"" 33 + cmd
= "meld \"$LOCAL\" \"$REMOTE\"" 35 35 [
difftool "difftastic"]
36 - cmd
= "difft \"$LOCAL\" \"$REMOTE\"" 36 + cmd
= "difft \"$LOCAL\" \"$REMOTE\"" 48 48 [
mergetool "meld_merge"]
49 - cmd
= "meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\" " 49 + cmd
= "meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\" " 51 51 [
mergetool "nvim_merge"]
52 - cmd
= "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\" " 52 + cmd
= "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\" " 55 - autoSetupRemote
= true 56 - default
= "upstream" 55 + autoSetupRemote
= true 56 + default
= "upstream" 62 - diffFilter
= delta --color-only 62 + diffFilter
= delta --color-only 72 - diffFilter
= delta --color-only 72 + diffFilter
= delta --color-only 75 - defaultBranch
= trunk 75 + defaultBranch
= trunk 87 - path
= .gitconfig.include 87 + path
= .gitconfig.include neovim/lua/bugabinga/editorconfig.lua
Modified31 31 editorconfig.properties.
diagnostic = function ( bufnr, value )
32 32 local option
= tobool( value )
34 - vim.diagnostic.enable( bufnr )
34 + vim.diagnostic.enable(
true, {
bufnr = bufnr, } )
36 - vim.diagnostic.disable( bufnr )
36 + vim.diagnostic.enable(
false, {
bufnr = bufnr } )
neovim/lua/bugabinga/plugins/lint.lua
Modified12 - lua = {
'luacheck', },
12 + lua = {
'selene', },
13 13 sh = {
'shellcheck', },
14 - nu = {
'nu-check', },
nushell/config.nu
Modified 2 +use modules/table.nu *
4 +use modules/prompt.nu *
5 +use modules/aliases.nu *
7 +use modules/openssl.nu *
11 13 let default_theme = {
84 - if (which direnv | is-empty) {
87 - direnv
export json | from json | default {} | load-env
91 85 use_ansi_coloring: true
100 94 sync_on_enter: true
106 - name: completion_menu
107 - only_buffer_difference: false
117 - selected_text: green_reverse
118 - description_text: yellow
123 - only_buffer_difference: true
131 - selected_text: green_reverse
132 - description_text: yellow
137 - only_buffer_difference: true
140 - layout: description
145 - description_rows:
10 149 - selected_text: green_reverse
150 - description_text: yellow
157 - name: commands_menu
158 - only_buffer_difference: false
168 - selected_text: green_reverse
169 - description_text: yellow
171 - source: { |buffer, position|
173 - |
where command =~
$buffer 174 - |
each { |it| {value:
$it.command description:
$it.usage} }
179 - only_buffer_difference: true
187 - selected_text: green_reverse
188 - description_text: yellow
190 - source: { |buffer, position|
192 - |
where name =~
$buffer 194 - |
each { |it| {value:
$it.name description:
$it.type} }
198 - name: commands_with_description
199 - only_buffer_difference: true
202 - layout: description
207 - description_rows:
10 211 - selected_text: green_reverse
212 - description_text: yellow
214 - source: { |buffer, position|
216 - |
where command =~
$buffer 217 - |
each { |it| {value:
$it.command description:
$it.usage} }
223 - name: completion_menu
229 - { send: menu name: completion_menu }
235 - name: completion_previous
238 - mode: [emacs, vi_normal, vi_insert]
239 - event: { send: menuprevious }
248 - { send: menu name: history_menu }
249 - { send: menupagenext }
254 - name: history_previous
260 - { send: menupageprevious }
267 - name: commands_menu
270 - mode: [emacs, vi_normal, vi_insert]
271 - event: { send: menu name: commands_menu }
277 - mode: [emacs, vi_normal, vi_insert]
278 - event: { send: menu name: vars_menu }
281 - name: commands_with_description
284 - mode: [emacs, vi_normal, vi_insert]
285 - event: { send: menu name: commands_with_description }
100 +source (
$nu.config-path | path dirname | path join
"zoxide.nu")
5 5 $env.WIN32 = (
$nu.os-info.name =~
"windows" )
6 6 $env.NURC_DIR = (
$nu.config-path | path expand | path dirname )
7 7 $env.DOTFILES = (
$env.NURC_DIR | path join
".." | path expand )
8 -$env.WORKSPACE =
if $env.WIN32 {
"W:/" }
else {
"~/Workspace" | path expand }
9 -$env.NOTES =
if $env.WIN32 {
"N:/" }
else {
"~/Notes" | path expand }
8 +$env.WORKSPACE =
if $env.WIN32 {
"~/Workspaces" }
else {
"~/Workspace" | path expand }
9 +$env.NOTES = (
"~/Notes" | path expand)
10 +$env.TOOLS = (
"~/Tools" | path expand)
11 12 if not (which nvim | is-empty) {
12 13 $env.EDITOR =
'nvim' 18 19 if (
$env | get -i TERM_PROGRAM) == WezTerm {
19 - $env.TERM =
"wezterm" 21 - $env.TERMCAP = ~./termcap/w/wezterm
20 + $env.TERM =
"xterm-256color" 39 37 to_string: { |v|
$v | str join (char esep) }
45 - (
$nu.config-path | path dirname | path join
'modules'),
46 - (
$nu.config-path | path dirname | path join
'completions')
nushell/modules/md.nu
Addednew file mode 100644 2 +export def --env main [ p:path ] {
nushell/modules/prompt.nu
Modified 36 +def prompt-git-branch [] {
36 39 def get_vcs_path [] {
38 41 let pwd = (
$env.PWD | path expand)
40 43 let svn_relative_cmd = (
do --ignore-errors { ^svn info --show-item relative-url --no-newline
$pwd | complete } )
41 44 let svn_relative_path =
if ( (not (
$svn_relative_cmd | is-empty)) and (
$svn_relative_cmd.exit_code ==
0)) { $
" 🐢 (char nf_branch) ($svn_relative_cmd.stdout)" }
43 - let git_status = (
do --ignore-errors { gstat } )
44 - let git_branch =
if ( ( not (
$git_status | is-empty)) and (
$git_status.branch !=
"no_branch") ) { $
" (char nf_git) (char nf_branch) ($git_status.branch)" }
46 + let git_branch_cmd = (
do -i { ^git rev-parse --abbrev-ref HEAD | complete } )
47 + let git_path =
if (not (
$git_branch_cmd | is-empty) and (
$git_branch_cmd.exit_code ==
0)) { $
" (char nf_git) (char nf_branch) ($git_branch_cmd.stdout | str trim -r)" }
87 90 $command_status_segment 90 - (
if (sys).host.hostname ==
"x230" { (akku) }
else {
$time_segment })
93 + (
if (sys host).hostname ==
"x230" { (akku) }
else {
$time_segment })
nushell/modules/zoxide.nu
Deleteddeleted file mode 10064410 - $env.config = (
$env | default {} config).config
11 - $env.config = (
$env.config | default {} hooks)
12 - $env.config = (
$env.config | update hooks (
$env.config.hooks | default [] pre_prompt))
13 - $env.config = (
$env.config | update hooks.pre_prompt (
$env.config.hooks.pre_prompt | append { ||
14 - zoxide add --
$env.PWD 24 -export def --env __zoxide_z [...rest:string] {
26 - let arg0 = (
$rest | append
'~').
0 27 - let path =
if ((
$rest | length) <=
1) and (
$arg0 ==
'-' or (
$arg0 | path expand | path type) == dir) {
30 - (zoxide query --exclude
$env.PWD -- ...
$rest | str trim -r -c
"\n")
36 -export def --env __zoxide_zi [...rest:string] {
37 - cd $
'(zoxide query -i -- ...$rest | str trim -r -c "\n")' 45 -export alias z = __zoxide_z
46 -export alias zi = __zoxide_zi
tools/cargo-tools.nu
Modified 8 8 [ name bin crago_args];
9 - [
"inferno" "inferno-flamegraph" [] ]
10 - [
"nu" "nu" [
"--features" "extra" ] ]
12 - [
"ouch" "ouch" [] ]
13 - [
"fd-find" "fd" [] ]
14 - [
"choose",
"choose", [] ]
15 - [
"ripgrep" "rg" [] ]
17 - [
"mdcat" "mdcat" [] ]
18 - [
"cargo-update" "cargo-install-update" [] ]
10 + [
"bottom" "btm" [] ]
19 11 [
"cargo-cache" "cargo-cache" [] ]
12 + [
"cargo-update" "cargo-install-update" [] ]
13 + [
"choose",
"choose", [] ]
16 + [
"fd-find" "fd" [] ]
17 + [
"git-delta" "delta" [] ]
18 + [
"gitu" "gitu" [
"--locked" ] ]
20 19 [
"hexyl" "hexyl" [] ]
21 20 [
"hyperfine" "hyperfine" [] ]
22 - [
"tealdeer" "tldr" [] ]
23 - [
"tokei" "tokei" [] ]
25 - [
"pastel" "pastel" [] ]
26 - [
"zoxide" "zoxide" [] ]
27 - [
"lychee" "lychee" [] ]
29 - [
"vivid" "vivid" [] ]
30 - [
"bottom" "btm" [] ]
31 21 [
"just" "just" [] ]
23 + [
"lychee" "lychee" [
"--locked" "--no-default-features" "--features" "rustls-tls,email-check"] ]
24 + [
"mdcat" "mdcat" [] ]
32 25 [
"mdsh" "mdsh" [] ]
33 - [
"git-delta" "delta" [] ]
26 + [
"nu" "nu" [
"--features" "extra" ] ]
27 + [
"ouch" "ouch" [] ]
28 + [
"pastel" "pastel" [] ]
29 + [
"ripgrep" "rg" [] ]
34 31 [
"selene" "selene" [
"--no-default-features" ] ]
35 32 [
"stylua" "stylua" [
"--features" "lua52" ] ]
36 33 [
"taplo-cli" "taplo" [] ]
38 - [
"gitu" "gitu" [
"--locked" ] ]
39 - [
"yazi-fm" "yazi" [
"--locked" ] ]
34 + [
"tealdeer" "tldr" [] ]
35 + [
"tokei" "tokei" [] ]
37 + [
"vivid" "vivid" [] ]
40 38 [
"yazi-cli" "ya" [
"--locked" ] ]
39 + [
"yazi-fm" "yazi" [
"--locked" ] ]
40 + [
"zoxide" "zoxide" [] ]
topgrade/topgrade.linux.toml
Modified44 44 "00 - Refresh Dotfiles" =
"java ~/Workspace/dotfiles/bootstripper.java ~/Workspace/dotfiles" 48 47 "01 - Install Cargo Tools" =
"nu --env-config ~/.config/nushell/env.nu ~/Workspace/dotfiles/tools/cargo-tools.nu" topgrade/topgrade.windows.toml
Modified 27 +repos = [
"C:/Users/okr/Workspaces/*/"]
29 29 max_concurrency =
12 41 -"01 - Scoop Export" =
"scoop export --config > 'X:/scoop_installed_apps.json' *> $null" 41 +"01 - Winget Export" =
"winget export --disable-interactivity --accept-source-agreements --output 'C:/Users/okr/Tools/winget_installed_apps.json' *> $null" 44 -"00 - Register Nu Plugins" =
"nu -c 'register ~\\scoop\\apps\\nu\\current\\nu_plugin_gstat.exe'" 45 44 "10 - Refresh dotfiles" =
"java W:/dotfiles/bootstripper.java W:/dotfiles" 46 45 "20 - Install Cargo Tools" =
"nu --env-config ~/AppData/Roaming/nushell/env.nu W:/dotfiles/tools/cargo-tools.nu" 47 46 "30 - Advantage-PM Client" =
"nu X:/update_apm_client.nu" wezterm/bugabinga/workspaces.lua
Modified 4 4 local wez
= require 'wezterm' 6 6 local win32
= wez.target_triple:find
'windows' 8 8 local get_my_code_workspace = function()
10 + return wez.home_dir
.. '/Workspaces' 12 - return os.
getenv 'HOME' .. '/Workspace' 12 + return wez.home_dir
.. '/Workspace' 61 61 wez.on(
'gui-attached',
function()
68 -wez.on(
'mux-startup',
function()
wezterm/wezterm.lua
Modified 17 17 local font
= wez.font
'Cousine' 18 18 if hostname
== 'x230' then 20 20 enable_wayland
= true 21 21 elseif hostname
== 'NB-00718' then 23 23 elseif hostname
== 'fedora' then 25 25 local font_names
= {}
102 102 default_prog
= {
'nu',
'--login' },
103 103 default_cursor_style
= 'SteadyBlock',
105 - exec_domains
= not win32
and exec_domains
or {},
106 - unix_domains
= { {
name =
'mux' } },
107 - default_gui_startup_args
= {
'connect',
'mux' },
105 + exec_domains
= exec_domains,
110 110 font_size
= font_size,