From d89e347d064614b6841251b43088980b8d3c2982 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Sun, 16 Feb 2025 22:10:07 -0600
Subject: [PATCH] chore: wip

---
 lib/modules/home/default.nix         | 9 +++++----
 lib/modules/home/firefox.nix         | 6 +++---
 lib/modules/nixos/default-module.nix | 3 +++
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/modules/home/default.nix b/lib/modules/home/default.nix
index 2bf299d..04a322f 100644
--- a/lib/modules/home/default.nix
+++ b/lib/modules/home/default.nix
@@ -45,7 +45,8 @@ in
         };
       };
 
-      config = {
+      config = lib.mkIf config.lyte.shell.enable {
+        programs.fish.enable = true;
         programs.helix.enable = true;
         programs.zellij.enable = true;
         programs.eza.enable = true;
@@ -1289,9 +1290,9 @@ in
         # zellij does not support modern terminal keyboard input:
         # https://github.com/zellij-org/zellij/issues/735
         programs.zellij = {
-          # enable = true;
-          # This causes fish to start zellij immediately
-          # enableFishIntegration = true;
+
+          # do not start immediately
+          enableFishIntegration = false;
 
           # uses home manager's toKDL generator
           settings = {
diff --git a/lib/modules/home/firefox.nix b/lib/modules/home/firefox.nix
index fa316d9..39967f4 100644
--- a/lib/modules/home/firefox.nix
+++ b/lib/modules/home/firefox.nix
@@ -15,9 +15,9 @@
     programs.firefox = {
       # enable = true;
       profileVersion = null;
-      package = pkgs.firefox.override {
-        nativeMessagingHosts = with pkgs; [ bitwarden ];
-      };
+      # package = pkgs.firefox.override {
+      #   nativeMessagingHosts = with pkgs; [ bitwarden ];
+      # };
       /*
         TODO: this should be able to work on macos, no?
         TODO: enable color scheme/theme by default
diff --git a/lib/modules/nixos/default-module.nix b/lib/modules/nixos/default-module.nix
index bc2f754..2cba2ca 100644
--- a/lib/modules/nixos/default-module.nix
+++ b/lib/modules/nixos/default-module.nix
@@ -10,6 +10,7 @@
   modulesPath,
   lib,
   config,
+  pkgs,
   ...
 }:
 {
@@ -92,6 +93,7 @@
 
     users.users.root = {
       openssh.authorizedKeys.keys = lib.mkDefault [ self.outputs.pubkey ];
+      shell = lib.mkIf config.lyte.shell.enable pkgs.fish;
     };
 
     services = {
@@ -177,6 +179,7 @@
       createHome = true;
       openssh.authorizedKeys.keys = [ self.outputs.pubkey ];
       group = "daniel";
+      shell = lib.mkIf config.lyte.shell.enable pkgs.fish;
       extraGroups = [
         "users"
         "wheel"