From a3e8019878493101ec5d59f6a6eaf81ab9571a40 Mon Sep 17 00:00:00 2001
From: blake <me@blakedheld.xyz>
Date: Tue, 14 Oct 2025 10:25:03 -0500
Subject: [PATCH] rename file share to holocron

---
 hosts/default.nix                             | 27 +++++++++++++-
 hosts/snowbelle/configuration.nix             | 37 ++-----------------
 .../fileshare => holocron}/default.nix        |  0
 .../fileshare => holocron}/nfs/default.nix    |  4 +-
 .../fileshare => holocron}/smb/default.nix    |  4 +-
 .../fileshare => holocron}/zfs/default.nix    |  4 +-
 modules/homelab/default.nix                   |  3 +-
 modules/system/backups/default.nix            |  2 +-
 8 files changed, 36 insertions(+), 45 deletions(-)
 rename modules/{homelab/fileshare => holocron}/default.nix (100%)
 rename modules/{homelab/fileshare => holocron}/nfs/default.nix (88%)
 rename modules/{homelab/fileshare => holocron}/smb/default.nix (90%)
 rename modules/{homelab/fileshare => holocron}/zfs/default.nix (91%)

diff --git a/hosts/default.nix b/hosts/default.nix
index 96f4b76..092dc52 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -4,8 +4,31 @@
   lib,
   inputs,
   ...
-}:
-{
+}: {
+  # base system package install list
+  environment.systemPackages = with pkgs; [
+    wget
+    curl
+    rsync
+    git
+    vim
+    lf
+    age
+    fzf
+    btop
+    neofetch
+    usbutils
+  ];
+
+  # set timezone
+  time.timeZone = "America/Chicago";
+
+  # allow proprietary packages
+  nixpkgs.config.allowUnfree = true;
+
+  # enable flakes
+  nix.settings.experimental-features = ["nix-command" "flakes"];
+
   # passwordless rebuild
   security.sudo.extraRules = [
     {
diff --git a/hosts/snowbelle/configuration.nix b/hosts/snowbelle/configuration.nix
index 6e6c007..50fae27 100644
--- a/hosts/snowbelle/configuration.nix
+++ b/hosts/snowbelle/configuration.nix
@@ -8,8 +8,10 @@ in
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
+      ../../hosts
       ../../users/blake
       ../../modules/system
+      ../../modules/holocron
       ../../modules/homelab
       ../../modules/homelab/minecraft_recpro
     ];
@@ -24,7 +26,7 @@ in
     tailscale.enable = true;
     nvidia.enable = true;
   };
-  fileshare = {
+  holocron = {
     zfs.enable = true;
     smb.enable = true;
     nfs.enable = true;
@@ -87,43 +89,10 @@ in
   };
 
   
-  # set timezone
-  time.timeZone = "America/Chicago";
 
   hardware.bluetooth.enable = true;
 
-  # define shell
-  programs.zsh.enable = true;
 
-  # package install list
-  environment.systemPackages = with pkgs; [
-    git
-    age
-    rsync
-    wget
-    curl
-    fzf
-    fd
-    alejandra
-    tree
-    vim 
-    lf
-    tmux
-    btop
-    neofetch
-    usbutils
-    inetutils
-    iptables
-    bluez
-  ];
-
-
-  # allow proprietary packages
-  nixpkgs.config.allowUnfree = true;
-
-
-  # enable flakes
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
   # Open ports in the firewall.
   networking.firewall.allowedTCPPorts = [
diff --git a/modules/homelab/fileshare/default.nix b/modules/holocron/default.nix
similarity index 100%
rename from modules/homelab/fileshare/default.nix
rename to modules/holocron/default.nix
diff --git a/modules/homelab/fileshare/nfs/default.nix b/modules/holocron/nfs/default.nix
similarity index 88%
rename from modules/homelab/fileshare/nfs/default.nix
rename to modules/holocron/nfs/default.nix
index 75f2cdf..8d2a43b 100644
--- a/modules/homelab/fileshare/nfs/default.nix
+++ b/modules/holocron/nfs/default.nix
@@ -6,13 +6,13 @@
 }:
 # define nfs exports
 let
-  cfg = config.fileshare.nfs;
+  cfg = config.holocron.nfs;
   nfs_exports = ''
     /holocron/media *(ro,sync,no_subtree_check)
   '';
   #/holocron/vault *(rw,sync,no_subtree_check,no_root_squash)
 in {
-  options.fileshare.nfs = {
+  options.holocron.nfs = {
     enable = lib.mkEnableOption "enables nfs";
   };
 
diff --git a/modules/homelab/fileshare/smb/default.nix b/modules/holocron/smb/default.nix
similarity index 90%
rename from modules/homelab/fileshare/smb/default.nix
rename to modules/holocron/smb/default.nix
index 5dac2a9..939f5b1 100644
--- a/modules/homelab/fileshare/smb/default.nix
+++ b/modules/holocron/smb/default.nix
@@ -6,7 +6,7 @@
 }:
 # define smb shares
 let
-  cfg = config.fileshare.smb;
+  cfg = config.holocron.smb;
   smb_shares = {
     vault = {
       path = "/holocron/vault";
@@ -22,7 +22,7 @@ let
     };
   };
 in {
-  options.fileshare.smb = {
+  options.holocron.smb = {
     enable = lib.mkEnableOption "enables smb";
   };
 
diff --git a/modules/homelab/fileshare/zfs/default.nix b/modules/holocron/zfs/default.nix
similarity index 91%
rename from modules/homelab/fileshare/zfs/default.nix
rename to modules/holocron/zfs/default.nix
index 3f97e88..fefe094 100644
--- a/modules/homelab/fileshare/zfs/default.nix
+++ b/modules/holocron/zfs/default.nix
@@ -4,9 +4,9 @@
   lib,
   ...
 }: let
-  cfg = config.fileshare.zfs;
+  cfg = config.holocron.zfs;
 in {
-  options.fileshare.zfs = {
+  options.holocron.zfs = {
     enable = lib.mkEnableOption "enables zfs";
   };
 
diff --git a/modules/homelab/default.nix b/modules/homelab/default.nix
index 96827dc..2e50366 100644
--- a/modules/homelab/default.nix
+++ b/modules/homelab/default.nix
@@ -41,7 +41,7 @@ in
 
   # the order determines the order in glance :3
   imports = [
-    ./fileshare
+    ./glance
     ./caddy
     ./home/zigbee2mqtt
     ./vaultwarden
@@ -59,7 +59,6 @@ in
     ./arr/flaresolverr
     ./home/mosquitto
     ./uptime-kuma
-    ./glance
   ];
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/system/backups/default.nix b/modules/system/backups/default.nix
index 6d99af8..0d0daed 100644
--- a/modules/system/backups/default.nix
+++ b/modules/system/backups/default.nix
@@ -148,7 +148,7 @@ in
     };
 
     # install borg binary
-    environment.systemPackages = [ pkgs.borgbackup ];
+    environment.systemPackages = with pkgs; [ borgbackup ];
 
     # declare secret for repo password
     sops.secrets = {