From 905a306a705fc7bf9f0d03945bfe692c530dd05e Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Thu, 8 Jun 2023 23:44:59 -0600
Subject: flake: update to 23.05

---
 sys/auth.nix       | 10 ++++---
 sys/fs/btrfs.nix   | 76 ++++++++++++++++++++++++++----------------------------
 sys/fs/default.nix |  2 +-
 3 files changed, 44 insertions(+), 44 deletions(-)

(limited to 'sys')

diff --git a/sys/auth.nix b/sys/auth.nix
index e9723a7..b2333c0 100644
--- a/sys/auth.nix
+++ b/sys/auth.nix
@@ -20,10 +20,6 @@ in
       ports = [ 2234 ];
       startWhenNeeded = true;
 
-      forwardX11 = true;
-      permitRootLogin = "no";
-      passwordAuthentication = true; # Necesario para oath, no reemplaza a oath
-
       hostKeys = [
         {
           bits = 4096;
@@ -41,6 +37,12 @@ in
         }
       ];
 
+      settings = {
+        X11Forwarding = true;
+        PermitRootLogin = "no";
+        PasswordAuthentication = true; # Necesario para oath, no reemplaza a oath
+      };
+
       extraConfig = ''
         # User 'tunnel' has no password. Use PAM OATH
         # and connect with -N, forward with -R.
diff --git a/sys/fs/btrfs.nix b/sys/fs/btrfs.nix
index 809d35e..f240b0d 100644
--- a/sys/fs/btrfs.nix
+++ b/sys/fs/btrfs.nix
@@ -59,58 +59,56 @@ in
     services.snapper.configs =
       let
         snapperConfig = _: subvolume: {
-          inherit subvolume;
+          SUBVOLUME = subvolume;
 
-          extraConfig = ''
-            # btrfs qgroup for space aware cleanup algorithms
-            QGROUP=""
+          # btrfs qgroup for space aware cleanup algorithms
+          QGROUP = "";
 
-            # fraction of the filesystems space the snapshots may use
-            SPACE_LIMIT="0.5"
+          # fraction of the filesystems space the snapshots may use
+          SPACE_LIMIT = "0.5";
 
-            # fraction of the filesystems space that should be free
-            FREE_LIMIT="0.2"
+          # fraction of the filesystems space that should be free
+          FREE_LIMIT = "0.2";
 
-            # users and groups allowed to work with config
-            ALLOW_USERS=""
-            ALLOW_GROUPS=""
+          # users and groups allowed to work with config
+          ALLOW_USERS = [ ];
+          ALLOW_GROUPS = [ ];
 
-            # sync users and groups from ALLOW_USERS and ALLOW_GROUPS to .snapshots
-            # directory
-            SYNC_ACL="no"
+          # sync users and groups from ALLOW_USERS and ALLOW_GROUPS to .snapshots
+          # directory
+          SYNC_ACL = "no";
 
-            # start comparing pre- and post-snapshot in background after creating
-            # post-snapshot
-            BACKGROUND_COMPARISON="yes"
+          # start comparing pre- and post-snapshot in background after creating
+          # post-snapshot
+          BACKGROUND_COMPARISON = "yes";
 
-            # run daily number cleanup
-            NUMBER_CLEANUP="yes"
+          # run daily number cleanup
+          NUMBER_CLEANUP = "yes";
 
-            # limit for number cleanup
-            NUMBER_MIN_AGE="1800"
-            NUMBER_LIMIT="100"
-            NUMBER_LIMIT_IMPORTANT="10"
+          # limit for number cleanup
+          NUMBER_MIN_AGE = "1800";
+          NUMBER_LIMIT = "100";
+          NUMBER_LIMIT_IMPORTANT = "10";
 
-            # create hourly snapshots
-            TIMELINE_CREATE="yes"
+          # create hourly snapshots
+          TIMELINE_CREATE = true;
 
-            # cleanup hourly snapshots after some time
-            TIMELINE_CLEANUP="yes"
+          # cleanup hourly snapshots after some time
+          TIMELINE_CLEANUP = true;
 
-            # limits for timeline cleanup
-            TIMELINE_MIN_AGE="1800"
-            TIMELINE_LIMIT_HOURLY="24"
-            TIMELINE_LIMIT_DAILY="7"
-            TIMELINE_LIMIT_WEEKLY="4"
-            TIMELINE_LIMIT_MONTHLY="12"
-            TIMELINE_LIMIT_YEARLY="10"
+          # limits for timeline cleanup
+          TIMELINE_MIN_AGE = "1800";
+          TIMELINE_LIMIT_HOURLY = "24";
+          TIMELINE_LIMIT_DAILY = "7";
+          TIMELINE_LIMIT_WEEKLY = "4";
+          TIMELINE_LIMIT_MONTHLY = "12";
+          TIMELINE_LIMIT_YEARLY = "10";
 
-            # cleanup empty pre-post-pairs
-            EMPTY_PRE_POST_CLEANUP="yes"
+          # cleanup empty pre-post-pairs
+          EMPTY_PRE_POST_CLEANUP = "yes";
 
-            # limits for empty pre-post-pair cleanup
-            EMPTY_PRE_POST_MIN_AGE="1800"
-          '';
+          # limits for empty pre-post-pair cleanup
+          EMPTY_PRE_POST_MIN_AGE = "1800";
         };
       in
       mapAttrs snapperConfig cfg.snapperSubvols;
diff --git a/sys/fs/default.nix b/sys/fs/default.nix
index 04b8acb..41871df 100644
--- a/sys/fs/default.nix
+++ b/sys/fs/default.nix
@@ -18,7 +18,7 @@ in
 
   config = {
     # !!!
-    boot.tmpOnTmpfs = true;
+    boot.tmp.useTmpfs = true;
 
     fileSystems."/" = mkIf cfg.impermanence {
       device = "tmpfs";
-- 
cgit v1.2.3