From 9c6d620ce6f82056a5982f62f83ed249258b75e1 Mon Sep 17 00:00:00 2001
From: Stefan Imhoff <gpg@kogakure.8shield.net>
Date: Mon, 29 Jul 2024 15:40:37 +0200
Subject: [PATCH] chore(nix): remove extra home packages for programs

As it can lead to conflicts between versions, I removed the additional
imports. They are not needed as the program is installed by enabling the
program.
---
 nix/home/bash/default.nix         | 2 +-
 nix/home/bat/default.nix          | 2 --
 nix/home/editorconfig/default.nix | 4 +---
 nix/home/gh-dash/default.nix      | 7 +------
 nix/home/gh/default.nix           | 5 -----
 nix/home/git/default.nix          | 1 -
 nix/home/gnupg/default.nix        | 1 -
 nix/home/lazygit/default.nix      | 4 +---
 nix/home/lf/default.nix           | 1 -
 nix/home/lsd/default.nix          | 6 +-----
 nix/home/wezterm/default.nix      | 4 +---
 nix/home/yazi/default.nix         | 4 +---
 nix/home/zed/default.nix          | 2 +-
 13 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/nix/home/bash/default.nix b/nix/home/bash/default.nix
index f781051..ff38e01 100644
--- a/nix/home/bash/default.nix
+++ b/nix/home/bash/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   programs.bash = {
diff --git a/nix/home/bat/default.nix b/nix/home/bat/default.nix
index 24fc798..3bd0fed 100644
--- a/nix/home/bat/default.nix
+++ b/nix/home/bat/default.nix
@@ -62,6 +62,4 @@
       };
     };
   };
-
-  home.packages = [ pkgs.bat ];
 }
diff --git a/nix/home/editorconfig/default.nix b/nix/home/editorconfig/default.nix
index 95f22f5..1644bb5 100644
--- a/nix/home/editorconfig/default.nix
+++ b/nix/home/editorconfig/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   editorconfig = {
@@ -19,6 +19,4 @@
       };
     };
   };
-
-  home.packages = [ pkgs.editorconfig-core-c ];
 }
diff --git a/nix/home/gh-dash/default.nix b/nix/home/gh-dash/default.nix
index f46f37f..586a7c8 100644
--- a/nix/home/gh-dash/default.nix
+++ b/nix/home/gh-dash/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   programs.gh-dash = {
@@ -81,9 +81,4 @@
       pager.diff = "";
     };
   };
-
-  home.packages = with pkgs; [
-    git
-    gh-dash
-  ];
 }
diff --git a/nix/home/gh/default.nix b/nix/home/gh/default.nix
index 640c212..c28d02a 100644
--- a/nix/home/gh/default.nix
+++ b/nix/home/gh/default.nix
@@ -24,9 +24,4 @@
       };
     };
   };
-
-  home.packages = with pkgs; [
-    git
-    gh
-  ];
 }
diff --git a/nix/home/git/default.nix b/nix/home/git/default.nix
index b154bf7..f31efdb 100644
--- a/nix/home/git/default.nix
+++ b/nix/home/git/default.nix
@@ -173,7 +173,6 @@
     commitizen # Tool to create committing rules for projects, auto bump versions, and generate changelogs
     delta # Syntax-highlighting pager for git
     gh # GitHub CLI tool
-    git # Distributed version control system
     git-crypt # Transparent file encryption in git
     git-extras # GIT utilities -- repo summary, repl, changelog population, author commit percentages and more
     git-fixup # Fighting the copy-paste element of your rebase workflow
diff --git a/nix/home/gnupg/default.nix b/nix/home/gnupg/default.nix
index 249be33..53f41d8 100644
--- a/nix/home/gnupg/default.nix
+++ b/nix/home/gnupg/default.nix
@@ -25,7 +25,6 @@
   '';
 
   home.packages = with pkgs; [
-    gnupg
     pinentry_mac
   ];
 }
diff --git a/nix/home/lazygit/default.nix b/nix/home/lazygit/default.nix
index 6a2e04c..db43b41 100644
--- a/nix/home/lazygit/default.nix
+++ b/nix/home/lazygit/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   programs.lazygit = {
@@ -29,6 +29,4 @@
       ];
     };
   };
-
-  home.packages = [ pkgs.lazygit ];
 }
diff --git a/nix/home/lf/default.nix b/nix/home/lf/default.nix
index c568253..045c86f 100644
--- a/nix/home/lf/default.nix
+++ b/nix/home/lf/default.nix
@@ -125,7 +125,6 @@
     };
 
   home.packages = with pkgs; [
-    lf
     bat
     fzf
     zoxide # z
diff --git a/nix/home/lsd/default.nix b/nix/home/lsd/default.nix
index 9d9c603..6669f38 100644
--- a/nix/home/lsd/default.nix
+++ b/nix/home/lsd/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   programs.lsd =
@@ -87,8 +87,4 @@
         };
       };
     };
-
-  home.packages = with pkgs; [
-    lsd
-  ];
 }
diff --git a/nix/home/wezterm/default.nix b/nix/home/wezterm/default.nix
index b7b8f05..66a1d5c 100644
--- a/nix/home/wezterm/default.nix
+++ b/nix/home/wezterm/default.nix
@@ -1,10 +1,8 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   programs.wezterm = {
     enable = true;
     extraConfig = builtins.readFile ./wezterm.lua;
   };
-
-  home.packages = [ pkgs.wezterm ];
 }
diff --git a/nix/home/yazi/default.nix b/nix/home/yazi/default.nix
index 6160219..0644692 100644
--- a/nix/home/yazi/default.nix
+++ b/nix/home/yazi/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   programs.yazi = {
@@ -29,6 +29,4 @@
       };
     };
   };
-
-  home.packages = [ pkgs.yazi ];
 }
diff --git a/nix/home/zed/default.nix b/nix/home/zed/default.nix
index 5bf45a9..bcd8764 100644
--- a/nix/home/zed/default.nix
+++ b/nix/home/zed/default.nix
@@ -5,6 +5,6 @@
     ".config/zed/settings.json" = { source = ./settings.json; };
   };
 
-  # TODO: Currently broken, installed with Homebrew
+  # FIX: Currently broken, installed with Homebrew
   # home.packages = [ pkgs.zed-editor ];
 }