From 3af6375a8cb5bcbc35fcce2acfad3b8a6c6f4727 Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Sun, 14 Aug 2022 10:45:17 +0300
Subject: [PATCH] a

---
 flake.lock                      |  8 ++---
 hosts/tkaronto/default.nix      | 58 +++------------------------------
 hosts/tkaronto/modules/boot.nix | 26 +++++++++++++++
 hosts/tkaronto/modules/fs.nix   | 30 +++++++++++++++++
 hosts/wolumonde/default.nix     | 10 ++----
 lib/default.nix                 |  9 +++++
 6 files changed, 75 insertions(+), 66 deletions(-)
 create mode 100644 hosts/tkaronto/modules/boot.nix
 create mode 100644 hosts/tkaronto/modules/fs.nix

diff --git a/flake.lock b/flake.lock
index 4188476..cacc0dd 100644
--- a/flake.lock
+++ b/flake.lock
@@ -75,11 +75,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1660460606,
-        "narHash": "sha256-Ii+2BV7wRKbK+92vTcdJB9rGdNYqbIOrl22oFBZZGJ8=",
+        "lastModified": 1660463078,
+        "narHash": "sha256-0Fnkx0nBt/OSzAFtOvoZVsuvWUyKOdNWLqC1WbxX42o=",
         "ref": "refs/heads/master",
-        "rev": "04fbe0aab92fbcea4ea766b99ddafa0f5535875b",
-        "revCount": 60,
+        "rev": "9de392f81cf3e88fe125e1f952276e4ffd59d82f",
+        "revCount": 61,
         "type": "git",
         "url": "https://git.gaze.systems/dusk/website.git"
       },
diff --git a/hosts/tkaronto/default.nix b/hosts/tkaronto/default.nix
index ba70a9f..715c86f 100644
--- a/hosts/tkaronto/default.nix
+++ b/hosts/tkaronto/default.nix
@@ -1,12 +1,11 @@
 {
   config,
   lib,
+  tlib,
   pkgs,
   inputs,
   ...
-}: let
-  byLabel = label: "/dev/disk/by-label/${label}";
-in {
+}: {
   imports = with inputs;
   with nixos-hardware.nixosModules; [
     nixpkgs.nixosModules.notDetected
@@ -21,60 +20,11 @@ in {
     ../../modules/network/iwd.nix
     ../../users/root
     ../../users/patriot
-  ];
+  ]
+  ++ (tlib.importFolder (toString ./modules));
 
   system.persistDir = "/persist";
 
-  boot = {
-    tmpOnTmpfs = true;
-    loader = {
-      efi.canTouchEfiVariables = true;
-      systemd-boot.enable = true;
-      systemd-boot.configurationLimit = 10;
-    };
-    kernelPackages = pkgs.linuxPackages_latest;
-    supportedFilesystems = ["f2fs"];
-    initrd = {
-      availableKernelModules = [
-        "nvme"
-        "xhci_pci"
-        "ahci"
-        "usb_storage"
-        "usbhid"
-        "sd_mod"
-      ];
-      kernelModules = ["amdgpu"];
-    };
-    kernelModules = ["kvm-amd"];
-    extraModulePackages = [];
-    kernel.sysctl = {"fs.inotify.max_user_watches" = 524288;};
-  };
-
-  fileSystems."/" = {
-    device = "none";
-    fsType = "tmpfs";
-    options = ["defaults" "size=2G" "mode=755"];
-  };
-  fileSystems."/nix" = {
-    device = byLabel "NIX";
-    fsType = "f2fs";
-  };
-  fileSystems."${config.system.persistDir}" = {
-    device = byLabel "PERSIST";
-    fsType = "f2fs";
-    neededForBoot = true;
-  };
-  fileSystems."/boot" = {
-    device = byLabel "BOOT";
-    fsType = "vfat";
-  };
-
-  swapDevices = [];
-  zramSwap = {
-    enable = true;
-    algorithm = "zstd";
-  };
-
   nix.settings.max-jobs = lib.mkForce 16;
   security = {
     pam.loginLimits = [
diff --git a/hosts/tkaronto/modules/boot.nix b/hosts/tkaronto/modules/boot.nix
new file mode 100644
index 0000000..7f28412
--- /dev/null
+++ b/hosts/tkaronto/modules/boot.nix
@@ -0,0 +1,26 @@
+{pkgs, ...}: {
+  boot = {
+    tmpOnTmpfs = true;
+    loader = {
+      efi.canTouchEfiVariables = true;
+      systemd-boot.enable = true;
+      systemd-boot.configurationLimit = 10;
+    };
+    kernelPackages = pkgs.linuxPackages_latest;
+    supportedFilesystems = ["f2fs"];
+    initrd = {
+      availableKernelModules = [
+        "nvme"
+        "xhci_pci"
+        "ahci"
+        "usb_storage"
+        "usbhid"
+        "sd_mod"
+      ];
+      kernelModules = ["amdgpu"];
+    };
+    kernelModules = ["kvm-amd"];
+    extraModulePackages = [];
+    kernel.sysctl = {"fs.inotify.max_user_watches" = 524288;};
+  };
+}
diff --git a/hosts/tkaronto/modules/fs.nix b/hosts/tkaronto/modules/fs.nix
new file mode 100644
index 0000000..b334125
--- /dev/null
+++ b/hosts/tkaronto/modules/fs.nix
@@ -0,0 +1,30 @@
+{config, ...}:
+let
+  byLabel = label: "/dev/disk/by-label/${label}";
+in
+{
+  fileSystems."/" = {
+    device = "none";
+    fsType = "tmpfs";
+    options = ["defaults" "size=2G" "mode=755"];
+  };
+  fileSystems."/nix" = {
+    device = byLabel "NIX";
+    fsType = "f2fs";
+  };
+  fileSystems."${config.system.persistDir}" = {
+    device = byLabel "PERSIST";
+    fsType = "f2fs";
+    neededForBoot = true;
+  };
+  fileSystems."/boot" = {
+    device = byLabel "BOOT";
+    fsType = "vfat";
+  };
+
+  swapDevices = [];
+  zramSwap = {
+    enable = true;
+    algorithm = "zstd";
+  };
+}
diff --git a/hosts/wolumonde/default.nix b/hosts/wolumonde/default.nix
index 6c7bec3..71ebe53 100644
--- a/hosts/wolumonde/default.nix
+++ b/hosts/wolumonde/default.nix
@@ -3,16 +3,10 @@
   pkgs,
   config,
   lib,
+  tlib,
   ...
 }: {
-  imports = let
-    b = builtins;
-    modules = toString ./modules;
-    files = b.readDir modules;
-    filesToImport =
-      b.map (name: "${modules}/${name}") (b.attrNames files);
-  in
-    filesToImport;
+  imports = tlib.importFolder (toString ./modules);
 
   boot.cleanTmpDir = true;
   zramSwap.enable = true;
diff --git a/lib/default.nix b/lib/default.nix
index 8ed4f93..dd02665 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -10,4 +10,13 @@ lib.makeExtensible (self: {
 
   prefixStrings = prefix: strings:
     lib.forEach strings (string: "${prefix}${string}");
+
+  importFolder = modules:
+    let
+      b = builtins;
+      files = b.readDir modules;
+      filesToImport =
+        b.map (name: "${modules}/${name}") (b.attrNames files);
+    in
+      filesToImport;
 })