From 9851fe64c70e6bf3cdf918f13ee79dff061f09f7 Mon Sep 17 00:00:00 2001
From: RealStickman <mrc@frm01.net>
Date: Mon, 17 Apr 2023 21:02:17 +0200
Subject: [PATCH] Finally? got the right syntax

---
 nixos-config/home-manager.nix | 68 ++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/nixos-config/home-manager.nix b/nixos-config/home-manager.nix
index 646edb2e..50e82e6c 100644
--- a/nixos-config/home-manager.nix
+++ b/nixos-config/home-manager.nix
@@ -7,10 +7,12 @@ in
 {
   imports = [
     <home-manager/nixos>
-    <home-manager/modules/programs/fish.nix>
   ];
 
+  # keep everything using home manager within this block
   home-manager.users.${user} = { pkgs, ... }: {
+    home.username = "${user}";
+    home.homeDirectory = "/home/${user}";
     home.stateVersion = "22.11";
     home.packages = [
       pkgs.firefox # browser
@@ -28,43 +30,43 @@ in
       pkgs.fwupd-efi # firmware updates additional EFI stuff
       pkgs.fish # fish shell
     ];
-  };
 
-  programs = {
-    fish = {
-      enable = true;
-      shellAliases = {
-        wget = "wget -c";
-      };
-      functions = {
-        fish_prompt =
-''
-# Defined in /home/marc/.config/fish/functions/fish_prompt.fish @ line 2
-# slightly modified from defaults
-    set -l last_pipestatus $pipestatus
-    set -lx __fish_last_status $status # Export for __fish_print_pipestatus.
-    set -l normal (set_color normal)
+    programs = {
+      fish = {
+        enable = true;
+        shellAliases = {
+          wget = "wget -c";
+        };
+        functions = {
+          fish_prompt =
+  ''
+  # Defined in /home/marc/.config/fish/functions/fish_prompt.fish @ line 2
+  # slightly modified from defaults
+      set -l last_pipestatus $pipestatus
+      set -lx __fish_last_status $status # Export for __fish_print_pipestatus.
+      set -l normal (set_color normal)
 
-    # Color the prompt differently when we're root
-    set -l color_cwd $fish_color_cwd
-    set -l suffix '>'
+      # Color the prompt differently when we're root
+      set -l color_cwd $fish_color_cwd
+      set -l suffix '>'
 
-    # If we're running via SSH, change the host color.
-    set -l color_host $fish_color_host
+      # If we're running via SSH, change the host color.
+      set -l color_host $fish_color_host
 
-    # Write pipestatus
-    # If the status was carried over (e.g. after `set`), don't bold it.
-    set -l bold_flag --bold
-    set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation
-    if test $__fish_prompt_status_generation = $status_generation
-        set bold_flag
-    end
-    set __fish_prompt_status_generation $status_generation
-    set -l prompt_status (__fish_print_pipestatus "[" "]" "|" (set_color $fish_color_status) (set_color $bold_flag $fish_color_status) $last_pipestatus)
+      # Write pipestatus
+      # If the status was carried over (e.g. after `set`), don't bold it.
+      set -l bold_flag --bold
+      set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation
+      if test $__fish_prompt_status_generation = $status_generation
+          set bold_flag
+      end
+      set __fish_prompt_status_generation $status_generation
+      set -l prompt_status (__fish_print_pipestatus "[" "]" "|" (set_color $fish_color_status) (set_color $bold_flag $fish_color_status) $last_pipestatus)
 
-    echo -n -s (set_color $fish_color_user) "$USER" $normal (set_color $fish_color_separator) @ $normal (set_color $color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal " "$prompt_status $suffix " "
-end
-'';
+      echo -n -s (set_color $fish_color_user) "$USER" $normal (set_color $fish_color_separator) @ $normal (set_color $color_host) (prompt_hostname) $normal ' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal " "$prompt_status $suffix " "
+  end
+  '';
+        };
       };
     };
   };