mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

temp commit lol

Browse Source
This commit is contained in:
mjallen18
2024-06-29 11:34:17 -05:00
parent c3767fd666
commit e74020a8ce
28 changed files with 293 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
flake.lock generated
View File

@@ -11,11 +11,11 @@
"yafas": "yafas"
},
"locked": {
"lastModified": 1718993733,
"narHash": "sha256-Ww0NQoZ/kUVMuV/alkkj1mv2rU5OBHvAu+qhAETXfc4=",
"lastModified": 1719337945,
"narHash": "sha256-huUuEiHzpqex8wiREzXpi8nose3zSFQebOH+eFCIvRQ=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "3e5fc61611c1ce8f84d4ea326799f7c773723652",
"rev": "ea7cff23f3f25e1c6958f29f9aa623234a55d52c",
"type": "github"
},
"original": {
@@ -227,11 +227,11 @@
]
},
"locked": {
"lastModified": 1718788307,
"narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=",
"lastModified": 1719180626,
"narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca",
"rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
"type": "github"
},
"original": {
@@ -268,11 +268,11 @@
]
},
"locked": {
"lastModified": 1719037157,
"narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=",
"lastModified": 1719438532,
"narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511",
"rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9",
"type": "github"
},
"original": {
@@ -283,11 +283,11 @@
},
"impermanence": {
"locked": {
"lastModified": 1719067779,
"narHash": "sha256-c8UPWKErzLtukeZ2xdyeZZTkEtg7cP8ApvMgYvjT1ss=",
"lastModified": 1719091691,
"narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "363b3e8622e964a96db90ab6430ddcc338212e79",
"rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
"type": "github"
},
"original": {
@@ -305,11 +305,11 @@
]
},
"locked": {
"lastModified": 1718977552,
"narHash": "sha256-kyilmbeCDdHFxup6L0UKvxyZ9T2lhy2vRNv0yeqh5j4=",
"lastModified": 1719292813,
"narHash": "sha256-6w/buoRKo4ijH9O4D/0KjNtiWjtrJebuV7djTEEa0+k=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "a7a9774538612c75324f785ab1300e67abc039d3",
"rev": "d6222e7818aa5528f8369afe84bc53556a57c329",
"type": "github"
},
"original": {
@@ -393,11 +393,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1718662658,
"narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=",
"lastModified": 1719128254,
"narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "29b3096a6e283d7e6779187244cb2a3942239fdf",
"rev": "50581970f37f06a4719001735828519925ef8310",
"type": "github"
},
"original": {
@@ -486,11 +486,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1719069430,
"narHash": "sha256-d9KzCJv3UG6nX9Aur5OSEf4Uj+ywuxojhiCiRKYVzXA=",
"lastModified": 1719487696,
"narHash": "sha256-pCsl9qFCuIuhIfGH03CiBOsy1LNwITC6VMb6/5tz+Qc=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "e8232c132a95ddc62df9d404120ad4ff53862910",
"rev": "14aadcba1a26c8c142453839f888afd0db8b2041",
"type": "github"
},
"original": {
@@ -502,11 +502,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1718895438,
"narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
"lastModified": 1719075281,
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
"type": "github"
},
"original": {
@@ -534,11 +534,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1718835956,
"narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=",
"lastModified": 1719426051,
"narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
"rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd",
"type": "github"
},
"original": {
@@ -550,11 +550,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1718895438,
"narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
"lastModified": 1719254875,
"narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
"rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
"type": "github"
},
"original": {

4
flake.nix
View File

@@ -91,14 +91,14 @@
};
# NAS
"jallen-nas" = nixpkgs-stable.lib.nixosSystem {
"jallen-nas" = nixpkgs-unstable.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = {
inherit inputs outputs;
};
modules = [
./hosts/nas/configuration.nix
home-manager-stable.nixosModules.home-manager
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;

8
hosts/default.nix
View File

@@ -98,6 +98,14 @@ in
# Security config
security = {
wrappers."mount.nfs" = {
setuid = true;
owner = "root";
group = "root";
source = "${pkgs.nfs-utils.out}/bin/mount.nfs";
};
rtkit.enable = lib.mkDefault true;
# configure sudo

12
hosts/desktop/configuration.nix
View File

@@ -46,13 +46,6 @@ in
apps.discover-wrapped.enable = plasma;
# chaotic = {
# nyx.cache.enable = true;
# nyx.overlay.enable = true;
# mesa-git.enable = true;
# hdr.enable = false;
# };
# Configure bootloader with lanzaboot and secureboot
boot = {
loader = {
@@ -107,8 +100,6 @@ in
defaultSession = if plasma then "plasma" else "gnome";
};
# displayManager.gdm.enable = gnome;
# desktopManager.gnome.enable = gnome;
desktopManager.plasma6.enable = plasma;
# enable auto discovery of printers
@@ -174,8 +165,6 @@ in
borgbackup
clinfo
efibootmgr
# fishPlugins.bass
# fishPlugins.sponge
gparted
kmod
lact
@@ -192,6 +181,7 @@ in
# native wayland support (unstable)
wineWowPackages.waylandFull
];
sessionVariables = {
STEAM_FORCE_DESKTOPUI_SCALING = "1";
};

2
hosts/desktop/home.nix
View File

@@ -57,6 +57,7 @@
# gamescope # using chaotic git version
# gamescope-wsi # using chaotic git version
deadnix
fastfetch
firefox
freerdp
gamescope_git
@@ -72,7 +73,6 @@
lutris
mangohud
morph
neofetch
nixfmt-rfc-style
orca-slicer
papirus-icon-theme

240
hosts/nas/configuration.nix
View File

@@ -91,34 +91,34 @@ in
enable = true;
hostsAllow = "10.0.1.";
enableTimeMachine = true;
timeMachinePath = "/home/admin/mainpool/TimeMachine";
timeMachinePath = "/media/nas/main/timemachine";
shares = {
"3d_printer" = {
public = true;
sharePath = "/home/admin/mainpool/3d_printer";
sharePath = "/media/nas/main/3d_printer";
};
Backup = {
public = true;
sharePath = "/home/admin/mainpool/Backup";
sharePath = "/media/nas/main/backup";
};
Documents = {
public = true;
sharePath = "/home/admin/mainpool/Documents";
sharePath = "/media/nas/main/documents";
};
isos = {
public = true;
sharePath = "/home/admin/mainpool/isos";
sharePath = "/media/nas/main/isos";
};
TimeMachine = {
public = false;
sharePath = "/home/admin/mainpool/TimeMachine";
sharePath = "/media/nas/main/timemachine";
enableTimeMachine = true;
timeMachineMaxSize = "1T";
};
app_data = {
public = true;
sharePath = "/home/admin/ssd/ssd_app_data";
sharePath = "/media/nas/ssd/ssd_app_data";
};
nix-config = {
public = true;
@@ -129,7 +129,7 @@ in
share.hardware.nvidia = {
enable = true;
enableBeta = true;
enableBeta = false;
nvidiaSettings = true;
enableNvidiaDocker = true;
};
@@ -149,7 +149,7 @@ in
};
# Override kernel to latest
kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [
"nohibernate"
@@ -161,8 +161,8 @@ in
supportedFilesystems = [ "zfs" ];
zfs.extraPools = [ "junk" "MainPool" "SSD" ];
zfs.requestEncryptionCredentials = false;
# zfs.extraPools = [ "junk" ];
# zfs.requestEncryptionCredentials = false;
};
security.tpm2 = {
@@ -235,7 +235,7 @@ in
serve_from_sub_path = true;
http_addr = "";
};
dataDir = "/home/admin/ssd/nix-app-data/grafana";
dataDir = "/media/nas/ssd/nix-app-data/grafana";
};
prometheus = {
@@ -286,33 +286,33 @@ in
};
systemd.services = {
nas-mounts = {
path = [
pkgs.zfs
pkgs.bash
pkgs.tpm2-tools
];
# nas-mounts = {
# path = [
# pkgs.zfs
# pkgs.bash
# pkgs.tpm2-tools
# ];
wantedBy = [ "multi-user.target" ];
# wantedBy = [ "multi-user.target" ];
script = ''
tpm2_nvread 0x1500016 -C o -s 65 > /tmp/mainpool
tpm2_nvread 0x1600016 -C o -s 65 > /tmp/ssd
# script = ''
# tpm2_nvread 0x1500016 -C o -s 65 > /tmp/mainpool
# tpm2_nvread 0x1600016 -C o -s 65 > /tmp/ssd
zfs load-key -L file:///tmp/mainpool "MainPool"
zfs load-key -L file:///tmp/ssd "SSD"
# zfs load-key -L file:///tmp/mainpool "MainPool"
# zfs load-key -L file:///tmp/ssd "SSD"
rm /tmp/mainpool
rm /tmp/ssd
'';
# rm /tmp/mainpool
# rm /tmp/ssd
# '';
description = "Unlock ZFS pool using fTPM";
requires = [ "zfs-import-MainPool.service" "zfs-import-SSD.service" ];
after = [ "zfs-import-MainPool.service" "zfs-import-SSD.service" ];
before = [ "zfs-mount.service" ];
serviceConfig.Type = "oneshot";
serviceConfig.RemainAfterExit = true;
};
# description = "Unlock ZFS pool using fTPM";
# requires = [ "zfs-import-MainPool.service" "zfs-import-SSD.service" ];
# after = [ "zfs-import-MainPool.service" "zfs-import-SSD.service" ];
# before = [ "zfs-mount.service" ];
# serviceConfig.Type = "oneshot";
# serviceConfig.RemainAfterExit = true;
# };
glances-server = {
path = [
@@ -368,6 +368,17 @@ in
# 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
hdd1 UUID=8d7dd657-d9b0-47ed-97e1-a9d1eba12b56 none tpm2-device=auto
hdd2 UUID=11ee92b0-6334-4be7-bb2d-d85f5a3f51a6 none tpm2-device=auto
hdd3 UUID=4463ea6f-3fcf-4e49-80c8-ba7f424471f0 none tpm2-device=auto
hdd4 UUID=13fe7737-b72b-4d5f-a79d-1ca0d438f8f0 none tpm2-device=auto
hdd5 UUID=11ee92b0-6334-4be7-bb2d-d85f5a3f51a6 none tpm2-device=auto
'';
# List packages installed in system profile. To search, run:
# $ nix search wget
@@ -404,6 +415,9 @@ in
unstable.gpt4all
lm_sensors
htop
tpm2-tools
tpm2-tss
cryptsetup
];
};
@@ -502,7 +516,7 @@ in
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTBMydhOc6SnOdB5WrEd7X07DrboAtagCUgXiOJjLov matt@matt-nixos"
];
packages = with pkgs; [
neofetch
fastfetch
git
parted
aspell
@@ -512,8 +526,6 @@ in
aha
papirus-icon-theme
firefox
tpm2-tools
tpm2-tss
];
};
@@ -551,6 +563,160 @@ in
libvirtd.enable = true;
};
fileSystems."/media/nas/ssd/nix-app-data" = {
device = "/dev/disk/by-uuid/09ac8b6b-e553-4cd8-ae62-8d8c17fe8b0c";
fsType = "btrfs";
options = [
"subvol=nix-app-data"
"compress=zstd"
];
};
fileSystems."/media/nas/ssd/ssd_app_data" = {
device = "/dev/disk/by-uuid/09ac8b6b-e553-4cd8-ae62-8d8c17fe8b0c";
fsType = "btrfs";
options = [
"subvol=ssd_app_data"
"compress=zstd"
];
};
fileSystems."/media/nas/ssd/mariadb" = {
device = "/dev/disk/by-uuid/09ac8b6b-e553-4cd8-ae62-8d8c17fe8b0c";
fsType = "btrfs";
options = [
"subvol=mariadb"
"compress=zstd"
];
};
fileSystems."/media/nas/ssd/VMs" = {
device = "/dev/disk/by-uuid/09ac8b6b-e553-4cd8-ae62-8d8c17fe8b0c";
fsType = "btrfs";
options = [
"subvol=VMs"
"compress=zstd"
];
};
fileSystems."/media/nas/main/3d_printer" = {
device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
fsType = "btrfs";
options = [
"subvol=3d_printer"
"compress=zstd"
];
};
fileSystems."/media/nas/main/backup" = {
device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
fsType = "btrfs";
options = [
"subvol=backup"
"compress=zstd"
];
};
fileSystems."/media/nas/main/books" = {
device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
fsType = "btrfs";
options = [
"subvol=books"
"compress=zstd"
];
};
fileSystems."/media/nas/main/documents" = {
device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
fsType = "btrfs";
options = [
"subvol=documents"
"compress=zstd"
];
};
fileSystems."/media/nas/main/homeassistant" = {
device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
fsType = "btrfs";
options = [
"subvol=homeassistant"
"compress=zstd"
];
};
fileSystems."/media/nas/main/isos" = {
device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
fsType = "btrfs";
options = [
"subvol=isos"
"compress=zstd"
];
};
fileSystems."/media/nas/main/movies" = {
device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
fsType = "btrfs";
options = [
"subvol=movies"
"compress=zstd"
];
};
fileSystems."/media/nas/main/nextcloud" = {
device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
fsType = "btrfs";
options = [
"subvol=nextcloud"
"compress=zstd"
];
};
fileSystems."/media/nas/main/photos" = {
device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
fsType = "btrfs";
options = [
"subvol=photos"
"compress=zstd"
];
};
fileSystems."/media/nas/main/switch" = {
device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
fsType = "btrfs";
options = [
"subvol=switch"
"compress=zstd"
];
};
fileSystems."/media/nas/main/tv" = {
device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
fsType = "btrfs";
options = [
"subvol=tv"
"compress=zstd"
];
};
fileSystems."/media/nas/main/timemachine" = {
device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
fsType = "btrfs";
options = [
"subvol=timemachine"
"compress=zstd"
];
};
fileSystems."/media/nas/main/vms" = {
device = "/dev/disk/by-uuid/76e7cd98-3145-4cff-b78d-bab0206aae28";
fsType = "btrfs";
options = [
"subvol=vms"
"compress=zstd"
];
};
# This option defines the first version of NixOS you have installed on this particular machine,
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
#

2
modules/apps/dashy/default.nix
View File

@@ -6,7 +6,7 @@
# image = " lissy93/dashy:latest";
# ports = [ "8888:80" ];
# volumes = [
# "/home/admin/ssd/nix-app-data/dashy/conf.yaml:/app/public/conf.yaml"
# "/media/nas/ssd/nix-app-data/dashy/conf.yaml:/app/public/conf.yaml"
# ];
# environment = {
# PUID = "911";

6
modules/apps/deluge/options.nix
View File

@@ -21,17 +21,17 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/nix-app-data/deluge";
default = "/media/nas/ssd/nix-app-data/deluge";
};
moviesPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/downloads";
default = "/media/nas/ssd/ssd_app_data/downloads";
};
tvPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/downloads-incomplete";
default = "/media/nas/ssd/ssd_app_data/downloads-incomplete";
};
puid = mkOption {

2
modules/apps/homarr/options.nix
View File

@@ -26,7 +26,7 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/homarr";
default = "/media/nas/ssd/ssd_app_data/homarr";
};
puid = mkOption {

2
modules/apps/homepage/options.nix
View File

@@ -26,7 +26,7 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/homepage";
default = "/media/nas/ssd/ssd_app_data/homepage";
};
puid = mkOption {

4
modules/apps/jackett/options.nix
View File

@@ -26,12 +26,12 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/nix-app-data/jackett";
default = "/media/nas/ssd/nix-app-data/jackett";
};
downloadsPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/downloads";
default = "/media/nas/ssd/ssd_app_data/downloads";
};
puid = mkOption {

6
modules/apps/jellyfin/options.nix
View File

@@ -26,17 +26,17 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/nix-app-data/jellyfin";
default = "/media/nas/ssd/nix-app-data/jellyfin";
};
moviesPath = mkOption {
type = types.str;
default = "/home/admin/mainpool/Movies";
default = "/media/nas/main/movies";
};
tvPath = mkOption {
type = types.str;
default = "/home/admin/mainpool/TV";
default = "/media/nas/main/tv";
};
puid = mkOption {

2
modules/apps/jellyseerr/options.nix
View File

@@ -26,7 +26,7 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/jellyseerr";
default = "/media/nas/ssd/ssd_app_data/jellyseerr";
};
puid = mkOption {

2
modules/apps/mariadb/options.nix
View File

@@ -26,7 +26,7 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/mariadb";
default = "/media/nas/ssd/mariadb";
};
puid = mkOption {

4
modules/apps/nextcloud/options.nix
View File

@@ -31,12 +31,12 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/nextcloud";
default = "/media/nas/ssd/ssd_app_data/nextcloud";
};
dataPath = mkOption {
type = types.str;
default = "/home/admin/mainpool/Nextcloud";
default = "/media/nas/main/nextcloud";
};
puid = mkOption {

2
modules/apps/ollama/options.nix
View File

@@ -26,7 +26,7 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/nix-app-data/ollama";
default = "/media/nas/ssd/nix-app-data/ollama";
};
puid = mkOption {

4
modules/apps/open-webui/options.nix
View File

@@ -26,12 +26,12 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/nix-app-data/open-webui";
default = "/media/nas/ssd/nix-app-data/open-webui";
};
ollamaPath = mkOption {
type = types.str;
default = "/home/admin/ssd/nix-app-data/ollama";
default = "/media/nas/ssd/nix-app-data/ollama";
};
puid = mkOption {

2
modules/apps/orca-slicer/options.nix
View File

@@ -31,7 +31,7 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/orca-slicer";
default = "/media/nas/ssd/ssd_app_data/orca-slicer";
};
puid = mkOption {

4
modules/apps/puter/options.nix
View File

@@ -26,12 +26,12 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/puter/config";
default = "/media/nas/ssd/ssd_app_data/puter/config";
};
dataPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/puter/data";
default = "/media/nas/ssd/ssd_app_data/puter/data";
};
puid = mkOption {

6
modules/apps/radarr/options.nix
View File

@@ -26,17 +26,17 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/radarr";
default = "/media/nas/ssd/ssd_app_data/radarr";
};
moviesPath = mkOption {
type = types.str;
default = "/home/admin/mainpool/Movies";
default = "/media/nas/main/movies";
};
downloadsPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/downloads";
default = "/media/nas/ssd/ssd_app_data/downloads";
};
puid = mkOption {

10
modules/apps/sabnzbd/options.nix
View File

@@ -26,27 +26,27 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/sabnzbd";
default = "/media/nas/ssd/ssd_app_data/sabnzbd";
};
moviesPath = mkOption {
type = types.str;
default = "/home/admin/mainpool/Movies";
default = "/media/nas/main/movies";
};
tvPath = mkOption {
type = types.str;
default = "/home/admin/mainpool/TV";
default = "/media/nas/main/tv";
};
downloadsPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/downloads";
default = "/media/nas/ssd/ssd_app_data/downloads";
};
downloadsIncompletePath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/downloads-incomplete";
default = "/media/nas/ssd/ssd_app_data/downloads-incomplete";
};
puid = mkOption {

6
modules/apps/sonarr/options.nix
View File

@@ -26,17 +26,17 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/sonarr";
default = "/media/nas/ssd/ssd_app_data/sonarr";
};
tvPath = mkOption {
type = types.str;
default = "/home/admin/mainpool/TV";
default = "/media/nas/main/tv";
};
downloadsPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/downloads";
default = "/media/nas/ssd/ssd_app_data/downloads";
};
puid = mkOption {

2
modules/apps/swag/options.nix
View File

@@ -31,7 +31,7 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/swag";
default = "/media/nas/ssd/ssd_app_data/swag";
};
puid = mkOption {

12
modules/apps/tdarr/options.nix
View File

@@ -31,32 +31,32 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/nix-app-data/tdarr/config";
default = "/media/nas/ssd/nix-app-data/tdarr/config";
};
serverPath = mkOption {
type = types.str;
default = "/home/admin/ssd/nix-app-data/tdarr/server";
default = "/media/nas/ssd/nix-app-data/tdarr/server";
};
logPath = mkOption {
type = types.str;
default = "/home/admin/ssd/nix-app-data/tdarr/logs";
default = "/media/nas/ssd/nix-app-data/tdarr/logs";
};
transcodePath = mkOption {
type = types.str;
default = "/home/admin/ssd/nix-app-data/tdarr/transcode";
default = "/media/nas/ssd/nix-app-data/tdarr/transcode";
};
moviesPath = mkOption {
type = types.str;
default = "/home/admin/mainpool/Movies";
default = "/media/nas/main/movies";
};
tvPath = mkOption {
type = types.str;
default = "/home/admin/mainpool/TV";
default = "/media/nas/main/tv";
};
puid = mkOption {

2
modules/apps/vscode/default.nix
View File

@@ -18,7 +18,7 @@ in
ports = [ "${cfg.port}:8443" ];
volumes = [
"${cfg.configPath}:/config"
"/home/admin/ssd/ssd_app_data:/ssd_app_data"
"/media/nas/ssd/ssd_app_data:/ssd_app_data"
"/home/admin/nix-config:/nix-config"
];
environment = {

2
modules/apps/vscode/options.nix
View File

@@ -26,7 +26,7 @@ with lib;
configPath = mkOption {
type = types.str;
default = "/home/admin/ssd/ssd_app_data/vscode";
default = "/media/nas/ssd/ssd_app_data/vscode";
};
puid = mkOption {

7
modules/samba/default.nix
View File

@@ -29,14 +29,17 @@ in
};
};
networking.firewall.enable = true;
networking.firewall.allowPing = true;
services.samba = {
enable = true;
securityType = "user";
openFirewall = true;
extraConfig = ''
workgroup = WORKGROUP
server string = smbnix
netbios name = smbnix
server string = jallen-nas
netbios name = jallen-nas
security = user
#use sendfile = yes
#max protocol = smb2

5
share/nvidia/default.nix
View File

@@ -46,10 +46,9 @@ in
};
# Enable OpenGL
opengl = {
graphics = {
enable = true;
driSupport = true;
driSupport32Bit = true;
enable32Bit = true;
};
};