.bashrc

@@ -1 +1 @@
-# TODO: Populate with correct content - get from WSL
+# TODO: Populate with correct content

.config/nushell/env.nu

@@ -1,6 +1,6 @@
 # Nushell Environment Config File
 #
-# version = "0.84.0"
+# version = 0.80.1
 
 def create_left_prompt [] {
     mut home = ""
@@ -13,7 +13,7 @@ def create_left_prompt [] {
     }
 
     let dir = ([
-        ($env.PWD | str substring 0..($home | str length) | str replace $home "~"),
+        ($env.PWD | str substring 0..($home | str length) | str replace --string $home "~"),
         ($env.PWD | str substring ($home | str length)..)
     ] | str join)
 
@@ -21,17 +21,18 @@ def create_left_prompt [] {
     let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold })
     let path_segment = $"($path_color)($dir)"
 
-    $path_segment | str replace --all (char path_sep) $"($separator_color)/($path_color)"
+    $path_segment | str replace --all --string (char path_sep) $"($separator_color)/($path_color)"
 }
 
 def create_right_prompt [] {
-    # create a right prompt in magenta with green separators and am/pm underlined
+    let time_segment_color = (ansi magenta)
+
     let time_segment = ([
         (ansi reset)
-        (ansi magenta)
-        (date now | format date '%Y/%m/%d %r')
-    ] | str join | str replace --regex --all "([/:])" $"(ansi green)${1}(ansi magenta)" |
-        str replace --regex --all "([AP]M)" $"(ansi magenta_underline)${1}")
+        $time_segment_color
+        (date now | date format '%m/%d/%Y %r')
+    ] | str join | str replace --all "([/:])" $"(ansi light_magenta_bold)${1}($time_segment_color)" |
+        str replace --all "([AP]M)" $"(ansi light_magenta_underline)${1}")
 
     let last_exit_code = if ($env.LAST_EXIT_CODE != 0) {([
         (ansi rb)
@@ -43,43 +44,47 @@ def create_right_prompt [] {
 }
 
 # Use nushell functions to define your right and left prompt
-$env.PROMPT_COMMAND = {|| create_left_prompt }
-# $env.PROMPT_COMMAND_RIGHT = {|| create_right_prompt }
+let-env PROMPT_COMMAND = {|| create_left_prompt }
+let-env PROMPT_COMMAND_RIGHT = {|| create_right_prompt }
 
 # The prompt indicators are environmental variables that represent
 # the state of the prompt
-$env.PROMPT_INDICATOR = {|| "> " }
-$env.PROMPT_INDICATOR_VI_INSERT = {|| "> " }
-$env.PROMPT_INDICATOR_VI_NORMAL = {|| ": " }
-$env.PROMPT_MULTILINE_INDICATOR = {|| ">>> " }
+let-env PROMPT_INDICATOR = {|| "> " }
+let-env PROMPT_INDICATOR_VI_INSERT = {|| "> " }
+let-env PROMPT_INDICATOR_VI_NORMAL = {|| ": " }
+let-env PROMPT_MULTILINE_INDICATOR = {|| ">>> " }
 
 # Specifies how environment variables are:
 # - converted from a string to a value on Nushell startup (from_string)
 # - converted from a value back to a string when running external commands (to_string)
 # Note: The conversions happen *after* config.nu is loaded
-$env.ENV_CONVERSIONS = {
-    "PATH": {
-        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
-        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
-    }
-    "Path": {
-        from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
-        to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
-    }
+let-env ENV_CONVERSIONS = {
+  "PATH": {
+    from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+    to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+  }
+  "Path": {
+    from_string: { |s| $s | split row (char esep) | path expand --no-symlink }
+    to_string: { |v| $v | path expand --no-symlink | str join (char esep) }
+  }
 }
 
 # Directories to search for scripts when calling source or use
-$env.NU_LIB_DIRS = [
-    ($nu.default-config-dir | path join 'scripts') # add <nushell-config-dir>/scripts
+#
+# By default, <nushell-config-dir>/scripts is added
+let-env NU_LIB_DIRS = [
+    ($nu.default-config-dir | path join 'scripts')
 ]
 
 # Directories to search for plugin binaries when calling register
-$env.NU_PLUGIN_DIRS = [
-    # ($nu.default-config-dir | path join 'plugins') # add <nushell-config-dir>/plugins
+#
+# By default, <nushell-config-dir>/plugins is added
+let-env NU_PLUGIN_DIRS = [
+    ($nu.default-config-dir | path join 'plugins')
 ]
 
 # To add entries to PATH (on Windows you might use Path), you can use the following pattern:
-# $env.PATH = ($env.PATH | split row (char esep) | prepend '/some/path')
+# let-env PATH = ($env.PATH | split row (char esep) | prepend '/some/path')
 
 mkdir ~/.cache/starship
 starship init nu | save -f ~/.cache/starship/init.nu
@@ -88,4 +93,4 @@ starship init nu | save -f ~/.cache/starship/init.nu
 # oh-my-posh init nu --config 'https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/dracula.omp.json' --print | save -f ~/.cache/oh-my-posh/init.nu
 
 mkdir ~/.cache/zoxide
-zoxide init nushell --cmd z | save -f ~/.cache/zoxide/init.nu
+zoxide init nushell --cmd cd | save -f ~/.cache/zoxide/init.nu

.config/nushell/scripts/nu_scripts

@@ -1 +1 @@
-Subproject commit c352f261548ee3c511bb4c0d3fa9a8bbeb8bba6c
+Subproject commit fde7f5b768b09fc40a90b2e0d6013a21784f6b07

.config/nvim

@@ -1 +1 @@
-Subproject commit abde3535d19cb3531ee42948cc20a9c75192960c
+Subproject commit 2168ae0c717a0adc9db47f405f8d8087d647bf42

.doom.d/config.el

@@ -120,11 +120,13 @@
 ;;     (add-hook 'post-command-hook #'paw64-post-command-hook nil t)
 ;;     (electric-indent-local-mode -1)))
 
-(use-package! arm-mode)
+(use-package! arm-mode :init :config)
 
-(use-package! json-navigator)
+(use-package! json-navigator :init :config)
 
-(use-package! ron-mode)
+(use-package! ron-mode :init :config)
+
+(use-package! typst-mode :init :config)
 
 (map! :map dap-mode-map
       :leader
@@ -156,8 +158,3 @@
       :desc "dap breakpoint condition"   "c" #'dap-breakpoint-condition
       :desc "dap breakpoint hit count"   "h" #'dap-breakpoint-hit-condition
       :desc "dap breakpoint log message" "l" #'dap-breakpoint-log-message)
-
-(use-package! typst-mode
-    :mode "\\.typ$")
-
-(use-package! nasm-mode)

.doom.d/init.el

@@ -145,7 +145,7 @@
        json                ; At least it ain't XML
        (java +lsp)         ; the poster child for carpal tunnel syndrome
        javascript          ; all(hope(abandon(ye(who(enter(here))))))
-       (julia +lsp)        ; a better, faster MATLAB
+       julia               ; a better, faster MATLAB
        ;;kotlin            ; a better, slicker Java(Script)
        latex               ; writing papers in Emacs has never been so fun
        ;;lean              ; for folks with too much to prove

.doom.d/packages.el

@@ -73,12 +73,13 @@
 ;;   :recipe (:host github :repo "svjson/paw64-mode"))
 (package! arm-mode
   :recipe (:host github :repo "charje/arm-mode"))
+;; (package! nasm-mode)
 
-(package! nasm-mode)
+
+(package! org-modern)
 
 (package! json-navigator)
 
 (package! polymode)
-
 (package! typst-mode
   :recipe (:host github :repo "Ziqi-Yang/typst-mode.el"))

.emacs.d

@@ -1 +1 @@
-Subproject commit 1a2789c9229f6a6bd4c9001667f3134ec8b8247b
+Subproject commit 07fca786154551f90f36535bfb21f8ca4abd5027

.gitconfig

@@ -4,7 +4,13 @@
     signingkey = 7A9CA430D426100E
 
 [core]
-    editor = nvim
+    editor = emacsclient -a "" -ut
+    pager = delta
+
+[interactive]
+    diffFilter = delta --color-only
+[add.interactive]
+    useBuiltin = false # required for git 2.37.0
 
 [delta]
     navigate = true    # use n and N to move between diff sections
@@ -21,7 +27,6 @@
 
 [gpg]
     program = gpg2
-    #program = "C:/Program Files (x86)/GnuPG/bin/gpg.exe"
 
 [pull]
     rebase = false

.gitignore

@@ -6,7 +6,6 @@
 !/.doom.d
 !/.emacs.d
 !/.gitconfig
-!/.gitmodules
 !/.nvidia-xinitrc
 !/.password-store
 !/.restore-permissions

.gitmodules

@@ -1,12 +1,12 @@
 [submodule ".password-store"]
 	path = .password-store
-	url = gitlab@gitlab.dustvoice.de:DustVoice/pass.git
+	url = git@git.dustvoice.de:DustVoice/pass.git
 [submodule ".config/nvim"]
 	path = .config/nvim
-	url = https://gitlab.dustvoice.de/DustVoice/nvim.git
+	url = git@git.dustvoice.de:DustVoice/nvim.git
 [submodule ".znap/dustvoice-zsh-theme"]
 	path = .znap/dustvoice-zsh-theme
-	url = https://github.com/DustVoice/dustvoice-zsh-theme.git
+	url = git@github.com:DustVoice/dustvoice-zsh-theme.git
 [submodule ".znap/zsh-snap"]
 	path = .znap/zsh-snap
 	url = https://github.com/marlonrichert/zsh-snap.git

.xonshrc

@@ -1,4 +1 @@
-# XONSH WIZARD START
-$CMD_COMPLETIONS_SHOW_DESC = '1'
-xontrib load conda coreutils
-# XONSH WIZARD END
+execx($(starship init xonsh))