From e66aeab39236ed72a7c832bc88a30f71c31d4b46 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 18 Jul 2023 15:04:58 +0100
Subject: [PATCH] Remove lazygit, move some package definitions around

---
 home/shell/default.nix   |  2 +-
 home/shell/fish.nix      |  3 ---
 home/tui/default.nix     |  1 -
 home/tui/lazygit.nix     | 26 --------------------------
 home/wezterm/default.nix |  3 ++-
 hosts/common.nix         |  1 -
 6 files changed, 3 insertions(+), 33 deletions(-)
 delete mode 100644 home/tui/lazygit.nix

diff --git a/home/shell/default.nix b/home/shell/default.nix
index 148b4674..65c5755b 100644
--- a/home/shell/default.nix
+++ b/home/shell/default.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  home.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode"];})];
+  home.packages = with pkgs; [dig silver-searcher gnumake];
   programs = {
     direnv = {
       enable = true;
diff --git a/home/shell/fish.nix b/home/shell/fish.nix
index 539ad034..d839d545 100644
--- a/home/shell/fish.nix
+++ b/home/shell/fish.nix
@@ -1,10 +1,8 @@
 {pkgs, ...}: {
   imports = [./default.nix];
-  home.packages = with pkgs; [dig silver-searcher gnumake];
   programs = {
     fish = {
       enable = true;
-      shellAbbrs = {lg = "lazygit";};
       plugins = [
         {
           name = "tokyonight";
@@ -19,7 +17,6 @@
         }
       ];
     };
-    # direnv.enableFishIntegration = true;
     fzf.enableFishIntegration = true;
     keychain.enableFishIntegration = true;
     starship.enableFishIntegration = true;
diff --git a/home/tui/default.nix b/home/tui/default.nix
index 8d146459..c88d7810 100644
--- a/home/tui/default.nix
+++ b/home/tui/default.nix
@@ -3,6 +3,5 @@
     ./neovim.nix
     ./bat.nix
     ./gitui.nix
-    ./lazygit.nix
   ];
 }
diff --git a/home/tui/lazygit.nix b/home/tui/lazygit.nix
deleted file mode 100644
index fc9def34..00000000
--- a/home/tui/lazygit.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{...}: {
-  programs.lazygit = {
-    enable = true;
-    settings = {
-      gui = {
-        showFileTree = true;
-        showCommandLog = false;
-        showIcons = true;
-        theme = {
-          lightTheme = false;
-          activeBorderColor = ["#a6da95" "bold"];
-          inactiveBorderColor = ["#cad3f5"];
-          optionsTextColor = ["#8aadf4"];
-          selectedLineBgColor = ["#363a4f"];
-          selectedRangeBgColor = ["#363a4f"];
-          cherryPickedCommitBgColor = ["#8bd5ca"];
-          cherryPickedCommitFgColor = ["#8aadf4"];
-          unstagedChangesColor = ["red"];
-        };
-      };
-      update.method = "never";
-      promptToReturnFromSubprocess = false;
-      notARepository = "quit";
-    };
-  };
-}
diff --git a/home/wezterm/default.nix b/home/wezterm/default.nix
index 7e8ed97e..7e34c6f3 100644
--- a/home/wezterm/default.nix
+++ b/home/wezterm/default.nix
@@ -1,4 +1,5 @@
-{...}: {
+{pkgs, ...}: {
+  home.packages = [(pkgs.nerdfonts.override {fonts = ["FiraCode"];})];
   programs.wezterm = {
     enable = true;
     extraConfig = builtins.readFile ./wezterm.lua;
diff --git a/hosts/common.nix b/hosts/common.nix
index af319b49..7db63ad0 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -22,7 +22,6 @@ in {
     shellAliases = {
       ll = "ls -laF";
       gg = "gitui";
-      lg = "lazygit";
       nv = "WAYLAND_DISPLAY= neovide --multigrid --maximized";
       nosu = "sudo nixos-rebuild switch --flake ${flakeURL}";
       hms = "${pkgs.home-manager}/bin/home-manager switch --flake ${flakeURL}";