sam/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'development'

Browse source
This commit is contained in:
Sam 2025-03-04 11:02:15 +00:00
commit cbf6536617
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hosts/common/optional/docker-containers/jellyfin.nix
View file

@ -19,7 +19,6 @@
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "1000"; PGID = "1000";
DOCKER_MODS = "linuxserver/mods:jellyfin-opencl-intel";
NVIDIA_VISIBLE_DEVICES = "all"; NVIDIA_VISIBLE_DEVICES = "all";
}; };
extraOptions = [ extraOptions = [

2
hosts/common/optional/nixos-containers/pihole.nix
View file

@ -83,6 +83,8 @@ in {
pkgs.podman-compose pkgs.podman-compose
]; ];
services.tailscale.enable = true;
virtualisation = { virtualisation = {
podman = { podman = {
enable = true; enable = true;

4
hosts/merlin/default.nix
View file

@ -4,6 +4,7 @@
lib, lib,
config, config,
outputs, outputs,
pkgs,
... ...
}: let }: let
fsType = "btrfs"; # one of ext4 or btrfs. Use btrfs if using impermanence fsType = "btrfs"; # one of ext4 or btrfs. Use btrfs if using impermanence
@ -74,6 +75,7 @@ in {
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
timeout = 3; timeout = 3;
}; };
kernelPackages = pkgs.linuxKernel.packages.linux_6_12;
}; };
fileSystems."/mnt/main-ssd" = { fileSystems."/mnt/main-ssd" = {
@ -175,10 +177,12 @@ in {
}; };
}; };
# zfs config
boot.supportedFilesystems = ["zfs"]; boot.supportedFilesystems = ["zfs"];
boot.zfs.forceImportRoot = false; boot.zfs.forceImportRoot = false;
networking.hostId = "18aec5d7"; networking.hostId = "18aec5d7";
boot.zfs.extraPools = ["deepzfs" "nvme-zpool"]; boot.zfs.extraPools = ["deepzfs" "nvme-zpool"];
boot.zfs.package = pkgs.zfs_2_3;
services.libinput.enable = true; services.libinput.enable = true;
} }