From 7fc9d10092200f96bb0c04cb2219a68dc4caba5a Mon Sep 17 00:00:00 2001 From: Weckyy702 Date: Thu, 18 Jun 2026 16:04:42 +0200 Subject: [PATCH] Filesystems: Unify local NAS mounting for all hosts --- modules/hosts/keith/configuration.nix | 1 + modules/hosts/tux/tux.nix | 1 + modules/hosts/tux/users/weckyy702/mount-nas.nix | 16 ---------------- .../mount-duke-smb.nix} | 2 +- 4 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 modules/hosts/tux/users/weckyy702/mount-nas.nix rename modules/{hosts/keith/users/weckyy702/mount-nas.nix => services/mount-duke-smb.nix} (87%) diff --git a/modules/hosts/keith/configuration.nix b/modules/hosts/keith/configuration.nix index 10f3dc1..8209368 100644 --- a/modules/hosts/keith/configuration.nix +++ b/modules/hosts/keith/configuration.nix @@ -7,6 +7,7 @@ (grub-boot "/dev/nvme0n1") development-tools i18n-de + mount-duke-smb #TODO: moar aspects ]; diff --git a/modules/hosts/tux/tux.nix b/modules/hosts/tux/tux.nix index 7ad5a0f..cf1859c 100644 --- a/modules/hosts/tux/tux.nix +++ b/modules/hosts/tux/tux.nix @@ -14,6 +14,7 @@ opentablet appimage + mount-duke-smb ]; }; } diff --git a/modules/hosts/tux/users/weckyy702/mount-nas.nix b/modules/hosts/tux/users/weckyy702/mount-nas.nix deleted file mode 100644 index 3703e04..0000000 --- a/modules/hosts/tux/users/weckyy702/mount-nas.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ inputs, ... }: { - flake.modules.nixos.tux = { config, ... }: { - age.secrets."nas-creds".file = "${inputs.secrets}/nas-creds.age"; - - imports = with inputs.self.factory; [ - (mount-cifs { - host = "duke.veltnet"; - resource = "smb-share"; - destination = "/mnt/nas"; - credentials_path = "${config.age.secrets.nas-creds.path}"; - UID = "weckyy702"; - GID = "users"; - }) - ]; - }; -} diff --git a/modules/hosts/keith/users/weckyy702/mount-nas.nix b/modules/services/mount-duke-smb.nix similarity index 87% rename from modules/hosts/keith/users/weckyy702/mount-nas.nix rename to modules/services/mount-duke-smb.nix index 5e1fdae..750d461 100644 --- a/modules/hosts/keith/users/weckyy702/mount-nas.nix +++ b/modules/services/mount-duke-smb.nix @@ -1,5 +1,5 @@ { inputs, ... }: { - flake.modules.nixos.keith = { config, ... }: { + flake.modules.nixos.mount-duke-smb = { config, ... }: { age.secrets."nas-creds".file = "${inputs.secrets}/nas-creds.age"; imports = with inputs.self.factory; [