oh boy, disko, updates, etc

This commit is contained in:
mjallen18
2025-05-14 13:20:20 -05:00
parent e16e0e82e5
commit 7bdf93a58c
13 changed files with 359 additions and 103 deletions

View File

@@ -13,7 +13,7 @@ in
enable = true;
configurationLimit = 5;
extraInstallCommands = ''
${pkgs.uutils-coreutils}/bin/echo "timeout 0
${pkgs.uutils-coreutils}/bin/uutils-echo "timeout 0
console-mode 1
default nixos-*" > /boot/loader/loader.conf
'';

View File

@@ -10,7 +10,7 @@
../default.nix
./boot.nix
./jovian.nix
./hardware-configuration.nix
# ./hardware-configuration.nix
];
nixpkgs.config.allowUnfree = true;
@@ -110,7 +110,7 @@
];
nix-index = {
enable = true;
enableBashIntegration = true;
enableBashIntegration = false;
enableZshIntegration = true;
};
};

View File

@@ -156,6 +156,7 @@ in
uutils-coreutils
uutils-diffutils
uutils-findutils
coreutils
update-script
nixd
pinentry-curses

View File

@@ -12,6 +12,7 @@
./apps/lubelogger
./apps/nextcloud
./apps/ollama
./apps/orca
./apps/paperless
./apps/traefik
./apps/wyoming
@@ -23,6 +24,12 @@
manyfold.enable = true;
orca-slicer = {
enable = true;
httpPort = "3100";
httpsPort = "3101";
};
tdarr.enable = true;
};
}

View File

@@ -0,0 +1,30 @@
{
lib,
pkgs,
config,
...
}:
with lib;
let
cfg = config.nas-apps.orca-slicer;
in
{
imports = [ ./options.nix ];
config = mkIf cfg.enable {
virtualisation.oci-containers.containers."${cfg.name}" = {
autoStart = cfg.autoStart;
image = cfg.image;
ports = [
"${cfg.httpPort}:3000"
"${cfg.httpsPort}:3001"
];
volumes = [ "${cfg.configPath}:/config" ];
environment = {
PUID = cfg.puid;
PGID = cfg.pgid;
TZ = cfg.timeZone;
};
};
};
}

View File

@@ -0,0 +1,57 @@
{ lib, ... }:
with lib;
{
options.nas-apps.orca-slicer = {
enable = mkEnableOption "orca slicer docker service";
autoStart = mkOption {
type = types.bool;
default = true;
};
httpPort = mkOption {
type = types.str;
default = "3000";
};
httpsPort = mkOption {
type = types.str;
default = "3001";
};
name = mkOption {
type = types.str;
default = "orca-slicer";
};
image = mkOption {
type = types.str;
default = "linuxserver/orcaslicer";
};
configPath = mkOption {
type = types.str;
default = "/media/nas/ssd/ssd_app_data/orca-slicer";
};
dataPath = mkOption {
type = types.str;
default = "/media/nas/main/3d_printer";
};
puid = mkOption {
type = types.str;
default = "911";
};
pgid = mkOption {
type = types.str;
default = "1000";
};
timeZone = mkOption {
type = types.str;
default = "America/Chicago";
};
};
}

View File

@@ -119,7 +119,7 @@
};
nix-index = {
enable = true;
enableBashIntegration = true;
enableBashIntegration = false;
enableZshIntegration = true;
};
};

View File

@@ -13,7 +13,8 @@ in
./adguard.nix
./boot.nix
./impermanence.nix
./hardware-configuration.nix
# ./hardware-configuration.nix
# ../../share/disko/default-hardware-config.nix
./networking.nix
./sops.nix
../default.nix