fix: fix some module configs

modules/nixos/filesystems/btrfs.nix

@@ -118,10 +118,10 @@ in
           requires = [ cfg.eraseOnBoot.waitForDevice ];
           after = [ cfg.eraseOnBoot.waitForDevice ];
           before = [ "sysroot.mount" ];
-          path = [
-            pkgs.btrfs-progs
-            pkgs.coreutils
-            pkgs.util-linuxMinimal.mount
+          path = with pkgs; [
+            btrfs-progs
+            coreutils
+            util-linuxMinimal.mount
           ];
           unitConfig.DefaultDependencies = "no";
           serviceConfig.Type = "oneshot";

modules/nixos/filesystems/zfs.nix

@@ -69,6 +69,10 @@ in
         };
       };
 
+      boot.kernelParams = [
+        "zfs.metaslab_lba_weighting_enabled=0"
+      ];
+
       services.zfs = {
         autoScrub.enable = true;
         autoScrub.interval = "monthly";

modules/nixos/locale/default.nix

@@ -3,13 +3,12 @@ let
   inherit (lib) mkDefault mkEnableOption mkIf;
   cfg = config.ataraxia.defaults.locale;
 
-  c = "C.UTF-8";
   dk = "en_DK.UTF-8";
   gb = "en_GB.UTF-8";
   ie = "en_IE.UTF-8";
   ru = "ru_RU.UTF-8";
   us = "en_US.UTF-8";
-  lang = "en_IE:en_US:en:C:ru_RU";
+  lang = "en_US:en:C:ru_RU:ru";
 in
 {
   options.ataraxia.defaults.locale = {
@@ -17,10 +16,8 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.sessionVariables = {
-      XKB_DEFAULT_LAYOUT = "us,ru";
-      XKB_DEFAULT_OPTIONS = "grp:win_space_toggle";
-    };
+    # Locale
+    i18n.defaultCharset = "UTF-8";
     i18n.defaultLocale = ie;
     i18n.extraLocaleSettings = {
       LANGUAGE = lang;
@@ -31,14 +28,18 @@ in
       LC_PAPER = ru;
       LC_TELEPHONE = ru;
     };
-    i18n.supportedLocales = map (x: "${x}/UTF-8") [
-      c
-      dk
+    i18n.extraLocales = map (x: "${x}/${config.i18n.defaultCharset}") [
       gb
-      ie
-      ru
       us
     ];
+    # Keyboard layout
+    console.earlySetup = true;
+    console.useXkbConfig = true;
+    services.xserver.xkb = {
+      layout = "us,ru";
+      options = "grp:win_space_toggle";
+    };
+    # Timezone
     time.timeZone = mkDefault "Europe/Moscow";
   };
 }

modules/nixos/roles/default.nix

@@ -41,7 +41,7 @@ in
         ataraxia.defaults.users.enable = mkDefault true;
 
         persist.enable = mkDefault true;
-        persist.cache.clean.enable = true;
+        persist.cache.clean.enable = mkDefault true;
 
         # Do not compress journal logs if using native fs compression
         services.journald.extraConfig = mkIf fsCompression (mkDefault "Compress=false");
@@ -56,7 +56,8 @@ in
         zramSwap = {
           enable = true;
           algorithm = "zstd";
-          memoryPercent = 100;
+          priority = mkDefault 100;
+          memoryPercent = mkDefault 50;
         };
       };
       serverRole = recursiveUpdate baseRole {