From 25d02e5d3a6297bad60d644bd43811d122367b1d Mon Sep 17 00:00:00 2001
From: twoneis <git@chpu.eu>
Date: Sun, 9 Mar 2025 18:37:02 +0100
Subject: [PATCH] some more cleanup and started crafting new prompt

---
 modules/apps/firefox.nix  |  2 +-
 modules/niri/default.nix  |  5 +----
 modules/niri/greetd.nix   |  6 +-----
 modules/utils/default.nix | 20 ++++++++++----------
 modules/utils/prompt.fish | 22 ++++++++++++++++++++++
 5 files changed, 35 insertions(+), 20 deletions(-)
 create mode 100644 modules/utils/prompt.fish

diff --git a/modules/apps/firefox.nix b/modules/apps/firefox.nix
index 52119ab..60fe834 100644
--- a/modules/apps/firefox.nix
+++ b/modules/apps/firefox.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+pkgs: {
   enable = true;
   profiles = {
     "default" = {
diff --git a/modules/niri/default.nix b/modules/niri/default.nix
index c34b1ca..ed831cd 100644
--- a/modules/niri/default.nix
+++ b/modules/niri/default.nix
@@ -15,10 +15,7 @@ in
 
     services.greetd = {
       enable = true;
-      settings = import ./greetd.nix {
-        config = config;
-        pkgs = pkgs;
-      };
+      settings = import ./greetd.nix pkgs config;
     };
 
     programs.niri = {
diff --git a/modules/niri/greetd.nix b/modules/niri/greetd.nix
index 601ff6e..38d2eb0 100644
--- a/modules/niri/greetd.nix
+++ b/modules/niri/greetd.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
+pkgs: config: let
   inherit (config) conf;
   niri = config.programs.niri.package;
 in {
diff --git a/modules/utils/default.nix b/modules/utils/default.nix
index 30a33bc..59106a8 100644
--- a/modules/utils/default.nix
+++ b/modules/utils/default.nix
@@ -70,22 +70,22 @@ in {
 
     programs.fish = {
       enable = true;
-      plugins = with pkgs.fishPlugins; [
+
+      plugins = [
         {
           name = "pure";
-          src = pure.src;
+          src = pkgs.fishPlugins.pure.src;
         }
-        {
-          name = "bass";
-          src = bass.src;
-        }
-      ];
-      interactiveShellInit = concatMapStrings (x: "set --universal " + x + "\n") [
-        "pure_enable_nixdevshell true"
       ];
 
       functions = {
-        run = "nix run nixpkgs#$argv[1] -- $argv[2..]";
+        run = {
+          body = "nix run nixpkgs#$argv[1] -- $argv[2..]";
+        };
+
+        fish_prompt = {
+          body = builtins.readFile ./prompt.fish;
+        };
       };
 
       shellAbbrs = {
diff --git a/modules/utils/prompt.fish b/modules/utils/prompt.fish
new file mode 100644
index 0000000..da7d859
--- /dev/null
+++ b/modules/utils/prompt.fish
@@ -0,0 +1,22 @@
+set -l last_status $status
+
+set -l stat
+if test $last_status -ne 0
+    set stat (set_color -o red)"[$last_status] "(set_color normal)
+end
+
+set -l path (set_color -i blue)(prompt_pwd -D 4096)(set_color normal)
+
+set -l prompt (set_color -o magenta)"> "(set_color normal)
+
+set -l nix
+if test -n "$IN_NIX_SHELL"
+    set nix (set_color white)"❄ "(set_color normal)
+end
+
+set -l ssh
+if test -n "$SSH_CLIENT"
+    set ssh (set_color brblack)"$USER@$hostname"
+end
+
+string join "" -- $stat $path \n $nix $prompt