From cad62788ce83a86c6b21784e041801ff451cb482 Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Fri, 29 Mar 2024 12:51:49 -0700
Subject: [PATCH] vy

---
 flake.lock           | 18 +++++++++---------
 flake.nix            |  1 +
 systems/NOlaptop.nix | 12 ++++++++++++
 systems/NOmom.nix    | 12 ++++++++++++
 users/tao.nix        | 12 ------------
 users/vy.nix         |  3 ++-
 6 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index a653b53..644aed0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -104,11 +104,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1711723484,
-        "narHash": "sha256-lRF/0zfF4jwsUvJAbl7D4pQRxpqrTCJaEMZ7DvPOw60=",
+        "lastModified": 1711828815,
+        "narHash": "sha256-KcmXrdxyk7vJ+KCSzbgBCJq0XnUVZ+3JU0kJJbMkruk=",
         "owner": "the-mikedavis",
         "repo": "helix",
-        "rev": "22e2d20ac058efb86c4ca35a6d221f92eedc8f3b",
+        "rev": "b0a133eeacec44cfd03b8f00502e107fe144c988",
         "type": "github"
       },
       "original": {
@@ -189,11 +189,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1711764865,
-        "narHash": "sha256-Np6mPZUAt9Ecx+8lv6juER5zUcpmRuGRxdEFgeBlWfA=",
+        "lastModified": 1711816545,
+        "narHash": "sha256-E3N3N0uEQmzaWbBRdVaZq5sA5t2w2uWBn8G0AV4PFOk=",
         "owner": "martinvonz",
         "repo": "jj",
-        "rev": "08b5b66ad41146491339efff5670cba4a81e56f4",
+        "rev": "bbe906b426472e4e8278674da36c2d3b3145b0ef",
         "type": "github"
       },
       "original": {
@@ -276,11 +276,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711748679,
-        "narHash": "sha256-qaxqvAl4ngnTxXUX2P9ij/+bsCQaXtNcejziO6s0yY4=",
+        "lastModified": 1711799416,
+        "narHash": "sha256-BM3aduxJjvSL0jTYG1ixWDhBvIWuouycvprKQYP0FnM=",
         "owner": "pjones",
         "repo": "plasma-manager",
-        "rev": "fb4a1cdd4e54d4a5fa4d9eddae052cb60844c104",
+        "rev": "25b222a95a764bb76b7082746e8a1115c46ae2d8",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index eb93ed8..7619562 100644
--- a/flake.nix
+++ b/flake.nix
@@ -104,6 +104,7 @@
           ./systems/BASED.nix
           ./systems/NOmom.nix
           ./users/tao.nix
+          ./users/vy.nix
           ./extras/uwuraid.nix
           ./extras/dev.nix
           ./extras/gaming.nix
diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix
index f3eab76..6df4d37 100644
--- a/systems/NOlaptop.nix
+++ b/systems/NOlaptop.nix
@@ -43,6 +43,18 @@ MatchName=Framework Laptop 16 Keyboard Module*
 AttrKeyboardIntegration=internal";
   };
 
+  services.snapper.configs = {
+    home = {
+      SUBVOLUME = "/home";
+      ALLOW_USERS = ["tao"];
+      TIMELINE_CREATE = true;
+      TIMELINE_CLEANUP = true;
+      TIMELINE_LIMIT_HOURLY = "5";
+      TIMELINE_LIMIT_DAILY = "7";
+    };
+  };
+  services.snapper.snapshotInterval = "*:0/5";
+
   services.xserver.displayManager.defaultSession = "plasma";
   services.xserver.displayManager.sddm.wayland.enable = true;
 
diff --git a/systems/NOmom.nix b/systems/NOmom.nix
index 3ef380b..92f4036 100644
--- a/systems/NOmom.nix
+++ b/systems/NOmom.nix
@@ -26,6 +26,18 @@
   #   extraBackends = [ pkgs.epkowa ];
   # };
 
+  services.snapper.configs = {
+    home = {
+      SUBVOLUME = "/home";
+      ALLOW_USERS = ["vy" "tao"];
+      TIMELINE_CREATE = true;
+      TIMELINE_CLEANUP = true;
+      TIMELINE_LIMIT_HOURLY = "5";
+      TIMELINE_LIMIT_DAILY = "7";
+    };
+  };
+  services.snapper.snapshotInterval = "*:0/5";
+
   services.udev.extraRules = ''
     # Ethernet expansion card
     ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20"
diff --git a/users/tao.nix b/users/tao.nix
index 00a2827..1529558 100644
--- a/users/tao.nix
+++ b/users/tao.nix
@@ -107,18 +107,6 @@
     };
   };
 
-  services.snapper.configs = {
-    home = {
-      SUBVOLUME = "/home";
-      ALLOW_USERS = ["tao"];
-      TIMELINE_CREATE = true;
-      TIMELINE_CLEANUP = true;
-      TIMELINE_LIMIT_HOURLY = "5";
-      TIMELINE_LIMIT_DAILY = "7";
-    };
-  };
-  services.snapper.snapshotInterval = "*:0/5";
-
   hardware.keyboard.qmk.enable = true;
   services.udev.extraRules = ''
     KERNEL=="hidraw*", SUBSYSTEM=="hidraw", MODE="0660", GROUP="users", TAG+="uaccess", TAG+="udev-acl"
diff --git a/users/vy.nix b/users/vy.nix
index d5ca7a3..359222e 100644
--- a/users/vy.nix
+++ b/users/vy.nix
@@ -9,6 +9,7 @@
     yt-dlp
     zoom-us
   ];
+  programs.kdeconnect.enable = true;
 
   fonts.packages = with pkgs; [
     noto-fonts-cjk
@@ -17,6 +18,6 @@
 
   users.users.vy = {
     isNormalUser = true;
-    extraGroups = ["audio" "video"];
+    extraGroups = ["wheel" "audio" "video"];
   };
 }