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

nix fmt

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/home/programs/hyprland/default.nix
View File

@@ -112,22 +112,7 @@ in
enable = true;
settings = {
preload = [ cfg.hyprpaper.wallpaperPath ];
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
[
wallpaper = [
{
monitor = "";
path = cfg.hyprpaper.wallpaperPath;

6
modules/nixos/boot/common/default.nix
View File

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

5
modules/nixos/homeassistant/services/homeassistant/default.nix
View File

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

8
modules/nixos/services/arrs/default.nix
View File

@@ -44,8 +44,12 @@ let
misc.password=${config.sops.placeholder."jallen-nas/sabnzbd/password"}
misc.api_key=${config.sops.placeholder."jallen-nas/sabnzbd/api-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".password=${config.sops.placeholder."jallen-nas/sabnzbd/server/password"}
servers."news.newsgroupdirect.com".username=${
config.sops.placeholder."jallen-nas/sabnzbd/server/username"
}
servers."news.newsgroupdirect.com".password=${
config.sops.placeholder."jallen-nas/sabnzbd/server/password"
}
'';
};
};

1
packages/homeassistant/ha-govee/default.nix
View File

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

1
packages/raspberrypi/linux-rpi/default.nix
View File

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

2
systems/x86_64-linux/jallen-nas/boot.nix
View File

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

3
systems/x86_64-linux/jallen-nas/disabled.nix
View File

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

2
systems/x86_64-linux/jallen-nas/nas-pool.nix
View File

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

11
systems/x86_64-linux/matt-nixos/filesystems.nix
View File

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

10
systems/x86_64-linux/nuc-nixos/configuration.nix
View File

@@ -2,11 +2,11 @@
# 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, ... }:
{ ... }:
{
imports =
[ # Include the results of the hardware scan.
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];
@@ -37,9 +37,6 @@
# Enable the X11 windowing system.
# services.xserver.enable = true;
# Configure keymap in X11
# services.xserver.xkb.layout = "us";
# services.xserver.xkb.options = "eurosign:e,caps:escape";
@@ -120,4 +117,3 @@
system.stateVersion = "25.11"; # Did you read the comment?
}

84
systems/x86_64-linux/nuc-nixos/hardware-configuration.nix
View File

@@ -1,63 +1,93 @@
# 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, ... }:
{
config,
lib,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
imports = [
(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.kernelModules = [ "kvm-amd" ];
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."/" =
{ device = "none";
fileSystems."/" = {
device = "none";
fsType = "tmpfs";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/08E3-88DB";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/08E3-88DB";
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
options = [
"fmask=0022"
"dmask=0022"
];
};
fileSystems."/nix" =
{ device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fileSystems."/nix" = {
device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fsType = "bcachefs";
options = [ "noatime" "X-mount.subdir=nix" ];
options = [
"noatime"
"X-mount.subdir=nix"
];
};
fileSystems."/etc" =
{ device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fileSystems."/etc" = {
device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fsType = "bcachefs";
options = [ "noatime" "X-mount.subdir=etc" ];
options = [
"noatime"
"X-mount.subdir=etc"
];
};
fileSystems."/var/log" =
{ device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fileSystems."/var/log" = {
device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fsType = "bcachefs";
options = [ "noatime" "X-mount.subdir=log" ];
options = [
"noatime"
"X-mount.subdir=log"
];
};
fileSystems."/root" =
{ device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fileSystems."/root" = {
device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fsType = "bcachefs";
options = [ "noatime" "X-mount.subdir=root" ];
options = [
"noatime"
"X-mount.subdir=root"
];
};
fileSystems."/persist" =
{ device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fileSystems."/persist" = {
device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fsType = "bcachefs";
options = [ "noatime" "X-mount.subdir=persist" ];
options = [
"noatime"
"X-mount.subdir=persist"
];
};
fileSystems."/home" =
{ device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fileSystems."/home" = {
device = "UUID=12dc0336-37fa-497c-bc4c-8e4eb8a2fab8";
fsType = "bcachefs";
options = [ "X-mount.subdir=home" ];
};