flake.lock: Update

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/3bacde6273b09a21a8ccfba15586fb165078fb62' (2022-11-05)
  → 'github:NixOS/nixpkgs/667e5581d16745bcda791300ae7e2d73f49fff25' (2022-11-07)

flake.lock

@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1667050928,
+        "lastModified": 1667811565,
-        "narHash": "sha256-xOn0ZgjImIyeecEsrjxuvlW7IW5genTwvvnDQRFncB8=",
+        "narHash": "sha256-HYml7RdQPQ7X13VNe2CoDMqmifsXbt4ACTKxHRKQE3Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fdebb81f45a1ba2c4afca5fd9f526e1653ad0949",
+        "rev": "667e5581d16745bcda791300ae7e2d73f49fff25",
         "type": "github"
       },
       "original": {

modules/datasync.nix

@@ -84,41 +84,17 @@
 
   # Automount external storage
   systemd.mounts = [
-    # USB
-    {
-      what = "/dev/sda1";
-      where = "/usb";
-      mountConfig = { TimeoutSec = "5"; };
-    }
-    # SD card
-    {
-      what = "/dev/mmcblk0p1";
-      where = "/sdcard";
-      mountConfig = { TimeoutSec = "5"; };
-    }
     # UGent Samba
     {
       what = "//files.ugent.be/akasroua/home";
       type = "cifs";
       where = "/ugent";
       options =
-        "credentials=${config.age.secrets.samba-ugent.path},noperm,vers=3.11,sec=ntlmv2i";
+        "credentials=${config.age.secrets.samba-ugent.path},noperm,vers=3.11,sec=ntlmv2i,noserverino";
       mountConfig = { TimeoutSec = "5"; };
     }
   ];
   systemd.automounts = [
-    # USB
-    {
-      where = "/usb";
-      automountConfig = { TimeoutIdleSec = "5"; };
-      wantedBy = [ "default.target" ];
-    }
-    # SD card
-    {
-      where = "/sdcard";
-      automountConfig = { TimeoutIdleSec = "5"; };
-      wantedBy = [ "default.target" ];
-    }
     # UGent Samba
     {
       where = "/ugent";

modules/gui.nix

@@ -2,17 +2,7 @@
 
 with pkgs;
 
-let
+{
-  waybar-audio-patch = waybar.overrideAttrs (old: rec {
-    src = fetchFromGitHub {
-      owner = "Alexays";
-      repo = "Waybar";
-      rev = "ebdf575d45c0e4f8c6f6ce484fbbf5375ed8dbba";
-      sha256 = "WTdy9zGhidk56CjmSuFDigfa64O9ZNd5GpfpCVrL8i0=";
-    };
-  });
-
-in {
   # Display manager
   services.xserver.enable = true;
   services.xserver.displayManager = {
@@ -36,7 +26,7 @@ in {
       swayidle
       swaybg
       rofi-wayland
-      waybar-audio-patch
+      waybar
       clipman
       wl-clipboard
       grim
@@ -78,9 +68,6 @@ in {
     };
   };
 
-  # Bar
-  programs.waybar.enable = true;
-
   # GPG agent
   programs.gnupg.agent = {
     enable = true;
@@ -105,4 +92,7 @@ in {
     enable = true;
     wlr.enable = true;
   };
+
+  # Allow dbus to communicate with storage devices
+  services.udisks2.enable = true;
 }

modules/hardware-configuration.nix

@@ -23,19 +23,14 @@
       fsType = "zfs";
     };
 
-  fileSystems."/sdcard" =
-    { device = "systemd-1";
-      fsType = "autofs";
-    };
-
   fileSystems."/ugent" =
     { device = "systemd-1";
       fsType = "autofs";
     };
 
-  fileSystems."/usb" =
+  fileSystems."/tmp" =
-    { device = "systemd-1";
+    { device = "syscea/ephemeral/tmp";
-      fsType = "autofs";
+      fsType = "zfs";
     };
 
   fileSystems."/home/coolneng" =
@@ -43,11 +38,6 @@
       fsType = "zfs";
     };
 
-  fileSystems."/tmp" =
-    { device = "syscea/ephemeral/tmp";
-      fsType = "zfs";
-    };
-
   fileSystems."/home/coolneng/Downloads" =
     { device = "syscea/stateful/home/downloads";
       fsType = "zfs";