From 09e985796db767d21b654111c7f9d6888092f889 Mon Sep 17 00:00:00 2001
From: alisceon <alisceon@protonmail.com>
Date: Thu, 4 Sep 2025 15:32:14 +0200
Subject: [PATCH] syntaxing

---
 hosts/common/base.nix | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/hosts/common/base.nix b/hosts/common/base.nix
index 3bcfbe3..a39e23e 100644
--- a/hosts/common/base.nix
+++ b/hosts/common/base.nix
@@ -157,8 +157,20 @@
         )
       ]; # end extraPackages
       config = ''
+        ## ENV ##
         $XONSH_COLOR_STYLE = 'native'
         $PROMPT = '{YELLOW}{env_name}{RESET}{BOLD_GREEN}{user}@{hostname}{BOLD_BLUE} {cwd}{branch_color}{curr_branch: {}}{RESET} {RED}{last_return_code_if_nonzero:[{BOLD_INTENSE_RED}{}{RED}] }{RESET}{BOLD_BLUE}{prompt_end}{RESET} '
+        
+        # Coloured man page support using 'less' env vars
+        $LESS_TERMCAP_mb = "\033[01;31m"
+        $LESS_TERMCAP_md = "\033[01;31m"
+        $LESS_TERMCAP_me = "\033[0m"
+        $LESS_TERMCAP_so = "\033[01;44;36m"
+        $LESS_TERMCAP_se = "\033[0m"
+        $LESS_TERMCAP_us = "\033[00;36m"
+        $LESS_TERMCAP_ue = "\033[0m"
+        
+        ## XONTRIB ##
         xontrib load coreutils
         xontrib load fish_completer
         xontrib load direnv
@@ -173,6 +185,7 @@
         XSH.env['fzf_file_binding'] = "c-t"  # Ctrl+T
         XSH.env['fzf_dir_binding'] = "c-g"  # Ctrl+G
 
+        ## ALIASES ##
         aliases["tsla-fan"] = "ipmitool -H 10.30.0.3 -U ADMIN -P ADMIN raw 0x30 0x70 0x66 0x01 0x0"
         aliases["nixoss"] = "sudo nixos-rebuild switch --flake .#${config.networking.hostName}"
         aliases["nixost"] = "sudo nixos-rebuild test --flake .#${config.networking.hostName}"
@@ -186,16 +199,6 @@
         aliases["ls"] = "exa"
         aliases["ll"] = "exa -lah"
         aliases["grep"] = "rg"
-
-        # Coloured man page support
-        # using 'less' env vars (format is '\E[<brightness>;<colour>m')
-        $LESS_TERMCAP_mb = "\033[01;31m"     # begin blinking
-        $LESS_TERMCAP_md = "\033[01;31m"     # begin bold
-        $LESS_TERMCAP_me = "\033[0m"         # end mode
-        $LESS_TERMCAP_so = "\033[01;44;36m"  # begin standout-mode (bottom of screen)
-        $LESS_TERMCAP_se = "\033[0m"         # end standout-mode
-        $LESS_TERMCAP_us = "\033[00;36m"     # begin underline
-        $LESS_TERMCAP_ue = "\033[0m"         # end underline
       '';
     }; # end xonsh
   }; # end programs