From 10fa5498ee6e657cfbecf264350e17fccbf4c8f9 Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Fri, 30 Jan 2026 08:36:17 -0600 Subject: [PATCH] idk shits so fucked lol --- modules/nixos/network/default.nix | 11 ++ modules/nixos/services/ai/default.nix | 2 +- systems/x86_64-linux/jallen-nas/apps.nix | 2 +- systems/x86_64-linux/jallen-nas/default.nix | 123 +++++++------------- systems/x86_64-linux/jallen-nas/sops.nix | 12 +- 5 files changed, 60 insertions(+), 90 deletions(-) diff --git a/modules/nixos/network/default.nix b/modules/nixos/network/default.nix index 4623fac..ebb128c 100644 --- a/modules/nixos/network/default.nix +++ b/modules/nixos/network/default.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, namespace, ... }: @@ -130,6 +131,16 @@ in enable = true; wifi.powersave = cfg.networkmanager.powersave; settings.connectivity.uri = mkDefault "http://nmcheck.gnome.org/check_network_status.txt"; + plugins = with pkgs; [ + networkmanager-fortisslvpn + networkmanager-iodine + networkmanager-l2tp + networkmanager-openconnect + networkmanager-openvpn + networkmanager-sstp + networkmanager-strongswan + networkmanager-vpnc + ]; # Configure WiFi profiles if any are defined ensureProfiles = mkIf (cfg.networkmanager.profiles != { }) { diff --git a/modules/nixos/services/ai/default.nix b/modules/nixos/services/ai/default.nix index 5b5a6c1..cbb3908 100755 --- a/modules/nixos/services/ai/default.nix +++ b/modules/nixos/services/ai/default.nix @@ -35,7 +35,7 @@ let port = 8127; host = "0.0.0.0"; openFirewall = cfg.openFirewall; - model = "${cfg.configDir}/llama-cpp/models/functionary-small-v3.2-GGUF/functionary-small-v3.2.Q4_0.gguf"; + # model = "${cfg.configDir}/llama-cpp/models/functionary-small-v3.2-GGUF/functionary-small-v3.2.Q4_0.gguf"; package = pkgs.llama-cpp-rocm; extraFlags = [ "--n_gpu-layers" diff --git a/systems/x86_64-linux/jallen-nas/apps.nix b/systems/x86_64-linux/jallen-nas/apps.nix index 39c2268..589c20a 100755 --- a/systems/x86_64-linux/jallen-nas/apps.nix +++ b/systems/x86_64-linux/jallen-nas/apps.nix @@ -23,7 +23,7 @@ in ]; }; }; - # ai = enabled; + ai = enabled; arrs = enabled; attic = { enable = true; diff --git a/systems/x86_64-linux/jallen-nas/default.nix b/systems/x86_64-linux/jallen-nas/default.nix index c531f11..c4368f8 100755 --- a/systems/x86_64-linux/jallen-nas/default.nix +++ b/systems/x86_64-linux/jallen-nas/default.nix @@ -241,7 +241,7 @@ in services = { grafana = { - enable = true; + enable = false; port = 9999; }; }; @@ -281,87 +281,7 @@ in # ]; # }; fileSystems = { - "/media/nas/main/appdata" = { - device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552"; - fsType = "bcachefs"; - options = [ - "X-mount.subdir=appdata" - "x-systemd.device-timeout=180s" - ]; - }; - "/media/nas/main/backup" = { - device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552"; - fsType = "bcachefs"; - options = [ - "X-mount.subdir=backup" - "x-systemd.device-timeout=180s" - ]; - }; - "/media/nas/main/databases" = { - device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552"; - fsType = "bcachefs"; - options = [ - "X-mount.subdir=databases" - "x-systemd.device-timeout=180s" - ]; - }; - "/media/nas/main/documents" = { - device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552"; - fsType = "bcachefs"; - options = [ - "X-mount.subdir=documents" - "x-systemd.device-timeout=180s" - ]; - }; - "/media/nas/games/heroic" = { - device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552"; - fsType = "bcachefs"; - options = [ - "X-mount.subdir=heroic" - "x-systemd.device-timeout=180s" - ]; - }; - "/media/nas/main/movies" = { - device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552"; - fsType = "bcachefs"; - options = [ - "X-mount.subdir=movies" - "x-systemd.device-timeout=180s" - ]; - }; - "/media/nas/main/photos" = { - device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552"; - fsType = "bcachefs"; - options = [ - "X-mount.subdir=photos" - "x-systemd.device-timeout=180s" - ]; - }; - "/media/nas/games/steam" = { - device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552"; - fsType = "bcachefs"; - options = [ - "X-mount.subdir=steam" - "x-systemd.device-timeout=180s" - ]; - }; - "/media/nas/main/tv" = { - device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552"; - fsType = "bcachefs"; - options = [ - "X-mount.subdir=tv" - "x-systemd.device-timeout=180s" - ]; - }; - "/persist" = { - device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552"; - fsType = "bcachefs"; - options = [ - "X-mount.subdir=persist" - "x-systemd.device-timeout=180s" - ]; - }; - "/subvolumes" = { + "/media/nas/main" = { device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552"; fsType = "bcachefs"; }; @@ -380,6 +300,45 @@ in ''; }; + boot.initrd.luks.devices = { + hdd1-cryptroot = { + device = "/dev/disk/by-uuid/295d4c78-41f0-4792-bd97-ac88b2455cdc"; + }; + hdd2-cryptroot = { + device = "/dev/disk/by-uuid/7c9c2179-351c-40a5-9257-e9ee2a1e794a"; + }; + ssd1-cryptroot = { + device = "/dev/disk/by-uuid/d78fa862-212c-4d4f-ad86-bfeead5cc054"; + allowDiscards = true; + bypassWorkqueues = true; + }; + ssd2-cryptroot = { + device = "/dev/disk/by-uuid/1661c173-3809-4517-9ab8-ad94c229048d"; + allowDiscards = true; + bypassWorkqueues = true; + }; + ssd3-cryptroot = { + device = "/dev/disk/by-uuid/cfea125e-90b1-4248-834d-16dcaf310783"; + allowDiscards = true; + bypassWorkqueues = true; + }; + ssd4-cryptroot = { + device = "/dev/disk/by-uuid/96055401-6d1a-4308-9e4e-2211e1e23635"; + allowDiscards = true; + bypassWorkqueues = true; + }; + ssd5-cryptroot = { + device = "/dev/disk/by-uuid/055e27e0-c96a-4899-8ee7-cb1cd5f21476"; + allowDiscards = true; + bypassWorkqueues = true; + }; + ssd6-cryptroot = { + device = "/dev/disk/by-uuid/6e830abd-2555-4558-81a3-4a990507b5a7"; + allowDiscards = true; + bypassWorkqueues = true; + }; + }; + # boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-partlabel/disk-main-jallen-nas-cryptroot"; # Configure environment diff --git a/systems/x86_64-linux/jallen-nas/sops.nix b/systems/x86_64-linux/jallen-nas/sops.nix index 8da772c..9124e6a 100755 --- a/systems/x86_64-linux/jallen-nas/sops.nix +++ b/systems/x86_64-linux/jallen-nas/sops.nix @@ -98,12 +98,12 @@ in # crowdsec # ------------------------------ - "jallen-nas/crowdsec-capi" = { - sopsFile = defaultSops; - owner = "crowdsec"; - group = "crowdsec"; - restartUnits = [ "crowdsec.service" ]; - }; + # "jallen-nas/crowdsec-capi" = { + # sopsFile = defaultSops; + # owner = "crowdsec"; + # group = "crowdsec"; + # restartUnits = [ "crowdsec.service" ]; + # }; # ------------------------------ # mariadb # TODO