From 6cbc00f9ec518a1f6002162fa4d82e35a5e1a226 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Fri, 16 Jun 2023 14:05:17 +0100
Subject: [PATCH] Enable nix-index, add more firefox options, move readline
 settings into bash config

---
 common.nix            |  3 +--
 home/env/bash.nix     |  8 ++++++++
 home/env/default.nix  |  2 +-
 home/env/fish.nix     |  1 +
 home/env/readline.nix |  9 ---------
 home/env/zsh.nix      |  1 +
 home/gui/firefox.nix  | 20 +++-----------------
 home/tui/default.nix  |  8 +++-----
 home/work.nix         |  2 +-
 9 files changed, 19 insertions(+), 35 deletions(-)
 delete mode 100644 home/env/readline.nix

diff --git a/common.nix b/common.nix
index c3c4f34d..6164e5cc 100644
--- a/common.nix
+++ b/common.nix
@@ -20,12 +20,11 @@ in {
   };
   system.autoUpgrade.enable = lib.mkDefault false;
   nixpkgs.config.allowUnfree = true;
-  users.users.root.shell = pkgs.zsh;
   home-manager = {
     useUserPackages = false;
     useGlobalPkgs = true;
     users.root = {
-      imports = [./home/env/readline.nix ./home/env/starship.nix ./home/env/zsh.nix];
+      imports = [./home/env/bash.nix ./home/env/starship.nix];
       home.username = "root";
       home.homeDirectory = "/root";
       home.stateVersion = "22.11";
diff --git a/home/env/bash.nix b/home/env/bash.nix
index 93d6f316..80ea3669 100644
--- a/home/env/bash.nix
+++ b/home/env/bash.nix
@@ -1,5 +1,13 @@
 {...}: {
   programs.bash.enable = true;
+  programs.readline = {
+    enable = true;
+    includeSystemConfig = true;
+    extraConfig = ''
+      set completion-ignore-case On
+    '';
+  };
   programs.keychain.enableBashIntegration = true;
   programs.starship.enableBashIntegration = true;
+  programs.nix-index.enableBashIntegration = true;
 }
diff --git a/home/env/default.nix b/home/env/default.nix
index c0473ea4..185d163f 100644
--- a/home/env/default.nix
+++ b/home/env/default.nix
@@ -5,7 +5,6 @@
     ./direnv.nix
     ./fish.nix
     ./keychain.nix
-    ./readline.nix
     ./starship.nix
     ./zsh.nix
   ];
@@ -19,4 +18,5 @@
     silver-searcher
     distrobox
   ];
+  programs.nix-index.enable = true;
 }
diff --git a/home/env/fish.nix b/home/env/fish.nix
index f85972a2..c91b0499 100644
--- a/home/env/fish.nix
+++ b/home/env/fish.nix
@@ -18,4 +18,5 @@
   };
   programs.keychain.enableFishIntegration = true;
   programs.starship.enableFishIntegration = true;
+  programs.nix-index.enableFishIntegration = true;
 }
diff --git a/home/env/readline.nix b/home/env/readline.nix
deleted file mode 100644
index 0936390e..00000000
--- a/home/env/readline.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{...}: {
-  programs.readline = {
-    enable = true;
-    includeSystemConfig = true;
-    extraConfig = ''
-      set completion-ignore-case On
-    '';
-  };
-}
diff --git a/home/env/zsh.nix b/home/env/zsh.nix
index a9c1c229..e087540d 100644
--- a/home/env/zsh.nix
+++ b/home/env/zsh.nix
@@ -12,4 +12,5 @@
   };
   programs.keychain.enableZshIntegration = true;
   programs.starship.enableZshIntegration = true;
+  programs.nix-index.enableZshIntegration = true;
 }
diff --git a/home/gui/firefox.nix b/home/gui/firefox.nix
index c9612cef..ccc49e0e 100644
--- a/home/gui/firefox.nix
+++ b/home/gui/firefox.nix
@@ -13,6 +13,7 @@
         "browser.warnOnQuitShortcut" = false;
         "distribution.searchplugins.defaultLocale" = "en-GB";
         "doh-rollout.home-region" = "GB";
+        "extensions.activeThemeID" = "firefox-alpenglow@mozilla.org";
         "extensions.formautofill.creditCards.enabled" = false;
         "general.useragent.locale" = "en-GB";
         "intl.locale.requested" = "en-GB,en-US";
@@ -64,23 +65,8 @@
         force = true;
         order = ["DuckDuckGo"];
         engines = {
-          "Nix Packages" = {
-            urls = [
-              {
-                template = "https://search.nixos.org/packages";
-                params = [
-                  {
-                    name = "type";
-                    value = "packages";
-                  }
-                  {
-                    name = "query";
-                    value = "{searchTerms}";
-                  }
-                ];
-              }
-            ];
-
+          "MyNixOS" = {
+            urls = [{template = "https://mynixos.com/search?q={searchTerms}";}];
             icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
             definedAliases = ["@np"];
           };
diff --git a/home/tui/default.nix b/home/tui/default.nix
index 767c5ea1..a5410b76 100644
--- a/home/tui/default.nix
+++ b/home/tui/default.nix
@@ -1,6 +1,4 @@
-{...}: {
-  imports = [
-    ./neovim.nix
-    ./lazygit.nix
-  ];
+{pkgs, ...}: {
+  imports = [./neovim.nix ./lazygit.nix];
+  home.packages = [pkgs.ranger];
 }
diff --git a/home/work.nix b/home/work.nix
index c04e9e9c..a5dc4389 100644
--- a/home/work.nix
+++ b/home/work.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   imports = [./default.nix ./git/work.nix ./ssh/work.nix];
-  home.packages = with pkgs; [openfortivpn nomachine-client teams zoom-us];
+  home.packages = with pkgs; [openfortivpn nomachine-client teams-for-linux zoom-us];
   programs.fish.functions.arch = ''
     distrobox list | grep -i archlinux > /dev/null || distrobox create -n arch -i docker.io/library/archlinux:latest -y
     distrobox enter arch