1231

homeConfigurations/server.nix

@@ -12,9 +12,9 @@ let
   musicPath = "${config.home.homeDirectory}/External/Music";
 in
 {
-  imports = [
-    ./minimal.nix
-  ];
+  # imports = [
+  #   ./minimal.nix
+  # ];
   xdg = {
     configFile = {
       "beets" = {

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"
           ];
         };
       };

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;
   };
 }

nixosModules/essentials/packages.nix

@@ -6,6 +6,12 @@
 {
   environment = {
     systemPackages = with pkgs; [
+      # Minimal
+      btop
+      broot
+      bottom
+      fastfetchMinimal
+
       # yazi
       yaziPlugins.gitui