This commit is contained in:
mjallen18
2026-02-02 18:14:04 -06:00
parent bd8d1e6485
commit d9d7760e58
16 changed files with 697 additions and 693 deletions

View File

@@ -112,22 +112,7 @@ in
enable = true; enable = true;
settings = { settings = {
preload = [ cfg.hyprpaper.wallpaperPath ]; preload = [ cfg.hyprpaper.wallpaperPath ];
wallpaper = wallpaper = [
let
useMonitorV2 = (lib.versionAtLeast pkgs.hyprland.version "0.40.0") && (cfg.monitorv2 != [ ]);
names =
if useMonitorV2 then
map (m: m.name) cfg.monitorv2
else
[
cfg.display1.input
cfg.display2.input
];
in
# if cfg.hyprpaper.usePerMonitor then
# map (n: "${n}, ${cfg.hyprpaper.wallpaperPath}") names
# else
[
{ {
monitor = ""; monitor = "";
path = cfg.hyprpaper.wallpaperPath; path = cfg.hyprpaper.wallpaperPath;

View File

@@ -25,7 +25,11 @@ in
boot = { boot = {
kernelModules = [ "kvm" ]; kernelModules = [ "kvm" ];
kernelParams = lib.mkDefault [ "quiet" "splash" "udev.log_level=3" ]; kernelParams = lib.mkDefault [
"quiet"
"splash"
"udev.log_level=3"
];
binfmt = lib.mkIf isArm { binfmt = lib.mkIf isArm {
registrations."x86_64-linux" = { registrations."x86_64-linux" = {

View File

@@ -3,7 +3,6 @@
lib, lib,
pkgs, pkgs,
namespace, namespace,
inputs,
... ...
}: }:
with lib; with lib;
@@ -278,7 +277,9 @@ in
]; ];
# use postgresql instead of sqlite # use postgresql instead of sqlite
extraPackages = extraPackages =
ps: with ps; [ ps:
with ps;
[
dateparser dateparser
psycopg2 psycopg2
] ]

View File

@@ -44,8 +44,12 @@ let
misc.password=${config.sops.placeholder."jallen-nas/sabnzbd/password"} misc.password=${config.sops.placeholder."jallen-nas/sabnzbd/password"}
misc.api_key=${config.sops.placeholder."jallen-nas/sabnzbd/api-key"} misc.api_key=${config.sops.placeholder."jallen-nas/sabnzbd/api-key"}
misc.nzb_key=${config.sops.placeholder."jallen-nas/sabnzbd/nzb-key"} misc.nzb_key=${config.sops.placeholder."jallen-nas/sabnzbd/nzb-key"}
servers."news.newsgroupdirect.com".username=${config.sops.placeholder."jallen-nas/sabnzbd/server/username"} servers."news.newsgroupdirect.com".username=${
servers."news.newsgroupdirect.com".password=${config.sops.placeholder."jallen-nas/sabnzbd/server/password"} config.sops.placeholder."jallen-nas/sabnzbd/server/username"
}
servers."news.newsgroupdirect.com".password=${
config.sops.placeholder."jallen-nas/sabnzbd/server/password"
}
''; '';
}; };
}; };

View File

@@ -2,7 +2,6 @@
buildHomeAssistantComponent, buildHomeAssistantComponent,
python3Packages, python3Packages,
fetchFromGitHub, fetchFromGitHub,
lib,
... ...
}: }:
buildHomeAssistantComponent rec { buildHomeAssistantComponent rec {

View File

@@ -15,7 +15,6 @@ let
versionSpec = importJSON ./version.json; versionSpec = importJSON ./version.json;
selected = selectVariant versionSpec "lts" null; selected = selectVariant versionSpec "lts" null;
vars = selected.variables or { };
sources = mkAllSources selected; sources = mkAllSources selected;
modDirVersion = selected.variables.modDirVersion; modDirVersion = selected.variables.modDirVersion;

View File

@@ -1,6 +1,4 @@
{ {
config,
lib,
pkgs, pkgs,
namespace, namespace,
... ...

View File

@@ -1,12 +1,11 @@
{ {
config,
lib, lib,
namespace, namespace,
... ...
}: }:
with lib; with lib;
let let
inherit (lib.${namespace}) enabled disabled; inherit (lib.${namespace}) disabled;
in in
{ {
specialisation = { specialisation = {

View File

@@ -1,4 +1,4 @@
{ lib, ... }: { ... }:
{ {
disko.devices = { disko.devices = {
disk = { disk = {

View File

@@ -1,16 +1,5 @@
{ ... }: { ... }:
let let
defaultNetworkShareOptions = [
"sec=none"
"nofail"
"x-systemd.automount"
"auto"
"rw"
"file_mode=0775"
"dir_mode=0775"
"uid=matt"
"gid=wheel"
];
defaultLocalOptions = [ defaultLocalOptions = [
"compress=zstd" "compress=zstd"
# "autodefrag" # "autodefrag"

View File

@@ -2,11 +2,11 @@
# your system. Help is available in the configuration.nix(5) man page, on # 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`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }: { ... }:
{ {
imports = imports = [
[ # Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
@@ -37,9 +37,6 @@
# Enable the X11 windowing system. # Enable the X11 windowing system.
# services.xserver.enable = true; # services.xserver.enable = true;
# Configure keymap in X11 # Configure keymap in X11
# services.xserver.xkb.layout = "us"; # services.xserver.xkb.layout = "us";
# services.xserver.xkb.options = "eurosign:e,caps:escape"; # services.xserver.xkb.options = "eurosign:e,caps:escape";
@@ -120,4 +117,3 @@
system.stateVersion = "25.11"; # Did you read the comment? system.stateVersion = "25.11"; # Did you read the comment?
} }

View File

@@ -1,63 +1,93 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "ahci" "nvme" "xhci_pci" "thunderbolt" "uas" ]; boot.initrd.availableKernelModules = [
"ahci"
"nvme"
"xhci_pci"
"thunderbolt"
"uas"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.initrd.luks.devices."nuc-nixos-cryptroot".device = "/dev/disk/by-uuid/6564be77-2b7f-4078-a791-cc74ffccc561"; boot.initrd.luks.devices."nuc-nixos-cryptroot".device =
"/dev/disk/by-uuid/6564be77-2b7f-4078-a791-cc74ffccc561";
fileSystems."/" = fileSystems."/" = {
{ device = "none"; device = "none";
fsType = "tmpfs"; fsType = "tmpfs";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/08E3-88DB"; device = "/dev/disk/by-uuid/08E3-88DB";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [
"fmask=0022"
"dmask=0022"
];
}; };
fileSystems."/nix" = fileSystems."/nix" = {
{ device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8"; device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fsType = "bcachefs"; fsType = "bcachefs";
options = [ "noatime" "X-mount.subdir=nix" ]; options = [
"noatime"
"X-mount.subdir=nix"
];
}; };
fileSystems."/etc" = fileSystems."/etc" = {
{ device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8"; device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fsType = "bcachefs"; fsType = "bcachefs";
options = [ "noatime" "X-mount.subdir=etc" ]; options = [
"noatime"
"X-mount.subdir=etc"
];
}; };
fileSystems."/var/log" = fileSystems."/var/log" = {
{ device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8"; device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fsType = "bcachefs"; fsType = "bcachefs";
options = [ "noatime" "X-mount.subdir=log" ]; options = [
"noatime"
"X-mount.subdir=log"
];
}; };
fileSystems."/root" = fileSystems."/root" = {
{ device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8"; device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fsType = "bcachefs"; fsType = "bcachefs";
options = [ "noatime" "X-mount.subdir=root" ]; options = [
"noatime"
"X-mount.subdir=root"
];
}; };
fileSystems."/persist" = fileSystems."/persist" = {
{ device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8"; device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fsType = "bcachefs"; fsType = "bcachefs";
options = [ "noatime" "X-mount.subdir=persist" ]; options = [
"noatime"
"X-mount.subdir=persist"
];
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8"; device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fsType = "bcachefs"; fsType = "bcachefs";
options = [ "X-mount.subdir=home" ]; options = [ "X-mount.subdir=home" ];
}; };