From cd809e4156a4fb3fdc51ec3030d0a8986d20242d Mon Sep 17 00:00:00 2001 From: mjallen18 Date: Fri, 23 Aug 2024 12:00:51 -0500 Subject: [PATCH] finally fixing the ups, plus tons of formatting --- hosts/default.nix | 14 +- hosts/desktop/configuration.nix | 20 ++- hosts/desktop/cosmic/default.nix | 4 +- hosts/desktop/filesystems.nix | 8 +- hosts/desktop/gnome/default.nix | 4 +- hosts/desktop/gnome/home.nix | 2 +- hosts/desktop/hardware-configuration.nix | 2 - hosts/desktop/home.nix | 2 +- .../desktop/hyprland/config/btop/default.nix | 4 +- .../desktop/hyprland/config/hypr/default.nix | 31 ++-- .../desktop/hyprland/config/mako/default.nix | 2 +- .../hyprland/config/waybar/default.nix | 128 +++++++------- .../desktop/hyprland/config/wofi/default.nix | 2 +- hosts/desktop/sops.nix | 10 +- hosts/mac-nixos/configuration.nix | 10 +- hosts/mac-nixos/hardware-configuration.nix | 8 +- hosts/mac/home.nix | 7 +- hosts/nas/apps.nix | 15 +- hosts/nas/boot.nix | 9 +- hosts/nas/configuration.nix | 8 +- hosts/nas/filesystems.nix | 93 ++-------- hosts/nas/hardware-configuration.nix | 13 +- hosts/nas/home.nix | 31 +--- hosts/nas/impermanence.nix | 10 +- hosts/nas/networking.nix | 11 +- hosts/nas/samba.nix | 9 +- hosts/nas/services.nix | 19 +-- hosts/nas/sops.nix | 14 +- hosts/nas/ups.nix | 73 ++++---- hosts/pi4/configuration.nix | 9 +- hosts/pi4/docker-pi4.nix | 35 ---- hosts/pi4/hardware-configuration.nix | 8 +- hosts/pi4/home.nix | 5 +- modules/apps/beszel-agent/default.nix | 11 +- modules/apps/beszel-agent/options.nix | 2 +- modules/apps/beszel/default.nix | 11 +- modules/apps/collabora/default.nix | 7 +- modules/apps/collabora/options.nix | 2 +- modules/apps/deluge/default.nix | 15 +- modules/apps/jackett/default.nix | 7 +- modules/apps/jellyfin/default.nix | 7 +- modules/apps/jellyseerr/default.nix | 7 +- modules/apps/mariadb/default.nix | 7 +- modules/apps/mariadb/options.nix | 2 +- modules/apps/mealie/default.nix | 7 +- modules/apps/nextcloud/default-nix.nix | 161 +++++++++--------- modules/apps/nextcloud/default.nix | 6 +- modules/apps/ollama/default.nix | 7 +- modules/apps/open-webui/default.nix | 7 +- modules/apps/orca-slicer/default.nix | 7 +- modules/apps/radarr/default.nix | 7 +- modules/apps/sabnzbd/default.nix | 7 +- modules/apps/sonarr/default.nix | 7 +- modules/apps/swag/default.nix | 11 +- modules/apps/tdarr/default.nix | 7 +- modules/apps/vscode/default.nix | 7 +- modules/apps/wireguard/default.nix | 11 +- modules/samba/default.nix | 7 +- secrets/secrets.yaml | 5 +- 59 files changed, 321 insertions(+), 641 deletions(-) delete mode 100644 hosts/pi4/docker-pi4.nix diff --git a/hosts/default.nix b/hosts/default.nix index 34b7b94..5d1d63f 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,11 +1,4 @@ -{ - config, - lib, - pkgs, - inputs, - globals, - ... -}: +{ lib, pkgs, ... }: let timezone = "America/Chicago"; in @@ -99,7 +92,10 @@ in }; }; - environment.systemPackages = with pkgs; [ pinentry-curses ]; + environment.systemPackages = with pkgs; [ + nixd + pinentry-curses + ]; # users.mutableUsers = lib.mkDefault false; diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 11d424d..6f32c7b 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -43,7 +43,10 @@ in apps.discover-wrapped.enable = lib.mkDefault false; - nix.settings.trusted-users = lib.mkDefault [ "root" user ]; + nix.settings.trusted-users = lib.mkDefault [ + "root" + user + ]; services = { # Enable Desktop Environment. @@ -132,7 +135,10 @@ in user.services = { rclone-home-proton = { enable = lib.mkDefault true; - path = [ pkgs.bash pkgs.rclone ]; + path = [ + pkgs.bash + pkgs.rclone + ]; script = '' rclone sync /home/matt proton-drive:backup-nix --exclude '/home/matt/Games/**' --exclude '/home/matt/1TB/**' --exclude '/home/matt/Downloads/**' ''; @@ -140,7 +146,11 @@ in rsync-home = { enable = lib.mkDefault true; - path = [ pkgs.bash pkgs.rsync pkgs.openssh ]; + path = [ + pkgs.bash + pkgs.rsync + pkgs.openssh + ]; script = '' rsync -rtpogvPlHzs --ignore-existing --exclude={'/home/matt/Games', '/home/matt/1TB', '/home/matt/Downloads/*', '/home/matt/.cache'} -e ssh /home/matt admin@10.0.1.18:/media/nas/main/backup/desktop-nix/home ''; @@ -207,9 +217,7 @@ in wineWowPackages.waylandFull ]; - sessionVariables = lib.mkDefault { - STEAM_FORCE_DESKTOPUI_SCALING = "1"; - }; + sessionVariables = lib.mkDefault { STEAM_FORCE_DESKTOPUI_SCALING = "1"; }; }; diff --git a/hosts/desktop/cosmic/default.nix b/hosts/desktop/cosmic/default.nix index 7005fe8..980ed63 100644 --- a/hosts/desktop/cosmic/default.nix +++ b/hosts/desktop/cosmic/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { specialisation.cosmic.configuration = { services = { @@ -10,4 +10,4 @@ desktopManager.plasma6.enable = false; }; }; -} \ No newline at end of file +} diff --git a/hosts/desktop/filesystems.nix b/hosts/desktop/filesystems.nix index 1241173..1f3d97c 100644 --- a/hosts/desktop/filesystems.nix +++ b/hosts/desktop/filesystems.nix @@ -1,10 +1,4 @@ -{ - config, - lib, - outputs, - pkgs, - ... -}: +{ ... }: { fileSystems."/media/nas/backup" = { device = "//10.0.1.18/Backup"; diff --git a/hosts/desktop/gnome/default.nix b/hosts/desktop/gnome/default.nix index 9a56f08..7fde398 100644 --- a/hosts/desktop/gnome/default.nix +++ b/hosts/desktop/gnome/default.nix @@ -3,7 +3,7 @@ specialisation.gnome.configuration = { home-manager.users.matt = import ./home.nix; - + services = { xserver = { desktopManager.gnome.enable = true; @@ -37,4 +37,4 @@ # xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; }; -} \ No newline at end of file +} diff --git a/hosts/desktop/gnome/home.nix b/hosts/desktop/gnome/home.nix index eec24ba..00db773 100644 --- a/hosts/desktop/gnome/home.nix +++ b/hosts/desktop/gnome/home.nix @@ -29,4 +29,4 @@ "org/gtk/settings/file-chooser".clock-format = "12h"; }; }; -} \ No newline at end of file +} diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix index 00719d2..545a321 100644 --- a/hosts/desktop/hardware-configuration.nix +++ b/hosts/desktop/hardware-configuration.nix @@ -4,11 +4,9 @@ { config, lib, - pkgs, modulesPath, ... }: - { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 8b89c4c..7666d02 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: let shellAliases = { ll = "ls -alh"; diff --git a/hosts/desktop/hyprland/config/btop/default.nix b/hosts/desktop/hyprland/config/btop/default.nix index 182baeb..4fa243d 100644 --- a/hosts/desktop/hyprland/config/btop/default.nix +++ b/hosts/desktop/hyprland/config/btop/default.nix @@ -7,7 +7,7 @@ truecolor = true; force_tty = false; presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty"; - vim_keys = true; + vim_keys = true; rounded_corners = true; graph_symbol = "braille"; graph_symbol_cpu = "default"; @@ -68,4 +68,4 @@ log_level = "WARNING"; }; }; -} \ No newline at end of file +} diff --git a/hosts/desktop/hyprland/config/hypr/default.nix b/hosts/desktop/hyprland/config/hypr/default.nix index 17bf0b0..0d626a3 100644 --- a/hosts/desktop/hyprland/config/hypr/default.nix +++ b/hosts/desktop/hyprland/config/hypr/default.nix @@ -35,8 +35,8 @@ "$mod, E, exec, nautilus" "$mod, V, togglefloating, " "$mod, D, exec, nwg-drawer -fm nautilus -term kitty" - "$mod, P, pseudo, "# dwindle - "$mod, S, togglesplit, "# dwindle + "$mod, P, pseudo, " # dwindle + "$mod, S, togglesplit, " # dwindle "$mod SHIFT, Q, exec, hyprlock" ", PRINT, exec, hyprshot -m region --clipboard-only" "$mod,F,exec,hyprctl dispatch fullscreen active" @@ -93,7 +93,7 @@ ", mouse:274, movewindow" ]; - bindel =[ + bindel = [ ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+" ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" ]; @@ -123,11 +123,11 @@ decoration = { rounding = 10; blur = { - enabled = true; - size = 2; - passes = 2; - new_optimizations = true; - xray = false; + enabled = true; + size = 2; + passes = 2; + new_optimizations = true; + xray = false; }; drop_shadow = "yes"; shadow_range = 4; @@ -154,16 +154,16 @@ }; dwindle = { - pseudotile = "yes"; - preserve_split = "yes"; + pseudotile = "yes"; + preserve_split = "yes"; }; gestures = { - workspace_swipe = "off"; + workspace_swipe = "off"; }; misc = { - force_default_wallpaper = 0; + force_default_wallpaper = 0; }; workspace = [ @@ -203,7 +203,8 @@ "nodim, class:Remote Desktop Connection" "nomaxsize, class:Remote Desktop Connection" "minsize 3840 2160, class:Remote Desktop Connection" - ]; + ]; + windowrulev2 = [ "float, class:Vmware-view,title:VMware Horizon Client" "size 3840 2160, class:Remote Desktop Connection" @@ -250,7 +251,7 @@ follow_mouse = 1; touchpad = { - natural_scroll = "no"; + natural_scroll = "no"; }; sensitivity = 0; # -1.0 - 1.0, 0 means no modification. @@ -268,4 +269,4 @@ exec-once = [silent] steam ''; }; -} \ No newline at end of file +} diff --git a/hosts/desktop/hyprland/config/mako/default.nix b/hosts/desktop/hyprland/config/mako/default.nix index 1c91120..4775ced 100644 --- a/hosts/desktop/hyprland/config/mako/default.nix +++ b/hosts/desktop/hyprland/config/mako/default.nix @@ -18,4 +18,4 @@ borderColor = "#8aadf4"; progressColor = "over #363a4f"; }; -} \ No newline at end of file +} diff --git a/hosts/desktop/hyprland/config/waybar/default.nix b/hosts/desktop/hyprland/config/waybar/default.nix index d5f5308..f90f2ff 100644 --- a/hosts/desktop/hyprland/config/waybar/default.nix +++ b/hosts/desktop/hyprland/config/waybar/default.nix @@ -1,8 +1,8 @@ { # https://github.com/Alexays/Waybar/wiki/Module:-Hyprland - + programs.waybar = { - enable = true; + enable = true; systemd.enable = true; settings = { mainBar = { @@ -13,94 +13,94 @@ passthrough = false; gtk-layer-shell = true; height = 0; - modules-left = [ - "hyprland/workspaces" - ]; + modules-left = [ "hyprland/workspaces" ]; - modules-center = [ - "hyprland/window" - ]; + modules-center = [ "hyprland/window" ]; modules-right = [ - "tray" - "custom/updates" - "keyboard-state#capslock" - "keyboard-state#numlock" - "pulseaudio" - "pulseaudio#microphone" - "network" - "clock" - "custom/weather" + "tray" + "custom/updates" + "keyboard-state#capslock" + "keyboard-state#numlock" + "pulseaudio" + "pulseaudio#microphone" + "network" + "clock" + "custom/weather" ]; "hyprland/window" = { - format = {}; + format = { }; }; "hyprland/workspaces" = { - disable-scroll = true; - all-outputs = true; - on-click = "activate"; - persistent_workspaces = { - "1" = []; - }; + disable-scroll = true; + all-outputs = true; + on-click = "activate"; + persistent_workspaces = { + "1" = [ ]; + }; }; "custom/weather" = { - tooltip = true; - format = {}; - interval = 30; - exec = "sudo waybar-weather"; - return-type = "json"; + tooltip = true; + format = { }; + interval = 30; + exec = "sudo waybar-weather"; + return-type = "json"; }; "custom/updates" = { - tooltip = true; - format = {}; - interval = 60; - exec = "sudo waybar-updates"; - return-type = "json"; + tooltip = true; + format = { }; + interval = 60; + exec = "sudo waybar-updates"; + return-type = "json"; }; tray = { - icon-size = 16; - spacing = 10; + icon-size = 16; + spacing = 10; }; clock = { - format = "{:%I:%M %p}"; - tooltip-format = "{:%Y %B}\n{calendar}"; + format = "{:%I:%M %p}"; + tooltip-format = "{:%Y %B}\n{calendar}"; }; pulseaudio = { - format = "{icon} {volume}%"; - tooltip = false; - format-muted = " Muted"; - on-click = "pamixer -t"; - on-click-right = "pavucontrol -t 1"; - on-scroll-up = "pamixer -i 5"; - on-scroll-down = "pamixer -d 5"; - scroll-step = 5; - format-icons = { - headphone = ""; - hands-free = ""; - headset = ""; - phone = ""; - portable = ""; - car = ""; - default = ["" "" ""]; - }; + format = "{icon} {volume}%"; + tooltip = false; + format-muted = " Muted"; + on-click = "pamixer -t"; + on-click-right = "pavucontrol -t 1"; + on-scroll-up = "pamixer -i 5"; + on-scroll-down = "pamixer -d 5"; + scroll-step = 5; + format-icons = { + headphone = ""; + hands-free = ""; + headset = ""; + phone = ""; + portable = ""; + car = ""; + default = [ + "" + "" + "" + ]; + }; }; "pulseaudio#microphone" = { - format = "{format_source}"; - format-source = "🎙{volume}%"; - format-source-muted = "🎙Muted"; - on-click = "pamixer --default-source -t"; - on-click-right = "pavucontrol -t 2"; - on-scroll-up = "pamixer --default-source -i 5"; - on-scroll-down = "pamixer --default-source -d 5"; - scroll-step = 5; + format = "{format_source}"; + format-source = "🎙{volume}%"; + format-source-muted = "🎙Muted"; + on-click = "pamixer --default-source -t"; + on-click-right = "pavucontrol -t 2"; + on-scroll-up = "pamixer --default-source -i 5"; + on-scroll-down = "pamixer --default-source -d 5"; + scroll-step = 5; }; network = { @@ -299,4 +299,4 @@ } ''; }; -} \ No newline at end of file +} diff --git a/hosts/desktop/hyprland/config/wofi/default.nix b/hosts/desktop/hyprland/config/wofi/default.nix index 08abc1b..ba9106d 100644 --- a/hosts/desktop/hyprland/config/wofi/default.nix +++ b/hosts/desktop/hyprland/config/wofi/default.nix @@ -142,4 +142,4 @@ } ''; }; -} \ No newline at end of file +} diff --git a/hosts/desktop/sops.nix b/hosts/desktop/sops.nix index f8d3e86..00d3916 100644 --- a/hosts/desktop/sops.nix +++ b/hosts/desktop/sops.nix @@ -1,12 +1,10 @@ -{ - ... -}: +{ ... }: { sops.defaultSopsFile = ../../secrets/secrets.yaml; sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - sops.secrets."desktop/matt_password" = {}; + sops.secrets."desktop/matt_password" = { }; sops.secrets."desktop/matt_password".neededForUsers = true; - sops.secrets."wifi" = {}; -} \ No newline at end of file + sops.secrets."wifi" = { }; +} diff --git a/hosts/mac-nixos/configuration.nix b/hosts/mac-nixos/configuration.nix index b5c2f62..fc0c687 100644 --- a/hosts/mac-nixos/configuration.nix +++ b/hosts/mac-nixos/configuration.nix @@ -2,13 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ - config, - lib, - pkgs, - ... -}: - +{ pkgs, ... }: { imports = [ # Include the results of the hardware scan. @@ -91,7 +85,7 @@ wget ]; - environment.sessionVariables = rec { + environment.sessionVariables = { DBX_CONTAINER_MANAGER = "podman"; }; diff --git a/hosts/mac-nixos/hardware-configuration.nix b/hosts/mac-nixos/hardware-configuration.nix index 6053ddb..b617d8e 100644 --- a/hosts/mac-nixos/hardware-configuration.nix +++ b/hosts/mac-nixos/hardware-configuration.nix @@ -1,13 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: +{ lib, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; diff --git a/hosts/mac/home.nix b/hosts/mac/home.nix index ae427c5..6135d9a 100644 --- a/hosts/mac/home.nix +++ b/hosts/mac/home.nix @@ -1,9 +1,4 @@ -{ - config, - pkgs, - inputs, - ... -}: +{ ... }: { imports = [ ./trampoline-apps ]; diff --git a/hosts/nas/apps.nix b/hosts/nas/apps.nix index 224d5c0..539da52 100644 --- a/hosts/nas/apps.nix +++ b/hosts/nas/apps.nix @@ -1,17 +1,10 @@ -{ - inputs, - outputs, - config, - lib, - pkgs, - ... -}: +{ config, ... }: { nas-apps = { beszel.enable = true; beszel-agent.enable = true; - + collabora = { enable = true; environmentFiles = [ config.sops.secrets."jallen-nas/collabora".path ]; @@ -27,10 +20,10 @@ mariadb = { enable = true; - environmentFiles = [ + environmentFiles = [ config.sops.secrets."jallen-nas/mariadb/db_pass".path config.sops.secrets."jallen-nas/mariadb/root_pass".path - ]; + ]; }; mealie = { diff --git a/hosts/nas/boot.nix b/hosts/nas/boot.nix index 845d817..4cbf4ee 100644 --- a/hosts/nas/boot.nix +++ b/hosts/nas/boot.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - config, - lib, - pkgs, - ... -}: +{ pkgs, ... }: let configLimit = 5; kernel = pkgs.linuxPackages_latest; diff --git a/hosts/nas/configuration.nix b/hosts/nas/configuration.nix index c93dfc3..0e3cb93 100755 --- a/hosts/nas/configuration.nix +++ b/hosts/nas/configuration.nix @@ -3,10 +3,8 @@ # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). { - inputs, outputs, config, - lib, pkgs, ... }: @@ -62,10 +60,6 @@ in # Configure environment environment = { - # etc."nut/upsd.conf".source = /home/matt/upsd.conf; - # etc."nut/upsd.users".source = /home/matt/upsd.users; - # etc."nut/upsmon.conf".source = /home/matt/upsmon.conf; - etc.crypttab.text = '' ssd1 UUID=eff4b19c-aba7-41ab-b452-a8c6654d8754 none tpm2-device=auto ssd2 UUID=c8640e19-6cd9-49d0-a355-bac09d17ea0d none tpm2-device=auto @@ -79,7 +73,7 @@ in # List packages installed in system profile. To search, run: # $ nix search wget - sessionVariables = rec { + sessionVariables = { CACHIX_AGENT_TOKEN = "eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJlY2RjYjJiNi05YWQ4LTRiYmMtYWEwYS1mNGU5Yzk1ODM2OTMiLCJzY29wZXMiOiJhZ2VudCJ9.8SENqsNZ-UIFV4atm-cZnMT6LR08Iz_raAZi5QVsppo"; }; diff --git a/hosts/nas/filesystems.nix b/hosts/nas/filesystems.nix index 8e8979d..9d2a266 100644 --- a/hosts/nas/filesystems.nix +++ b/hosts/nas/filesystems.nix @@ -1,159 +1,102 @@ -{ - inputs, - config, - lib, - outputs, - pkgs, - ... -}: +{ ... }: let - defaultOptions = [ - "compress=zstd" - ]; + defaultOptions = [ "compress=zstd" ]; in { fileSystems."/media/nas/ssd/nix-app-data" = { device = "/dev/disk/by-uuid/09ac8b6b-e553-4cd8-ae62-8d8c17fe8b0c"; fsType = "btrfs"; - options = [ - "subvol=nix-app-data" - ] - ++ defaultOptions; + options = [ "subvol=nix-app-data" ] ++ defaultOptions; }; fileSystems."/media/nas/ssd/ssd_app_data" = { device = "/dev/disk/by-uuid/09ac8b6b-e553-4cd8-ae62-8d8c17fe8b0c"; fsType = "btrfs"; - options = [ - "subvol=ssd_app_data" - ] - ++ defaultOptions; + options = [ "subvol=ssd_app_data" ] ++ defaultOptions; }; fileSystems."/media/nas/ssd/mariadb" = { device = "/dev/disk/by-uuid/09ac8b6b-e553-4cd8-ae62-8d8c17fe8b0c"; fsType = "btrfs"; - options = [ - "subvol=mariadb" - ] - ++ defaultOptions; + options = [ "subvol=mariadb" ] ++ defaultOptions; }; fileSystems."/media/nas/ssd/VMs" = { device = "/dev/disk/by-uuid/09ac8b6b-e553-4cd8-ae62-8d8c17fe8b0c"; fsType = "btrfs"; - options = [ - "subvol=VMs" - ] - ++ defaultOptions; + options = [ "subvol=VMs" ] ++ defaultOptions; }; fileSystems."/media/nas/main/3d_printer" = { device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28"; fsType = "btrfs"; - options = [ - "subvol=3d_printer" - ] - ++ defaultOptions; + options = [ "subvol=3d_printer" ] ++ defaultOptions; }; fileSystems."/media/nas/main/backup" = { device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28"; fsType = "btrfs"; - options = [ - "subvol=backup" - ] - ++ defaultOptions; + options = [ "subvol=backup" ] ++ defaultOptions; }; fileSystems."/media/nas/main/books" = { device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28"; fsType = "btrfs"; - options = [ - "subvol=books" - ] - ++ defaultOptions; + options = [ "subvol=books" ] ++ defaultOptions; }; fileSystems."/media/nas/main/documents" = { device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28"; fsType = "btrfs"; - options = [ - "subvol=documents" - ] - ++ defaultOptions; + options = [ "subvol=documents" ] ++ defaultOptions; }; fileSystems."/media/nas/main/homeassistant" = { device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28"; fsType = "btrfs"; - options = [ - "subvol=homeassistant" - ] - ++ defaultOptions; + options = [ "subvol=homeassistant" ] ++ defaultOptions; }; fileSystems."/media/nas/main/isos" = { device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28"; fsType = "btrfs"; - options = [ - "subvol=isos" - ] - ++ defaultOptions; + options = [ "subvol=isos" ] ++ defaultOptions; }; fileSystems."/media/nas/main/movies" = { device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28"; fsType = "btrfs"; - options = [ - "subvol=movies" - ] - ++ defaultOptions; + options = [ "subvol=movies" ] ++ defaultOptions; }; fileSystems."/media/nas/main/nextcloud" = { device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28"; fsType = "btrfs"; - options = [ - "subvol=nextcloud" - ] - ++ defaultOptions; + options = [ "subvol=nextcloud" ] ++ defaultOptions; }; fileSystems."/media/nas/main/photos" = { device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28"; fsType = "btrfs"; - options = [ - "subvol=photos" - ] - ++ defaultOptions; + options = [ "subvol=photos" ] ++ defaultOptions; }; fileSystems."/media/nas/main/switch" = { device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28"; fsType = "btrfs"; - options = [ - "subvol=switch" - ] - ++ defaultOptions; + options = [ "subvol=switch" ] ++ defaultOptions; }; fileSystems."/media/nas/main/tv" = { device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28"; fsType = "btrfs"; - options = [ - "subvol=tv" - ] - ++ defaultOptions; + options = [ "subvol=tv" ] ++ defaultOptions; }; fileSystems."/media/nas/main/timemachine" = { device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28"; fsType = "btrfs"; - options = [ - "subvol=timemachine" - ] - ++ defaultOptions; + options = [ "subvol=timemachine" ] ++ defaultOptions; }; # fileSystems."/media/nas/junk/nextcloud-backup" = { diff --git a/hosts/nas/hardware-configuration.nix b/hosts/nas/hardware-configuration.nix index 31bfeff..3333ecd 100644 --- a/hosts/nas/hardware-configuration.nix +++ b/hosts/nas/hardware-configuration.nix @@ -4,7 +4,6 @@ { config, lib, - pkgs, modulesPath, ... }: @@ -88,15 +87,15 @@ ]; }; - swapDevices = [ - { - device = "/dev/disk/by-id/ata-Samsung_SSD_860_EVO_500GB_S3Z1NW0KA10457X-part2"; + swapDevices = [ + { + device = "/dev/disk/by-id/ata-Samsung_SSD_860_EVO_500GB_S3Z1NW0KA10457X-part2"; randomEncryption.enable = true; } - { - device = "/dev/disk/by-id/ata-SSD2SC240G1SA754D117-820_PNY29140000558890457"; + { + device = "/dev/disk/by-id/ata-SSD2SC240G1SA754D117-820_PNY29140000558890457"; randomEncryption.enable = true; - } + } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/hosts/nas/home.nix b/hosts/nas/home.nix index 695eded..e61061a 100644 --- a/hosts/nas/home.nix +++ b/hosts/nas/home.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { home.username = "admin"; @@ -46,33 +46,4 @@ }; programs.command-not-found.enable = true; - - home.packages = with pkgs; [ - # homepage-dashboard - ]; - - # # Configure homepage-dashboard - # home.file.".homepage-dashboard/config.json".text = '' - # { - # "modules": [ - # { - # "type": "greeting", - # "config": { - # "greetings": [ - # "Welcome to My Dashboard!" - # ] - # } - # }, - # { - # "type": "clock" - # }, - # { - # "type": "weather", - # "config": { - # "location": "St. Paul, MN" - # } - # } - # ] - # } - # ''; } diff --git a/hosts/nas/impermanence.nix b/hosts/nas/impermanence.nix index f56bf20..a7faaf4 100644 --- a/hosts/nas/impermanence.nix +++ b/hosts/nas/impermanence.nix @@ -1,12 +1,4 @@ -{ - pkgs, - lib, - LT, - config, - utils, - inputs, - ... -}@args: +{ ... }@args: { # Set up impernance configuration for things like bluetooth # In this configuration with /etc and /var/log being persistent, only directories outside of that need to be done here. See hardware configuration for all mountpoints. diff --git a/hosts/nas/networking.nix b/hosts/nas/networking.nix index f65294d..6b79b63 100644 --- a/hosts/nas/networking.nix +++ b/hosts/nas/networking.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - config, - lib, - pkgs, - ... -}: +{ config, ... }: let hostname = "jallen-nas"; ipAddress = "10.0.1.18"; @@ -65,7 +58,7 @@ in enable = true; environmentFile = config.sops.secrets."wifi".path; networks = { - "Joey's Jungle 5G" = { + "Joey's Jungle 5G" = { psk = "@PSK@"; }; }; diff --git a/hosts/nas/samba.nix b/hosts/nas/samba.nix index 8a38313..5190ceb 100644 --- a/hosts/nas/samba.nix +++ b/hosts/nas/samba.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - config, - lib, - pkgs, - ... -}: +{ ... }: { nas-samba = { enable = true; diff --git a/hosts/nas/services.nix b/hosts/nas/services.nix index 43c1153..bfc992d 100644 --- a/hosts/nas/services.nix +++ b/hosts/nas/services.nix @@ -1,11 +1,4 @@ -{ - inputs, - outputs, - config, - lib, - pkgs, - ... -}: +{ config, pkgs, ... }: let enableDisplayManager = false; hostname = "jallen-nas"; @@ -195,7 +188,10 @@ in description = "Protonmail Bridge"; enable = true; script = "${pkgs.protonmail-bridge}/bin/protonmail-bridge --noninteractive"; - path = [ pkgs.pass pkgs.protonmail-bridge ]; + path = [ + pkgs.pass + pkgs.protonmail-bridge + ]; wantedBy = [ "multi-user.target" ]; partOf = [ "multi-user.target" ]; }; @@ -204,7 +200,10 @@ in systemd.services = { rsync-ssd = { - path = [ pkgs.bash pkgs.rsync ]; + path = [ + pkgs.bash + pkgs.rsync + ]; script = '' rsync -rtpogvPlHzs --ignore-existing /media/nas/ssd /media/nas/main/backup/ssd ''; diff --git a/hosts/nas/sops.nix b/hosts/nas/sops.nix index 6a0668f..f2a117a 100644 --- a/hosts/nas/sops.nix +++ b/hosts/nas/sops.nix @@ -1,14 +1,16 @@ -{ - config, ... -}: +{ config, ... }: { sops.defaultSopsFile = ../../secrets/secrets.yaml; sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - sops.secrets."jallen-nas/admin_password" = {}; + sops.secrets."jallen-nas/admin_password" = { }; sops.secrets."jallen-nas/admin_password".neededForUsers = true; - sops.secrets."wifi" = {}; + sops.secrets."wifi" = { }; + + sops.secrets."jallen-nas/ups_password" = { + # restartUnits = [ "ups stuff lol" ]; + }; sops.secrets."jallen-nas/collabora" = { restartUnits = [ "podman-collabora.service" ]; @@ -60,4 +62,4 @@ sops.secrets."jallen-nas/nextcloud/smtppassword".mode = "0777"; # sops.secrets."jallen-nas/nextcloud/smtppassword".owner = config.users.users.nix-apps.name; # sops.secrets."jallen-nas/nextcloud/smtppassword".group = config.users.users.jallen-nas.group; -} \ No newline at end of file +} diff --git a/hosts/nas/ups.nix b/hosts/nas/ups.nix index 114a737..ddf9ed6 100644 --- a/hosts/nas/ups.nix +++ b/hosts/nas/ups.nix @@ -1,59 +1,46 @@ -{ - inputs, - outputs, - config, - lib, - pkgs, - ... -}: +{ config, ... }: let enableUps = true; - upsmonCmd = "nasups@localhost 1 upsuser BogieDudie1 primary"; - upsName = "nasups"; + upsName = "nas-ups"; + upsUser = "nas-admin"; in { power.ups = { + enable = enableUps; + openFirewall = enableUps; + mode = "netserver"; + ups = { - enable = enableUps; - mode = "netserver"; - ups.upsName = { + "${upsName}" = { + description = "NAS UPS"; driver = "usbhid-ups"; port = "auto"; - description = "NAS UPS"; }; - upsmon = { - monitor = upsmonCmd; - }; - upsd = { - enable = enableUps; - listen = { - address = 0.0 0.0 0.0; - port = 3493; - }; - }; - # users = { - # actions = [ "SET" ]; - # instcmds = [ "ALL" ]; - ##* upsmon = "primary"; - # passwordFile = "/home/matt/ups.conf"; - # }; }; - # Add UPS monitoring service + users."${upsUser}" = { + passwordFile = config.sops.secrets."jallen-nas/ups_password".path; + actions = [ "ALL" ]; + instcmds = [ "ALL" ]; + upsmon = "primary"; + }; + upsmon = { - enable = true; - # Configure UPS device - device = "/dev/usb/hiddev1"; # Change this to your UPS device - driver = "usbhid-ups"; # Change this if your UPS uses a different driver - # Set UPS monitoring options - options = { - # NOTIFYCMD = "/path/to/notify-script.sh"; # Path to your notification script - POLLFREQ = 5; - POLLFREQALERT = 5; - HOSTSYNC = "on"; - DEADTIME = 15; - FINALDELAY = 5; + enable = enableUps; + monitor."${upsName}" = { + passwordFile = config.sops.secrets."jallen-nas/ups_password".path; + user = upsUser; }; }; + + upsd = { + enable = enableUps; + listen = [ + { + address = "0.0.0.0"; + port = 3493; + } + ]; + }; }; } diff --git a/hosts/pi4/configuration.nix b/hosts/pi4/configuration.nix index 0996eb1..4b0f375 100644 --- a/hosts/pi4/configuration.nix +++ b/hosts/pi4/configuration.nix @@ -2,17 +2,12 @@ # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ - config, - lib, - pkgs, - ... -}: +{ lib, pkgs, ... }: let user = "matt"; password = "$y$j9T$EkPXmsmIMFFZ.WRrBYCxS1$P0kwo6e4.WM5DsqUcEqWC3MrZp5KfCjxffraMFZWu06"; - SSID = "Joey’s Jungle"; + SSID = "Joey's Jungle 5G"; SSIDpassword = "kR8v&3Qd"; interface = "wlan0"; timezone = "America/Chicago"; diff --git a/hosts/pi4/docker-pi4.nix b/hosts/pi4/docker-pi4.nix deleted file mode 100644 index 090e371..0000000 --- a/hosts/pi4/docker-pi4.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ config, pkgs, ... }: - -{ - - # Portainer - virtualisation.oci-containers.containers."portainer" = { - autoStart = true; - image = "portainer/portainer-ce"; - ports = [ - "8000:8000" - "9443:9443" - ]; - volumes = [ - "/var/run/docker.sock:/var/run/docker.sock" - "/media/T5/docker/config/portainer:/data" - ]; - }; - - # Jellyfin - virtualisation.oci-containers.containers."jellyfin" = { - autoStart = true; - image = "jellyfin/jellyfin"; - volumes = [ - "/media/T5/containers/jellyfin/config:/config" - "/media/T5/containers/jellyfin/cache:/cache" - "/media/T5/containers/jellyfin/log:/log" - "/media/T5/movies:/movies" - "/media/T5/tv:/tv" - ]; - ports = [ "8096:8096" ]; - environment = { - JELLYFIN_LOG_DIR = "/log"; - }; - }; -} diff --git a/hosts/pi4/hardware-configuration.nix b/hosts/pi4/hardware-configuration.nix index 71ddd68..b1e563f 100644 --- a/hosts/pi4/hardware-configuration.nix +++ b/hosts/pi4/hardware-configuration.nix @@ -1,13 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: +{ lib, modulesPath, ... }: { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; diff --git a/hosts/pi4/home.nix b/hosts/pi4/home.nix index 64da31e..c8cf279 100644 --- a/hosts/pi4/home.nix +++ b/hosts/pi4/home.nix @@ -1,7 +1,4 @@ -{ pkgs, ... }: -# let -# gnome = false; -# in +{ ... }: { home.username = "matt"; diff --git a/modules/apps/beszel-agent/default.nix b/modules/apps/beszel-agent/default.nix index 6a79558..203bae5 100644 --- a/modules/apps/beszel-agent/default.nix +++ b/modules/apps/beszel-agent/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.beszel-agent; @@ -16,9 +11,7 @@ in autoStart = cfg.autoStart; image = cfg.image; ports = [ "${cfg.port}:45876" ]; - volumes = [ - "${cfg.podmanSock}:/var/run/docker.sock:ro" - ]; + volumes = [ "${cfg.podmanSock}:/var/run/docker.sock:ro" ]; environment = { PORT = cfg.port; KEY = cfg.key; diff --git a/modules/apps/beszel-agent/options.nix b/modules/apps/beszel-agent/options.nix index 005d6b4..10f8b98 100644 --- a/modules/apps/beszel-agent/options.nix +++ b/modules/apps/beszel-agent/options.nix @@ -54,4 +54,4 @@ with lib; default = "America/Chicago"; }; }; -} \ No newline at end of file +} diff --git a/modules/apps/beszel/default.nix b/modules/apps/beszel/default.nix index e42541f..39c1fb5 100644 --- a/modules/apps/beszel/default.nix +++ b/modules/apps/beszel/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.beszel; @@ -16,9 +11,7 @@ in autoStart = cfg.autoStart; image = cfg.image; ports = [ "${cfg.httpPort}:8090" ]; - volumes = [ - "${cfg.configPath}:/beszel_data" - ]; + volumes = [ "${cfg.configPath}:/beszel_data" ]; environment = { PUID = cfg.puid; PGID = cfg.pgid; diff --git a/modules/apps/collabora/default.nix b/modules/apps/collabora/default.nix index d8497be..13e49e2 100755 --- a/modules/apps/collabora/default.nix +++ b/modules/apps/collabora/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.collabora; diff --git a/modules/apps/collabora/options.nix b/modules/apps/collabora/options.nix index 2cdf88b..74e5ee6 100755 --- a/modules/apps/collabora/options.nix +++ b/modules/apps/collabora/options.nix @@ -46,7 +46,7 @@ with lib; environmentFiles = mkOption { type = with types; listOf path; - default = []; + default = [ ]; }; dontGenSslCert = mkOption { diff --git a/modules/apps/deluge/default.nix b/modules/apps/deluge/default.nix index 1bcfb77..8be550e 100644 --- a/modules/apps/deluge/default.nix +++ b/modules/apps/deluge/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.deluge; @@ -22,15 +17,13 @@ in "${toString cfg.port3}:58846" "${toString cfg.port4}:58966" ]; - extraOptions = [ - "--cap-add=NET_ADMIN" - ]; - volumes = [ + extraOptions = [ "--cap-add=NET_ADMIN" ]; + volumes = [ "${cfg.configPath}:/config" "${cfg.moviesPath}:/data/downloads" "${cfg.tvPath}:/data/downloads-icomplete" "/etc/localtime:/etc/localtime:ro" - ]; + ]; environment = { PUID = cfg.puid; PGID = cfg.pgid; diff --git a/modules/apps/jackett/default.nix b/modules/apps/jackett/default.nix index 0b56aac..f9e7f1f 100644 --- a/modules/apps/jackett/default.nix +++ b/modules/apps/jackett/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.jackett; diff --git a/modules/apps/jellyfin/default.nix b/modules/apps/jellyfin/default.nix index 614591f..d026f85 100644 --- a/modules/apps/jellyfin/default.nix +++ b/modules/apps/jellyfin/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.jellyfin; diff --git a/modules/apps/jellyseerr/default.nix b/modules/apps/jellyseerr/default.nix index 9139832..4284476 100644 --- a/modules/apps/jellyseerr/default.nix +++ b/modules/apps/jellyseerr/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.jellyseerr; diff --git a/modules/apps/mariadb/default.nix b/modules/apps/mariadb/default.nix index 116a26b..356d5d4 100644 --- a/modules/apps/mariadb/default.nix +++ b/modules/apps/mariadb/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.mariadb; diff --git a/modules/apps/mariadb/options.nix b/modules/apps/mariadb/options.nix index b71b305..e7ace66 100644 --- a/modules/apps/mariadb/options.nix +++ b/modules/apps/mariadb/options.nix @@ -56,7 +56,7 @@ with lib; environmentFiles = mkOption { type = with types; listOf path; - default = []; + default = [ ]; }; }; } diff --git a/modules/apps/mealie/default.nix b/modules/apps/mealie/default.nix index 1763fff..64f99fa 100644 --- a/modules/apps/mealie/default.nix +++ b/modules/apps/mealie/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.mealie; diff --git a/modules/apps/nextcloud/default-nix.nix b/modules/apps/nextcloud/default-nix.nix index a11ad5e..861c3fd 100644 --- a/modules/apps/nextcloud/default-nix.nix +++ b/modules/apps/nextcloud/default-nix.nix @@ -35,89 +35,94 @@ in }; }; - config = { config, pkgs, lib, ... }: { - services = { - nextcloud = { - enable = true; - package = pkgs.nextcloud29; - datadir = "/data"; - hostName = "localhost"; - appstoreEnable = true; - caching.redis = true; - configureRedis = true; - config = { - adminuser = "mjallen"; - adminpassFile = adminpass; - dbhost = "10.0.1.18:3306"; - dbtype = "mysql"; - dbname = "jallen_nextcloud"; - dbuser = "nextcloud"; - dbpassFile = dbpass; + config = + { pkgs, lib, ... }: + { + services = { + nextcloud = { + enable = true; + package = pkgs.nextcloud29; + datadir = "/data"; + hostName = "localhost"; + appstoreEnable = true; + caching.redis = true; + configureRedis = true; + config = { + adminuser = "mjallen"; + adminpassFile = adminpass; + dbhost = "10.0.1.18:3306"; + dbtype = "mysql"; + dbname = "jallen_nextcloud"; + dbuser = "nextcloud"; + dbpassFile = dbpass; + }; + settings = { + trusted_domains = [ + "10.0.1.18:9980" + "10.0.1.18:9943" + "cloud.mjallen.dev" + ]; + trusted_proxies = [ "10.0.1.18" ]; + maintenance_window_start = 6; + default_phone_region = "US"; + mail_from_address = "matt.l.jallen"; + mail_smtpmode = "smtp"; + mail_sendmailmode = "smtp"; + mail_domain = "gmail.com"; + mail_smtpauth = 1; + mail_smtpname = "matt.l.jallen"; + mail_smtppassword = smtppassword; + mail_smtpsecure = "ssl"; + mail_smtphost = "smtp.gmail.com"; + mail_smtpport = 465; + enable_previews = true; + enabledPreviewProviders = [ + "OC\\\\Preview\\\\PNG" + "OC\\\\Preview\\\\JPEG" + "OC\\\\Preview\\\\GIF" + "OC\\\\Preview\\\\BMP" + "OC\\\\Preview\\\\XBitmap" + "OC\\\\Preview\\\\MP3" + "OC\\\\Preview\\\\TXT" + "OC\\\\Preview\\\\MarkDown" + "OC\\\\Preview\\\\OpenDocument" + "OC\\\\Preview\\\\Krita" + "OC\\\\Preview\\\\HEIC" + ]; + }; }; - settings = { - trusted_domains = [ - "10.0.1.18:9980" - "10.0.1.18:9943" - "cloud.mjallen.dev" - ]; - trusted_proxies = [ - "10.0.1.18" - ]; - maintenance_window_start = 6; - default_phone_region = "US"; - mail_from_address = "matt.l.jallen"; - mail_smtpmode = "smtp"; - mail_sendmailmode = "smtp"; - mail_domain = "gmail.com"; - mail_smtpauth = 1; - mail_smtpname = "matt.l.jallen"; - mail_smtppassword = smtppassword; - mail_smtpsecure = "ssl"; - mail_smtphost = "smtp.gmail.com"; - mail_smtpport = 465; - enable_previews = true; - enabledPreviewProviders = [ - "OC\\\\Preview\\\\PNG" - "OC\\\\Preview\\\\JPEG" - "OC\\\\Preview\\\\GIF" - "OC\\\\Preview\\\\BMP" - "OC\\\\Preview\\\\XBitmap" - "OC\\\\Preview\\\\MP3" - "OC\\\\Preview\\\\TXT" - "OC\\\\Preview\\\\MarkDown" - "OC\\\\Preview\\\\OpenDocument" - "OC\\\\Preview\\\\Krita" - "OC\\\\Preview\\\\HEIC" - ]; - }; - }; - nginx = { - enable = true; - virtualHosts = { - "nextcloud-container.local" = { - # Change this to the desired port number - listen = [{ addr = "0.0.0.0"; port = 9943; }]; - - root = "/var/www/nextcloud"; - - # You may need to adjust other options for your specific setup + nginx = { + enable = true; + virtualHosts = { + "nextcloud-container.local" = { + # Change this to the desired port number + listen = [ + { + addr = "0.0.0.0"; + port = 9943; + } + ]; + + root = "/var/www/nextcloud"; + + # You may need to adjust other options for your specific setup + }; }; }; }; - }; - system.stateVersion = "23.11"; - networking = { - firewall = { - enable = true; - allowedTCPPorts = [ 9943 ]; + system.stateVersion = "23.11"; + networking = { + firewall = { + enable = true; + allowedTCPPorts = [ 9943 ]; + }; + # Use systemd-resolved inside the container + # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686 + useHostResolvConf = lib.mkForce false; }; - # Use systemd-resolved inside the container - # Workaround for bug https://github.com/NixOS/nixpkgs/issues/162686 - useHostResolvConf = lib.mkForce false; - }; - services.resolved.enable = true; + services.resolved.enable = true; - }; + }; }; -} \ No newline at end of file +} diff --git a/modules/apps/nextcloud/default.nix b/modules/apps/nextcloud/default.nix index bf93257..74a0890 100644 --- a/modules/apps/nextcloud/default.nix +++ b/modules/apps/nextcloud/default.nix @@ -1,8 +1,4 @@ -{ - lib, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.nextcloud; diff --git a/modules/apps/ollama/default.nix b/modules/apps/ollama/default.nix index 5e4c41d..f9c479d 100644 --- a/modules/apps/ollama/default.nix +++ b/modules/apps/ollama/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.ollama; diff --git a/modules/apps/open-webui/default.nix b/modules/apps/open-webui/default.nix index 192a374..35df6b6 100644 --- a/modules/apps/open-webui/default.nix +++ b/modules/apps/open-webui/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.open-webui; diff --git a/modules/apps/orca-slicer/default.nix b/modules/apps/orca-slicer/default.nix index e6fc881..29bc443 100644 --- a/modules/apps/orca-slicer/default.nix +++ b/modules/apps/orca-slicer/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.orca-slicer; diff --git a/modules/apps/radarr/default.nix b/modules/apps/radarr/default.nix index f2f0a97..ffdd619 100644 --- a/modules/apps/radarr/default.nix +++ b/modules/apps/radarr/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.radarr; diff --git a/modules/apps/sabnzbd/default.nix b/modules/apps/sabnzbd/default.nix index 8bec8a9..4a8f4b3 100644 --- a/modules/apps/sabnzbd/default.nix +++ b/modules/apps/sabnzbd/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.sabnzbd; diff --git a/modules/apps/sonarr/default.nix b/modules/apps/sonarr/default.nix index ae9802c..ba795d2 100644 --- a/modules/apps/sonarr/default.nix +++ b/modules/apps/sonarr/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.sonarr; diff --git a/modules/apps/swag/default.nix b/modules/apps/swag/default.nix index cf529f2..0d9598d 100644 --- a/modules/apps/swag/default.nix +++ b/modules/apps/swag/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.swag; @@ -34,9 +29,7 @@ in "${toString cfg.httpsPort}:443" "81:81" ]; - extraOptions = [ - "--cap-add=NET_ADMIN" - ]; + extraOptions = [ "--cap-add=NET_ADMIN" ]; volumes = [ "${cfg.configPath}:/config" ]; environment = { PUID = cfg.puid; diff --git a/modules/apps/tdarr/default.nix b/modules/apps/tdarr/default.nix index 9f6dea7..ff19578 100644 --- a/modules/apps/tdarr/default.nix +++ b/modules/apps/tdarr/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.tdarr; diff --git a/modules/apps/vscode/default.nix b/modules/apps/vscode/default.nix index 4a13cee..726c217 100644 --- a/modules/apps/vscode/default.nix +++ b/modules/apps/vscode/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.vscode; diff --git a/modules/apps/wireguard/default.nix b/modules/apps/wireguard/default.nix index 4c1a07a..1dbe027 100644 --- a/modules/apps/wireguard/default.nix +++ b/modules/apps/wireguard/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-apps.wireguard; @@ -20,9 +15,7 @@ in "--cap-add=NET_ADMIN" "--sysctl=\"net.ipv4.conf.all.src_valid_mark=1\"" ]; - volumes = [ - "${cfg.configPath}:/config" - ]; + volumes = [ "${cfg.configPath}:/config" ]; environment = { PUID = cfg.puid; PGID = cfg.pgid; diff --git a/modules/samba/default.nix b/modules/samba/default.nix index 777ca2f..33fe874 100644 --- a/modules/samba/default.nix +++ b/modules/samba/default.nix @@ -1,9 +1,4 @@ -{ - lib, - pkgs, - config, - ... -}: +{ lib, config, ... }: with lib; let cfg = config.nas-samba; diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 685dece..25fc9c7 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -2,6 +2,7 @@ wifi: ENC[AES256_GCM,data:Rs+4Km4DogO7XatA,iv:JUv9HkNWsv/l4Fli5sFeUeYuWG1Yju95G59FJ/Q5W50=,tag:gRFCG4d5OBMRx1QayRV8Zg==,type:str] jallen-nas: admin_password: ENC[AES256_GCM,data:RGb0UQkLhqfBWflIc5r8yWgYvc0EZuM49uhnXH1r6o9d7Ya7eAoTn2DHdWmYnd9/LpTXPmLF07Nf8s1+/odYx8RBmaji56yWbQ==,iv:dGlvZtZFB8jsI33Qkmmb3iHTXqpVWfbd0EfNK0uX3i4=,tag:z6THeY0UmG64VwOdwnL/AA==,type:str] + ups_password: ENC[AES256_GCM,data:yHCwM7XbbhQZwxE=,iv:m4dD6VlrplHbZB5hnV1fk5N8IOsc+fA5qhTcrqiTxDM=,tag:41EaB9z2jlNTfPw5wlWQ3g==,type:str] collabora: ENC[AES256_GCM,data:A01H7FzgSplAEn0dsENgllyWza4=,iv:L9bPHKdeIHn7caYn78XOkdmuSk1RIuSVcIW5HFQL8PY=,tag:h0kiClGAwGB6iP327flWew==,type:str] mariadb: root_pass: ENC[AES256_GCM,data:YLPfEG4/6FeCnrKdfXv9z4hHwtpM/KtBCYqlm4IUvA==,iv:pc9Ljasy76bfkmFRJ4M+wfEtjXBUD7Kb0S0WQZhCmOs=,tag:Wk/7gpKidirhRqw4+Pu96g==,type:str] @@ -46,8 +47,8 @@ sops: UGhsN2N0Mjl3UEJvUVlGRlJiN05WaUkKW37lU4G4CLTo6JoHC2OyhKsG/FuO+BiN pzlVJwzRnmAqwklRbc6RMbQLl2EQrp6KQcgYsUxCMH9OQ/9WJ98dxQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-08-08T02:00:25Z" - mac: ENC[AES256_GCM,data:IVfBgo6DeJ4WPwF5Uzol1F/ORaWehP6Ax5NvBInQAelHV3wLWIwj+BnPqtJfWIHdUxNqPZCOmEjZ4DskYRAvxWvF+GyOJZ34tkxBMkASl76l9OmCf2KZtGERyUI+JmDh3qJ1K6KP6Mc/3p0xketrndm1mz42lc42VsL6Id2NUcY=,iv:+XiyBL5slouhfK4iOhS51IoWthdsEZ6HYJd8nHlCLT4=,tag:jZ2ISWYE/aA0OF6IORgVZQ==,type:str] + lastmodified: "2024-08-23T16:35:44Z" + mac: ENC[AES256_GCM,data:gVu0zOwEB/Mup8fXdlFxg8qRMHULMmQeDAsoFw8dlZpFe2IOAHOdemiV1T4oVhhZ78Or+c4PHO0a0M1piscLoHeAVnwPURe5t8tu+8BlwmKRu0+B618ekMXnDs8OYeNvRkA0DcsBr7lF08dbVSLdjfOqrT72XIuCm8XWnPnLPyE=,iv:MoThEq02i+G4BFbHzi6B2QgF7o0TlX3Ew1pB9SUaBRc=,tag:11/5WaAfx9731mo07Vi/ZQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.0