From 12121d0fb2421346827261310c39190d98c82b6d Mon Sep 17 00:00:00 2001
From: joy <mail@joygnu.org>
Date: Sat, 31 Aug 2024 15:04:04 +0200
Subject: [PATCH] git .

---
 modules/default.nix          |  1 -
 modules/homemisc/default.nix | 19 -------------------
 modules/misc/default.nix     | 17 +++++++++++++++++
 modules/zsh/default.nix      |  2 +-
 modules/zsh/rebuild.sh       |  2 ++
 5 files changed, 20 insertions(+), 21 deletions(-)
 delete mode 100644 modules/homemisc/default.nix

diff --git a/modules/default.nix b/modules/default.nix
index 02f1b92..58e73d5 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -25,7 +25,6 @@
     ./hyprland
     ./hypridle
     ./newsboat
-    ./homemisc
     ./git
     ./gtk
     ./ags
diff --git a/modules/homemisc/default.nix b/modules/homemisc/default.nix
deleted file mode 100644
index 96ffe22..0000000
--- a/modules/homemisc/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{lib, ...}: {
-  home-manager.users.joy.home = {
-    username = "joy";
-    homeDirectory = "/home/joy";
-    stateVersion = "23.11";
-    sessionVariables = {
-    };
-  };
-
-  home-manager.users.joy.programs.home-manager.enable = true;
-
-  home-manager.users.joy.xdg.mimeApps.defaultApplications = {
-    "text/plain" = ["helix.desktop"];
-    "image/*" = ["imv.desktop"];
-    "video/png" = ["mpv.desktop"];
-    "video/jpg" = ["mpv.desktop"];
-    "video/*" = ["mpv.desktop"];
-  };
-}
diff --git a/modules/misc/default.nix b/modules/misc/default.nix
index 9484e3c..bb53150 100644
--- a/modules/misc/default.nix
+++ b/modules/misc/default.nix
@@ -22,4 +22,21 @@
   time.timeZone = "Europe/Zurich";
   system.stateVersion = "23.11";
   home-manager.backupFileExtension = "backup";
+  home-manager.users.joy.home = {
+    username = "joy";
+    homeDirectory = "/home/joy";
+    stateVersion = "23.11";
+    sessionVariables = {
+    };
+  };
+
+  home-manager.users.joy.programs.home-manager.enable = true;
+
+  home-manager.users.joy.xdg.mimeApps.defaultApplications = {
+    "text/plain" = ["helix.desktop"];
+    "image/*" = ["imv.desktop"];
+    "video/png" = ["mpv.desktop"];
+    "video/jpg" = ["mpv.desktop"];
+    "video/*" = ["mpv.desktop"];
+  };
 }
diff --git a/modules/zsh/default.nix b/modules/zsh/default.nix
index 0aeb568..b5fb95c 100644
--- a/modules/zsh/default.nix
+++ b/modules/zsh/default.nix
@@ -17,7 +17,7 @@
       ip = "sh ~/nix/modules/zsh/ip.sh";
       fr = "sudo systemctl reboot --firmware";
       ser = "ssh root@joygnu.org";
-      rb = "sh ~/nix/home/modules/rebuild.sh";
+      rb = "sh ~/nix/modules/rebuild.sh";
       up = "sudo nix flake update ~/nix";
       del = "sudo nix-collect-garbage -d";
     };
diff --git a/modules/zsh/rebuild.sh b/modules/zsh/rebuild.sh
index d1e741c..77032a9 100755
--- a/modules/zsh/rebuild.sh
+++ b/modules/zsh/rebuild.sh
@@ -2,6 +2,8 @@
 
 hostname=$(hostname)
 
+git add .
+
 if [[ $hostname == *"desktop"* ]]; then
     sudo nixos-rebuild switch --flake ~/nix/#desktop 
 elif [[ $hostname == *"laptop"* ]]; then