From 9c47aba1775bebc63d3a182a289a425385453232 Mon Sep 17 00:00:00 2001
From: Matt Nish-Lapidus <matt@emenel.ca>
Date: Mon, 23 Sep 2024 09:46:14 -0400
Subject: [PATCH] tweak

---
 configuration.nix | 18 ++++++++++++++----
 home.nix          |  7 ++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index eb3dad3..28c628f 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -77,12 +77,22 @@
     extraGroups = [ "networkmanager" "wheel" ];
     openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFvtBCUQEi7r6mXdaULEaMMvGH1IWZBX9tXpjbIECar2 matt@emenel.ca" ];
     packages = with pkgs; [
-    #  thunderbird
+      git
     ];
   };
 
-  # Install firefox.
-  programs.firefox.enable = true;
+  # enable fish and launch it from bash for interactive shells
+  programs.fish.enable = true;
+  programs.bash = {
+    interactiveShellInit = ''
+      if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
+      then
+        shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
+        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+      fi
+    '';
+  };
+
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
@@ -92,7 +102,7 @@
   environment.systemPackages = with pkgs; [
   #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
     wget
-    pkgs.home-manager
+    home-manager
     curl
     git
     rsync
diff --git a/home.nix b/home.nix
index 6164d39..569059b 100644
--- a/home.nix
+++ b/home.nix
@@ -10,14 +10,15 @@
       fzf
       bat
       jq
+      starship
     ];
 
-    # This needs to actually be set to your username
     username = "emenel";
     homeDirectory = "/home/emenel";
 
-    # You do not need to change this if you're reading this in the future.
-    # Don't ever change this after the first build.  Don't ask questions.
     stateVersion = "23.11";
   };
+
+  programs.home-manager.enable = true;
+  programs.fish.enable = true;
 }