From 8c3cd9631a13a718e799746b0b55dcbaede60af0 Mon Sep 17 00:00:00 2001
From: Anthony Rodriguez <anthony@nezia.dev>
Date: Mon, 21 Oct 2024 15:49:07 +0200
Subject: [PATCH] repo: move common home packages into home/default.nix

---
 home/default.nix          | 2 ++
 home/programs/default.nix | 4 ++++
 hosts/solaire/default.nix | 5 -----
 hosts/vamos/default.nix   | 5 -----
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 0c81429..8811c20 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,6 +1,8 @@
 {
   imports = [
+    ./services/udiskie.nix
     ./terminal
+    ./programs
   ];
   home = {
     username = "nezia";
diff --git a/home/programs/default.nix b/home/programs/default.nix
index b3a1837..86ca8f2 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -4,8 +4,11 @@
     ./media
     ./xdg.nix
     ./gtk.nix
+    ./editors/neovim.nix
+    ./editors/helix.nix
   ];
 
+  # idk where to put this
   programs = {
     fzf.enable = true;
     hyfetch.enable = true;
@@ -15,6 +18,7 @@
     };
   };
 
+  # miscellaneous programs that do not need to be configured
   home.packages = with pkgs; [
     geary
     imhex
diff --git a/hosts/solaire/default.nix b/hosts/solaire/default.nix
index bc5852f..fe5c33d 100644
--- a/hosts/solaire/default.nix
+++ b/hosts/solaire/default.nix
@@ -19,13 +19,8 @@ in {
   home-manager = {
     users.nezia.imports = [
       "${self}/home"
-      "${self}/home/services/udiskie.nix"
-
-      "${self}/home/programs"
 
       "${self}/home/terminal/emulators/foot.nix"
-      "${self}/home/programs/editors/neovim.nix"
-      "${self}/home/programs/editors/helix.nix"
     ];
     extraSpecialArgs = specialArgs;
   };
diff --git a/hosts/vamos/default.nix b/hosts/vamos/default.nix
index 03b77ae..e120ef9 100644
--- a/hosts/vamos/default.nix
+++ b/hosts/vamos/default.nix
@@ -29,8 +29,6 @@ in {
       "${self}/home"
       "${self}/home/services/udiskie.nix"
 
-      "${self}/home/programs"
-
       "${self}/home/programs/niri"
       "${self}/home/programs/ags"
       "${self}/home/programs/fuzzel.nix"
@@ -39,9 +37,6 @@ in {
       "${self}/home/programs/swayidle.nix"
 
       "${self}/home/terminal/emulators/foot.nix"
-
-      "${self}/home/programs/editors/neovim.nix"
-      "${self}/home/programs/editors/helix.nix"
     ];
     extraSpecialArgs = specialArgs;
   };