From 22667daba37e2667489ef180a3620c8f608efcb9 Mon Sep 17 00:00:00 2001 From: alydev Date: Sun, 28 Sep 2025 15:17:16 +1000 Subject: [PATCH 1/6] update --- flake.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/flake.nix b/flake.nix index 2c3b003..9725997 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,11 @@ ./hw/aly-laptop.nix ./system/aly-laptop.nix ./system/global.nix + { + environment.systemPackages = [ + nix-search.packages.x86_64-linux.default + ]; + } home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; From b88e97609cc009d7f418f7f78452102992961dd2 Mon Sep 17 00:00:00 2001 From: alydev Date: Sun, 28 Sep 2025 15:22:57 +1000 Subject: [PATCH 2/6] update --- system/aly-laptop.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/system/aly-laptop.nix b/system/aly-laptop.nix index 4817113..cd052df 100644 --- a/system/aly-laptop.nix +++ b/system/aly-laptop.nix @@ -3,10 +3,10 @@ services.openvpn.servers = { laptop = { config = '' config /home/aly/.secrets/laptop.ovpn ''; }; }; - fileSystems."/home/aly/Music" = { - device = "//10.8.0.4/media/music"; + fileSystems."/mnt/media" = { + device = "//10.8.0.4/media"; fsType = "cifs"; - options = ["x-systemd.requires=openvpn-laptop.service,x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"]; + options = ["ro,x-systemd.requires=openvpn-laptop.service,x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"]; }; services.logind = { lidSwitch = "suspend"; From 22a349a7a9780071df81bad7cabccbd6cb3df49a Mon Sep 17 00:00:00 2001 From: alydev Date: Sun, 28 Sep 2025 15:25:36 +1000 Subject: [PATCH 3/6] update --- system/aly-laptop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/aly-laptop.nix b/system/aly-laptop.nix index cd052df..0d810e3 100644 --- a/system/aly-laptop.nix +++ b/system/aly-laptop.nix @@ -6,7 +6,7 @@ fileSystems."/mnt/media" = { device = "//10.8.0.4/media"; fsType = "cifs"; - options = ["ro,x-systemd.requires=openvpn-laptop.service,x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"]; + options = ["x-systemd.requires=openvpn-laptop.service,x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"]; }; services.logind = { lidSwitch = "suspend"; From c4f365df539893a6aa1bc87da6bd52b9566df237 Mon Sep 17 00:00:00 2001 From: alydev Date: Sun, 28 Sep 2025 15:29:53 +1000 Subject: [PATCH 4/6] update --- system/aly-laptop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/aly-laptop.nix b/system/aly-laptop.nix index 0d810e3..d216eab 100644 --- a/system/aly-laptop.nix +++ b/system/aly-laptop.nix @@ -6,7 +6,7 @@ fileSystems."/mnt/media" = { device = "//10.8.0.4/media"; fsType = "cifs"; - options = ["x-systemd.requires=openvpn-laptop.service,x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"]; + options = ["ro,guest,vers=3.0,x-systemd.requires=openvpn-laptop.service,x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"]; }; services.logind = { lidSwitch = "suspend"; From af34cfdcdff1ef53cf0739b344ea8c0345a65bde Mon Sep 17 00:00:00 2001 From: alydev Date: Sun, 28 Sep 2025 15:34:36 +1000 Subject: [PATCH 5/6] update --- system/aly-laptop.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/aly-laptop.nix b/system/aly-laptop.nix index d216eab..a1ea258 100644 --- a/system/aly-laptop.nix +++ b/system/aly-laptop.nix @@ -3,10 +3,10 @@ services.openvpn.servers = { laptop = { config = '' config /home/aly/.secrets/laptop.ovpn ''; }; }; - fileSystems."/mnt/media" = { - device = "//10.8.0.4/media"; - fsType = "cifs"; - options = ["ro,guest,vers=3.0,x-systemd.requires=openvpn-laptop.service,x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s"]; + fileSystems."/mnt/storage" = { + device = "aly@lan.aly.pet:/mnt/storage"; + fsType = "sshfs"; + options = ["nodev", "noatime", "allow_other", "IdentityFile=/home/aly/.ssh/id_ed25519"]; }; services.logind = { lidSwitch = "suspend"; From 10e5afd7410a4611d436bf93772cb5a34aea42d0 Mon Sep 17 00:00:00 2001 From: alydev Date: Sun, 28 Sep 2025 15:35:06 +1000 Subject: [PATCH 6/6] update --- system/aly-laptop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/aly-laptop.nix b/system/aly-laptop.nix index a1ea258..6903d20 100644 --- a/system/aly-laptop.nix +++ b/system/aly-laptop.nix @@ -6,7 +6,7 @@ fileSystems."/mnt/storage" = { device = "aly@lan.aly.pet:/mnt/storage"; fsType = "sshfs"; - options = ["nodev", "noatime", "allow_other", "IdentityFile=/home/aly/.ssh/id_ed25519"]; + options = ["nodev,noatime,allow_other,IdentityFile=/home/aly/.ssh/id_ed25519"]; }; services.logind = { lidSwitch = "suspend";