Properly setup nh

modules/core/default.nix

@@ -9,6 +9,7 @@
     ./fonts.nix
     ./hardware.nix
     ./network.nix
+    ./nh.nix
     ./packages.nix
     ./services.nix
     ./starfish.nix

modules/core/nh.nix

@@ -0,0 +1,19 @@
+{
+  pkgs,
+  username,
+  ...
+}: {
+  programs.nh = {
+    enable = true;
+    clean = {
+      enable = true;
+      extraArgs = "--keep-since 7d --keep 5";
+    };
+    flake = "/home/${username}/zaneyos";
+  };
+
+  environment.systemPackages = with pkgs; [
+    nix-output-monitor
+    nvd
+  ];
+}

modules/core/packages.nix

@@ -1,11 +1,5 @@
-{
-  pkgs,
-  ...
-}:
-
-{
+{pkgs, ...}: {
   programs = {
-
     firefox.enable = false;
     dconf.enable = true;
     seahorse.enable = true;
@@ -60,7 +54,6 @@
     meson
     mpv
     ncdu
-    nh
     ninja
     nixfmt-rfc-style
     obs-studio
@@ -79,5 +72,4 @@
     wget
     yad
   ];
-
 }

modules/core/system.nix

@@ -1,9 +1,6 @@
-{ host, ... }:
-
-let
+{host, ...}: let
   inherit (import ../../hosts/${host}/variables.nix) consoleKeyMap;
-in
-{
+in {
   nix = {
     settings = {
       auto-optimise-store = true;
@@ -11,13 +8,8 @@ in
         "nix-command"
         "flakes"
       ];
-      substituters = [ "https://hyprland.cachix.org" ];
-      trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
-    };
-    gc = {
-      automatic = true;
-      dates = "weekly";
-      options = "--delete-older-than 7d";
+      substituters = ["https://hyprland.cachix.org"];
+      trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
     };
   };
   time.timeZone = "America/Chicago";

modules/home/bash.nix

@@ -20,8 +20,8 @@
     '';
     shellAliases = {
       sv = "sudo nvim";
-      fr = "nh os switch --hostname ${profile} /home/${username}/zaneyos";
-      fu = "nh os switch --hostname ${profile} --update /home/${username}/zaneyos";
+      fr = "nh os switch --hostname ${profile}";
+      fu = "nh os switch --hostname ${profile} --update";
       zu = "sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)";
       ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
       v = "nvim";

modules/home/default.nix

@@ -1,8 +1,4 @@
-{
-  ...
-}:
-
-{
+{...}: {
   imports = [
     ./bash.nix
     ./btop.nix