diff --git a/flake.nix b/flake.nix index 9725997..2c3b003 100644 --- a/flake.nix +++ b/flake.nix @@ -37,11 +37,6 @@ ./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; diff --git a/system/aly-laptop.nix b/system/aly-laptop.nix index 6903d20..4817113 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/storage" = { - device = "aly@lan.aly.pet:/mnt/storage"; - fsType = "sshfs"; - options = ["nodev,noatime,allow_other,IdentityFile=/home/aly/.ssh/id_ed25519"]; + fileSystems."/home/aly/Music" = { + device = "//10.8.0.4/media/music"; + 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"]; }; services.logind = { lidSwitch = "suspend";