Merge branch 'master' of ssh://ssh.nx2.site:50022/nx2/dotfiles

configuration.nix

@@ -64,6 +64,7 @@
 
   system.stateVersion = hyper.main-pkgs-version;
 
+  programs.nix-ld.enable = true; 
   programs.bash.shellInit = ''
     if [[ "$USER" == "${hyper.user}" ]]; then
       source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh

flake-modules/colors.json

@@ -27,15 +27,15 @@
     },
     "NxNORTH": {
         "base": {
-            "foreground": "#ccd6fe",
+            "foreground": "#e7ccfe",
-            "background": "#000519"
+            "background": "#0d0019"
         },
         "to_alter": {
-            "accent": "#325dff",
+            "accent": "#9f35fc",
-            "secondary": "#ff3233",
+            "secondary": "#324cff",
-            "tertiary": "#3cff32",
+            "tertiary": "#4a62e7",
-            "special": "#ffd331",
+            "special": "#91fc34",
-            "weird": "#ff31e5"
+            "weird": "#fc344f"
         }
     },
     "NxDCS": {

home-modules/firefox/userChrome.nix

@@ -65,7 +65,8 @@ in /* css */ ''
 
     background                               : linear-gradient(180deg,rgba(${f secondary.dark}, ${builtins.toString rice.transparency}) 0%, rgba(${f accent.dark}, ${builtins.toString rice.transparency}) 100%) !important;
   }
-  .tabbrowser-tab[selected="true"] {
+  .tabbrowser-tab[selected="true"], .tab-text[selected=""],
+  .tab-close-button[selected=""] {
     color: ${background} !important;
   }
   hbox#browser {

home-modules/firefox/userContent.nix

@@ -39,6 +39,9 @@ in /* css */ ''
     body, html, .bg-neutral-background, .threadline, reddit-sidebar-nav, shreddit-post, aside, .reddit-search-bar, comment-body-header, shreddit-comment-tree, #flex-left-nav-container {
       background-color: transparent !important;
     }
+    #search-dropdown-results-container {
+      background: rgba(${f background},0.8) !important;
+    }
     #main-content {
       background-color: rgba(${f background},0.5)!important;
     }

home-modules/fish.nix

@@ -96,7 +96,9 @@
     interactiveShellInit = /* fish */ ''
       set -g fish_greeting
       if not set -q IN_NIX_SHELL
-        if set -q SESSION_FROM_DE
+        if set -q SESSION_FROM_DE; or set -q SESSION_CLONED_FROM_YAZI
+          set -e SESSION_FROM_DE
+          set -e SESSION_CLONED_FROM_YAZI
           set tmp (mktemp -t "yazi-cwd.XXXXX")
           yazi --cwd-file="$tmp" ~
           if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
@@ -105,7 +107,6 @@
           rm -f -- "$tmp"
         end
         nxfetch
