From 6a37e231f50f166cdbd10a100b4ca5d422520a58 Mon Sep 17 00:00:00 2001
From: madmin <madmin@noreply.codeberg.org>
Date: Thu, 20 Jun 2024 22:21:10 +0200
Subject: [PATCH] fix(naming, pkgs in boot files)

---
 systems/common/optional/boot/btrfs_swap.nix   |  3 +-
 .../optional/boot/initrd_USB_keyfile_luks.nix |  2 +-
 systems/common/optional/boot/initrd_luks.nix  |  1 +
 systems/jeroboam/default.nix                  | 30 +++++++++----------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/systems/common/optional/boot/btrfs_swap.nix b/systems/common/optional/boot/btrfs_swap.nix
index a6a89a3..e971c3a 100644
--- a/systems/common/optional/boot/btrfs_swap.nix
+++ b/systems/common/optional/boot/btrfs_swap.nix
@@ -1,6 +1,7 @@
+{ pkgs, ... }:
 {
     boot = {
         kernelPackages = pkgs.linuxPackages_latest;
 	    supportedFilesystems = [ "btrfs" ];
-    }
+    };
 }
diff --git a/systems/common/optional/boot/initrd_USB_keyfile_luks.nix b/systems/common/optional/boot/initrd_USB_keyfile_luks.nix
index 11003f4..8ab39a7 100644
--- a/systems/common/optional/boot/initrd_USB_keyfile_luks.nix
+++ b/systems/common/optional/boot/initrd_USB_keyfile_luks.nix
@@ -1,4 +1,4 @@
-{
+{ pkgs, ... }:{
     boot = {
 	    kernelPackages = pkgs.linuxPackages_latest;
 	    supportedFilesystems = [ "btrfs" ];
diff --git a/systems/common/optional/boot/initrd_luks.nix b/systems/common/optional/boot/initrd_luks.nix
index c79a7ec..2d32095 100644
--- a/systems/common/optional/boot/initrd_luks.nix
+++ b/systems/common/optional/boot/initrd_luks.nix
@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 {
     boot = {
 	    kernelPackages = pkgs.linuxPackages_latest;
diff --git a/systems/jeroboam/default.nix b/systems/jeroboam/default.nix
index 74c1b69..460e45b 100644
--- a/systems/jeroboam/default.nix
+++ b/systems/jeroboam/default.nix
@@ -20,7 +20,7 @@
 
     #################### Disk Layout ####################
     inputs.disko.nixosModules.disko
-    (configLib.relativeToRoot "hosts/common/disks/jeroboam.nix")
+    (configLib.relativeToRoot "systems/common/disks/jeroboam.nix")
     {
       _module.args = {
         disk = "/dev/nvme0n1";
@@ -31,25 +31,25 @@
   ]
   ++ (map configLib.relativeToRoot [
     # = Required Configs ####################
-        "hosts/common/core"
+        "systems/common/core"
 
     #################### Host-specific Configs ####################
-        #"hosts/common/optional/services/clamav.nix" # depends on optional/msmtp.nix
-        #"hosts/common/optional/msmtp.nix" # required for emailing clamav alerts
-        #"hosts/common/optional/services/openssh.nix" # allow remote ssh 
-        "hosts/common/optional/pipewire.nix" # audio
-        "hosts/common/optional/boot/systemd_boot.nix" # systemd boot on
-        "hosts/common/optional/boot/loud_boot.nix" # for testing, otherwise quiet_boot.nix
-        #"hosts/common/optional/boot/quiet_boot.nix" # with plymouth pretty custom load sequence 
-        "hosts/common/optional/boot/btrfs_swap.nix" # BTRFS support
-        "hosts/common/optional/boot/initrd_luks.nix" # luks encryption with pass only
+        #"systems/common/optional/services/clamav.nix" # depends on optional/msmtp.nix
+        #"systems/common/optional/msmtp.nix" # required for emailing clamav alerts
+        #"systems/common/optional/services/openssh.nix" # allow remote ssh 
+        "systems/common/optional/pipewire.nix" # audio
+        "systems/common/optional/boot/systemd_boot.nix" # systemd boot on
+        "systems/common/optional/boot/loud_boot.nix" # for testing, otherwise quiet_boot.nix
+        #"systems/common/optional/boot/quiet_boot.nix" # with plymouth pretty custom load sequence 
+        "systems/common/optional/boot/btrfs_swap.nix" # BTRFS support
+        "systems/common/optional/boot/initrd_luks.nix" # luks encryption with pass only
     # Desktop
-        #"hosts/common/optional/services/greetd.nix" # display manager
-        #"hosts/common/optional/hyprland.nix" # window manager
+        #"systems/common/optional/services/greetd.nix" # display manager
+        #"systems/common/optional/hyprland.nix" # window manager
         ""
     #################### Users to Create ####################
-        #"hosts/common/users/zhuangzi"
-        "hosts/common/users/laozi"
+        #"systems/common/users/zhuangzi"
+        "systems/common/users/laozi"
 
   ]);