From cbb7e9210bb7d0e8091167fb8f40a856b1341ae1 Mon Sep 17 00:00:00 2001
From: oqyude <oqyude@gmail.com>
Date: Tue, 7 Oct 2025 10:03:48 +0300
Subject: [PATCH] 1231

---
 homeConfigurations/server.nix        |  6 ++---
 nixosConfigurations/hosts/server.nix |  8 +++----
 nixosModules/default.nix             | 33 ++++++++++++++++++++++++++++
 nixosModules/essentials/packages.nix |  6 +++++
 4 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/homeConfigurations/server.nix b/homeConfigurations/server.nix
index 75a7297..360d27e 100755
--- a/homeConfigurations/server.nix
+++ b/homeConfigurations/server.nix
@@ -12,9 +12,9 @@ let
   musicPath = "${config.home.homeDirectory}/External/Music";
 in
 {
-  imports = [
-    ./minimal.nix
-  ];
+  # imports = [
+  #   ./minimal.nix
+  # ];
   xdg = {
     configFile = {
       "beets" = {
diff --git a/nixosConfigurations/hosts/server.nix b/nixosConfigurations/hosts/server.nix
index d15af01..be8dbdc 100755
--- a/nixosConfigurations/hosts/server.nix
+++ b/nixosConfigurations/hosts/server.nix
@@ -62,10 +62,10 @@ let
           options = [
             "bind"
             "nofail"
-            "uid=1000"
-            "gid=1000"
-            "fmask=0000"
-            "dmask=0000"
+            # "uid=1000"
+            # "gid=1000"
+            # "fmask=0000"
+            # "dmask=0000"
           ];
         };
       };
diff --git a/nixosModules/default.nix b/nixosModules/default.nix
index bbc75ed..4c4093b 100755
--- a/nixosModules/default.nix
+++ b/nixosModules/default.nix
@@ -29,6 +29,38 @@ let
         };
       };
 
+      _module.args = {
+        inputs = inputs;
+        xlib = config.xlib;
+      };
+    };
+  publicModule =
+    {
+      config,
+      lib,
+      xlib,
+      deviceType,
+      ...
+    }:
+    {
+      imports = with inputs; [
+        ./essentials
+        ./users.nix
+        ./options.nix
+        (./. + "/${deviceType}") # specific modules
+
+        home-manager.nixosModules.home-manager # home-manager module
+        sops-nix.nixosModules.sops # sops module
+        self.homeConfigurations.default.nixosModule # default homeConfigurations
+        disko.nixosModules.disko # disko module
+      ];
+
+      home-manager = {
+        extraSpecialArgs = {
+          xlib = config.xlib;
+        };
+      };
+
       _module.args = {
         inputs = inputs;
         xlib = config.xlib;
@@ -38,5 +70,6 @@ in
 {
   nixosModules = {
     default = defaultModule;
+    public = publicModule;
   };
 }
diff --git a/nixosModules/essentials/packages.nix b/nixosModules/essentials/packages.nix
index 3b5316d..d4707b9 100755
--- a/nixosModules/essentials/packages.nix
+++ b/nixosModules/essentials/packages.nix
@@ -6,6 +6,12 @@
 {
   environment = {
     systemPackages = with pkgs; [
+      # Minimal
+      btop
+      broot
+      bottom
+      fastfetchMinimal
+
       # yazi
       yaziPlugins.gitui