From 54966912b29bd7ea3dff062b13e8b787fdba20af Mon Sep 17 00:00:00 2001 From: blake Date: Sat, 4 Oct 2025 00:42:13 -0500 Subject: [PATCH] fix it please --- homelab/nfs.nix | 17 --------------- homelab/smb.nix | 27 ------------------------ homelab/zfs.nix | 27 ------------------------ hosts/snowbelle/snowbelle.nix | 7 +++--- users/blake/dotfiles/nvim/lazy-lock.json | 3 --- 5 files changed, 4 insertions(+), 77 deletions(-) delete mode 100644 homelab/nfs.nix delete mode 100644 homelab/smb.nix delete mode 100644 homelab/zfs.nix diff --git a/homelab/nfs.nix b/homelab/nfs.nix deleted file mode 100644 index 262273a..0000000 --- a/homelab/nfs.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - nfsExports = '' - /holocron/vault *(rw,sync,no_subtree_check,no_root_squash) - /holocron/media *(ro,sync,no_subtree_check) - ''; -in -{ - # enable nfs with all exports - services.nfs = { - server = { - enable = true; - exports = nfsExports; - }; - }; -} diff --git a/homelab/smb.nix b/homelab/smb.nix deleted file mode 100644 index 6d4c696..0000000 --- a/homelab/smb.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, lib, pkgs, ... }: - -# define smb shares -let - smbShares = { - vault = { - path = "/holocron/vault"; - browseable = true; - writable = true; - guestOk = false; - }; - media = { - path = "/holocron/media"; - browseable = true; - writable = true; - guestOk = false; - }; - }; -in -{ - # enable smb with all shares - services.samba = { - enable = true; - settings = smbShares; - }; - -} diff --git a/homelab/zfs.nix b/homelab/zfs.nix deleted file mode 100644 index dd471e2..0000000 --- a/homelab/zfs.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, pkgs, ... }: - -{ - - # set network host id - networking.hostId = "3e6e7055"; - - # enable zfs support - boot.kernelModules = [ "zfs" ]; - boot.supportedFilesystems = [ "zfs" ]; - - # enable smart monitoring - services.smartd.enable = true; - - # enable zfs - services.zfs = { - autoScrub.enable = true; - autoScrub.interval = "weekly"; - -# datasets = { -# "rpool/data" = { -# mountPoint = "/mnt/storage"; -# }; -# }; - }; - -} diff --git a/hosts/snowbelle/snowbelle.nix b/hosts/snowbelle/snowbelle.nix index 0da71a3..115b6f0 100644 --- a/hosts/snowbelle/snowbelle.nix +++ b/hosts/snowbelle/snowbelle.nix @@ -6,9 +6,9 @@ ./hardware-configuration.nix ../../modules/ssh.nix ../../modules/docker.nix - ../../homelab/zfs.nix - ../../homelab/smb.nix - ../../homelab/nfs.nix + ../../modules/homelab/zfs.nix + ../../modules/homelab/smb.nix + ../../modules/homelab/nfs.nix ]; # use the systemd-boot EFI boot loader. @@ -61,6 +61,7 @@ 443 # https 445 # cifs 2049 # nfs + 3001 # uptime kuma ]; #networking.firewall.allowedUDPPorts = [ ... ]; diff --git a/users/blake/dotfiles/nvim/lazy-lock.json b/users/blake/dotfiles/nvim/lazy-lock.json index 5555728..75f75c6 100644 --- a/users/blake/dotfiles/nvim/lazy-lock.json +++ b/users/blake/dotfiles/nvim/lazy-lock.json @@ -4,11 +4,8 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "hererocks": { "branch": "master", "commit": "160228946bed9998f5e3b168bd0b66ba2690f8f3" }, - "image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" }, "lazy.nvim": { "branch": "main", "commit": "59334064f8604ca073791c25dcc5c9698865406e" }, "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "vimwiki": { "branch": "dev", "commit": "72792615e739d0eb54a9c8f7e0a46a6e2407c9e8" } }