-        set -e SESSION_FROM_DE
       end
     '';
     functions = {
@@ -115,10 +116,21 @@
       '';
       nx_backup = let
         destination = if hyper.host == "NxNORTH" then "${hyper.home}/shared/" else "${hyper.home}/backups/";
-      in pkgs.lib.mkIf (hyper.isPersonal) ''
+      in pkgs.lib.mkIf (hyper.isPersonal) /* fish */ ''
         set RPATH (curl -s https://${hyper.domain}/latest-backup)
         rsync -avz --info=progress2 -e "ssh -p ${builtins.toString secrets.ssh.port}" ${hyper.user}@ssh.${hyper.domain}:"$RPATH" ${destination}
       '';
+      nx_yazi_into_fish = /* fish */ ''
+        set tmp (mktemp -t "yazi-cwd.XXXXX")
+        echo "$PWD" > "$tmp"
+        yazi --cwd-file="$tmp"
+        if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
+            builtin cd -- "$cwd"
+        end
+        rm -f "$tmp"
+        set -g SESSION_CLONED_FROM_YAZI TRUE
+      '';
+      
       # gpg = '';
       #   set bold \e[1m
       #   set green \e[32m

home-modules/ghostty.nix

@@ -5,6 +5,7 @@
     package = pkgs.ghostty;
     settings = with rice.color; {
       background = background;
+      window-padding-color = "extend";
       background-opacity = builtins.toString rice.transparency;
       clipboard-paste-protection = false;
       clipboard-read = "allow";

home-modules/helix.nix

@@ -305,31 +305,40 @@
         "constant" = accent.bright; 
         "constant.character.escape" = special.bright;
         "constant.numeric" = foreground; 
-        "constructor" = weird.base;
+        "constructor" = secondary.bright;
         "debug" = yellow.base;
         "diagnostic.modifiers" = [ "underline" ];
         "diff.delta" = subtle.bright; 
         "diff.minus" = negative.bright; 
         "diff.plus" = positive.bright; 
-        "error" = red.base; 
+        "error" = negative.base; 
         "function" = secondary.bright; 
         "hint" = tertiary.bright;
         "info" = foreground; 
-        "keyword" = special.base;
+        "keyword" = {
-        "keyword.modifiers" = [ "italic" ];
+          fg = special.base;
+          modifiers = [ "bold" ];
+        };
         "label" = foreground;
         "namespace" = weird.bright;
         "operator" = foreground;
         "special" = special.base; 
         "string" = secondary.bright; 
-        "type" = red.base; 
+        "type" = {
-        "variable" = accent.base; 
+          fg = tertiary.base; 
-        "variableother.member" = foreground; 
+        };
-        "warning" = red.base; 
+        "variable" = { fg = accent.base; }; 
+        "variable.builtin" = { fg = accent.base; bg = subtle.darker; };
+        "variable.parameter" = { fg = accent.base; bg = accent.darker; };
+        "warning" = yellow.base; 
 
-        "markup.heading" = accent.base; 
+        "markup.heading" = {
+          fg = accent.base; 
+          bg = accent.darker;
+          modifiers = [ "bold" ];
+        };
         "markup.bold" = {
-          fg = tertiary.bright; 
+          fg = secondary.bright; 
           modifiers = [ "bold" ];
         };
         "italic" = {
@@ -339,7 +348,7 @@
         "markup.linktext" = accent.base; 
         "markup.linkurl" = {
           fg = tertiary.dark; 
-          modifiers = [ "underlined" ];
+          underline.style = "line";
         };
         "markup.list" = accent.bright; 
         "markup.quote" = weird.bright; 
@@ -356,7 +365,7 @@
         };
         "ui.bufferline" = { # the top line ("tab"-line)
           fg = accent.base;
-          bg = black.base;
+          bg = accent.darker;
         };
         "ui.bufferline.active" = { # the active "tab"
           fg = background;
@@ -368,22 +377,22 @@
           modifiers = [ "reversed" ];
         };
         "ui.cursorline.primary" = { # the line on which the cursor is on
-          bg = black.base;
+          bg = secondary.darker;
         };
         "ui.cursor.match" = { # Matching bracket etc.
-          bg = green.dark;
+          bg = special.dark;
           modifiers = [ ];
         };
         "ui.gutter" = {
-          bg = black.base;
+          bg = accent.darker;
         };
         "ui.help" = {
-          fg = green.base;
+          fg = accent.base;
-          bg = black.base;
+          bg = accent.darker;
         };
         "ui.linenr" = {
-          fg = white.dark;
+          fg = accent.bright;
-          bg = black.base;
+          bg = accent.darker;
         };
         "ui.linenr.selected" = {
           fg = accent.bright;
@@ -391,18 +400,18 @@
         };
         "ui.menu" = {
           fg = accent.base;
-          bg = black.base;
+          bg = accent.darker;
         };
         "ui.menu.scroll" = {
-          fg = yellow.dark;
+          fg = subtle.base;
           bg = background;
         };
         "ui.menu.selected" = {
-          fg = red.base;
+          fg = secondary.bright;
-          bg = blue.dark;
+          bg = secondary.darker;
         };
         "ui.popup" = {
-          bg = black.base;
+          bg = accent.darker;
         };
         "ui.selection" = {
           bg = accent.dark;
@@ -412,11 +421,11 @@
         };
         "ui.statusline" = {
           fg = accent.bright;
-          bg = black.base;
+          bg = accent.darker;
         };
         "ui.statusline.inactive" = {
-          fg = red.bright;
+          fg = secondary.bright;
-          bg = red.dark;
+          bg = secondary.dark;
         };
         "ui.statusline.insert" = {
           fg = green.bright;
@@ -433,7 +442,7 @@
         "ui.text" = foreground;
         "ui.text.focus" = accent.base;
         "ui.virtual.indent-guide" = {
-          fg = black.bright;
+          fg = subtle.dark;
         };
         "ui.virtual.inlay-hint" = {
           fg = subtle.base;
@@ -444,12 +453,12 @@
         };
         "ui.virtual.jump-label" = {
           fg = special.base;
-          underline = {
+          bg = special.dark;
-            style = "dotted";
+          underline.style = "dotted";
-          }; 
+          modifiers = [ "bold" ];
         };
         "ui.window" = {
-          bg = black.base;
+          bg = accent.darker;
         };
       };
     };

home-modules/hyprland.nix

@@ -286,6 +286,7 @@ in {
         "dimaround, title:^(terminal-file-picker)$"
         "center, title:^(terminal-file-picker)$"
         "size 80% 80%, title:^(terminal-file-picker)$"
+
         "size 30% 30%, initialTitle:^(Select Calendar)$"
       ];
 
@@ -376,7 +377,7 @@ in {
         # "SUPER,       T, exec, alacritty"
         # "SUPER SHIFT, T, exec, alacritty -e sh -c "ssh nxace""
         "SUPER,       T, exec, SESSION_FROM_DE=TRUE ${terminal}"
-        "SUPER SHIFT, T, exec, ${terminal-exec}'ssh nxace'"
+        ''SUPER SHIFT, T, exec, ${terminal-exec}'echo -e "\\e]11;#${rice.color.secondary.darker}\\e\\\\" && ssh nxace'  '' # yes this is a double hash.
         "SUPER,       Z, exec, zathura"
         "SUPER,       U, exec, [tile] thunderbird "
         "SUPER,       I, exec, ${terminal-exec}'hx ~/nix-dots/ && fish'"

home-modules/yazi.nix

@@ -163,6 +163,7 @@ in {
       	# Magic
       	{ on = "<C-h>"; run = "shell 'hx .' --block";    desc = "Open current directoy in Helix";         }
       	{ on = "<C-g>"; run = "shell 'lazygit' --block"; desc = "Open current directoy in Lazygit";       }
+      	{ on = "<C-y>"; run = ''shell 'ghostty --command="fish -C nx_yazi_into_fish"' --orphan ''; desc = "Open current directoy in a new ghostty window";       }
       ];
       tasks.keymap = [
       	# Task
@@ -360,8 +361,8 @@ in {
       };
       pick = {
         border = { fg = border; };
-        active = { fg = accent.base; };
+        active = { fg = accent.bright; };
-        inactive = { fg = subtle.base; };
+        inactive = { fg = subtle.bright; };
       };
       status = {
         # sep_right  = { open = ""; close = ""; };
@@ -379,7 +380,7 @@ in {
       indicator = { # your "cursor"
         parent = { fg = secondary.darker; bg = secondary.base; };
         current = { fg = accent.darker; bg = accent.base; };
-        preview = { fg = secondary.base; bg = secondary.dark; };
+        preview = { fg = secondary.base; bg = secondary.darker; };
         # padding = { open = " "; close = " "; };
       };
       cmp = {
@@ -403,8 +404,8 @@ in {
       };
       tasks = {
         border  = { fg = border2; };
-        title   = {};
+        title   = { fg = accent.base; bold = true; };
-        hovered = { underline = true; };
+        hovered = { fg = accent.bright; };
       };
       which = {
         mask            = { bg = black.base; };

system-modules/editor.nix

@@ -3,6 +3,7 @@
     variables = {
       EDITOR = "hx";
       VISUAL = "hx";  
+      TERMINAL = "ghostty";
     };
     systemPackages = with pkgs; [
       helix