nx2/dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

overlays refactor

Browse Source
This commit is contained in:
Lennart J. Kurzweg (Nx2)
2025-06-17 19:48:31 +02:00
parent fbd045d53e
commit d2d1ce7830
103 changed files with 156 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system-modules/adb.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, hyper, lib, ... }:
{ pkgs, ... }@all: with all;
lib.mkIf (hyper.host != "NxACE")
{
environment.systemPackages = with pkgs; [

2
system-modules/boot.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, hyper, inputs, ... }:
{ pkgs, ... }@all: with all;
let
grub-theme-ascii-diana = (pkgs.fetchFromGitea {
domain = "git.${hyper.domain}";

2
system-modules/calendar-dicos.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, ... }@all: with all;
{
systemd.timers."nx_cal_dicos" = {
enable = true;

2
system-modules/calendar-lec.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, hyper, ... }:
{ pkgs, ... }@all: with all;
{
systemd.timers."nx_cal_lec" = {
enable = true;

2
system-modules/calendar-lr.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, hyper, ... }:
{ pkgs, ... }@all: with all;
{
systemd.timers."nx_cal_lr" = {
enable = true;

2
system-modules/calendar-publish.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, hyper, ... }:
{ pkgs, ... }@all: with all;
let
radicale-root = "/var/lib/radicale";
web-root = "/var/nginx/webroot";

2
system-modules/davmail.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, ... }@all: with all;
{
environment.systemPackages = with pkgs; [

2
system-modules/dm.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, hyper, ... }:
{ pkgs, ... }@all: with all;
{
services.greetd = {
enable = true;

2
system-modules/docker.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, hyper, ... }:
{ pkgs, ... }@all: with all;
{
environment.systemPackages = with pkgs; [

2
system-modules/fcitx5.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, ... }@all: with all;
{
# i18n.inputMethod = {
# type = "fcitx5";

2
system-modules/fonts.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, rice, ... }:
{ pkgs, ... }@all: with all;
{
fonts.packages = with pkgs; [
noto-fonts

2
system-modules/fuse.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, ...}:
{ pkgs, ... }@all: with all;
{
environment = {

4
system-modules/games.nix
View File

@@ -1,5 +1,5 @@
{ pkgs, hyper, ... }:
pkgs.lib.mkIf (hyper.host == "NxNORTH" || hyper.host == "NxACE")
{ pkgs, ... }@all: with all;
lib.mkIf (hyper.host == "NxNORTH" || hyper.host == "NxACE")
{
programs = {
steam = {

2
system-modules/gpg.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, ... }@all: with all;
{
environment.systemPackages = with pkgs; [
gnupg

10
system-modules/hardware-configuration.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, hyper, modulesPath, ... }:
{ pkgs, ... }@all: with all;
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
@@ -29,19 +29,19 @@
{ device = "/dev/disk/by-label/swap"; }
];
networking.useDHCP = pkgs.lib.mkDefault true;
networking.useDHCP = lib.mkDefault true;
hardware.cpu.intel.updateMicrocode = pkgs.lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# from nixos-hardware
services.thermald.enable = pkgs.lib.mkDefault true;
services.thermald.enable = lib.mkDefault true;
boot.extraModprobeConfig = if hyper.host == "NxXPS" then ''
options iwlwifi 11n_disable=8
'' else "";
boot.initrd.kernelModules = if hyper.host == "NxXPS" then [ "i915" ] else [];
environment.variables = if hyper.host == "NxXPS" then {
VDPAU_DRIVER = pkgs.lib.mkIf config.hardware.graphics.enable (pkgs.lib.mkDefault "va_gl");
VDPAU_DRIVER = lib.mkIf config.hardware.graphics.enable (lib.mkDefault "va_gl");
} else {};
hardware.graphics.extraPackages = if hyper.host == "NxXPS" then with pkgs; [

4
system-modules/health_reminder.nix
View File

@@ -1,5 +1,5 @@
{ pkgs, hyper, ... }:
pkgs.lib.mkIf (hyper.host != "NxACE")
{ pkgs, ... }@all: with all;
lib.mkIf (hyper.host != "NxACE")
{
systemd.timers."health_reminder" = {
enable = true;

2
system-modules/hsmw.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, lib, host, secrets, ... }:
{ pkgs, ... }@all: with all;
{
environment.systemPackages = with pkgs; [
strongswanNM

2
system-modules/hugo.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, hyper, ... }:
{ pkgs, ... }@all: with all;
let p = pkgs; in
{
environment.systemPackages = with p; [

2
system-modules/kanata.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, ... }@all: with all;
{
services.kanata = {
enable = true;

2
system-modules/kodi.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, lib, host, ... }:
{ pkgs, ... }@all: with all;
lib.mkIf (host == "NxACE")
{}
# {

2
system-modules/networking.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, hyper, secrets, ... }:
{ pkgs, ... }@all: with all;
{
# sops.secrets = {
# "wireless-networking.env" = {};

6
system-modules/nvidia.nix
View File

@@ -1,5 +1,5 @@
{ config, pkgs, hyper, ... }:
pkgs.lib.mkIf hyper.nvidia.enable
{ pkgs, ... }@all: with all;
lib.mkIf hyper.nvidia.enable
{
environment.systemPackages = with pkgs; [
lshw
@@ -21,7 +21,7 @@ pkgs.lib.mkIf hyper.nvidia.enable
hardware = {
nvidia = {
prime = pkgs.lib.mkIf hyper.nvidia.prime {
prime = lib.mkIf hyper.nvidia.prime {
intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:1:0:0";
offload = {

2
system-modules/nx2site.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, hyper, secrets, ... }:
{ pkgs, ... }@all: with all;
let dns-user = "cloudflare"; in
{
sops.secrets = {

2
system-modules/nx2site/audiobookshelf.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, ... }@all: with all;
{
services = {
audiobookshelf = {

2
system-modules/nx2site/dyn_dns.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, hyper, ... }:
{ pkgs, ... }@all: with all;
{
sops.secrets = {
# "nx2site/namecheap.pw" = { };

2
system-modules/nx2site/gitea.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, hyper, secrets, ... }:
{ pkgs, ... }@all: with all;
let git-user = "git"; in
{
sops.secrets = {

2
system-modules/nx2site/open-web-calendar.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, hyper, ... }:
{ pkgs, ... }@all: with all;
{
services = {
open-web-calendar = {

2
system-modules/nx2site/paperless.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, hyper, secrets, ... }:
{ pkgs, ... }@all: with all;
let paperless-user = "paperless"; in
{
sops.secrets = {

4
system-modules/nx2site/proxy.nix
View File

@@ -44,7 +44,7 @@
# appendConfig = '''';
clientMaxBodySize = "20m";
defaultHTTPListenPort = 80;
defaultListenAddresses = [ "0.0.0.0" ] ++ pkgs.lib.optional config.networking.enableIPv6 "[::0]";
defaultListenAddresses = [ "0.0.0.0" ] ++ lib.optional config.networking.enableIPv6 "[::0]";
defaultListen = dl;
defaultMimeTypes = "${pkgs.mailcap}/etc/nginx/mime.types";
defaultSSLListenPort = 443;
@@ -138,7 +138,7 @@
listen = dl;
locations = { "/" = { proxyPass = "http://127.0.0.1:8441"; }; };
};
"dav.${hyper.domain}" = pkgs.lib.mkIf config.services.radicale.enable (vh // {
"dav.${hyper.domain}" = lib.mkIf config.services.radicale.enable (vh // {
listen = dl;
locations = { "/" = { proxyPass = "http://127.0.0.1:5232"; }; };
});

2
system-modules/nx2site/rallly.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, ... }@all: with all;
{
environment.systemPackages = [
(pkgs.mkYarnPackage {

2
system-modules/nx2site/vaultwarden.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, hyper, secrets, ... }:
{ pkgs, ... }@all: with all;
{
sops.secrets = {
"nx2site/vaultwarden.env" = {

4
system-modules/ollama.nix
View File

@@ -1,9 +1,9 @@
{ pkgs, hyper, ... }:
{ pkgs, ... }@all: with all;
{
services.ollama = {
package = if hyper.nvidia.enable then pkgs.ollama-cuda else pkgs.ollama;
enable = true;
acceleration = pkgs.lib.mkIf hyper.nvidia.enable "cuda";
acceleration = lib.mkIf hyper.nvidia.enable "cuda";
host = if hyper.host == "NxACE" then "0.0.0.0" else "127.0.0.1";
port = 11434;
environmentVariables = {

2
system-modules/postgres.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }:
{ pkgs, ... }@all: with all;
{
services = {
postgresql = {

2
system-modules/qmk.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, ... }@all: with all;
{
hardware.keyboard.qmk.enable = true;

2
system-modules/scanning.nix
View File

@@ -3,7 +3,7 @@
hardware.sane = {
enable = true;
};
services.avahi = {
services.avahi.nssmdns4 = {
enable = true;
nssmdns = true;
};

2
system-modules/sops.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, ... }@all: with all;
{
environment.systemPackages = with pkgs; [
age

2
system-modules/sound.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }:
{ pkgs, ... }@all: with all;
{
services.pipewire = {

2
system-modules/tuda.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, ... }@all: with all;
{
environment.etc = {
"ssl/certs/tuda-eduroam-root.crt".source = "${pkgs.cacert.unbundled}/etc/ssl/certs/T-TeleSec_GlobalRoot_Class_2:1.crt";

2
system-modules/users.nix
View File

@@ -1,4 +1,4 @@
{ pkgs, hyper, ... }:
{ pkgs, ... }@all: with all;
{
users.defaultUserShell = pkgs.bash; # if interactive, itll switch to fish

4
system-modules/virtualisation.nix
View File

@@ -1,7 +1,7 @@
{ pkgs, hyper, ... }:
{ pkgs, ... }@all: with all;
{
config = pkgs.lib.mkIf (hyper.host == "NxNORTH") {
config = lib.mkIf (hyper.host == "NxNORTH") {
environment.systemPackages = with pkgs; [
virtiofsd
];

4
system-modules/ydotool.nix
View File

@@ -1,5 +1,5 @@
{ pkgs, hyper, ... }:
pkgs.lib.mkIf (hyper.host == "NxXPS")
{ pkgs, ... }@all: with all;
lib.mkIf (hyper.host == "NxXPS")
{
programs.ydotool.enable = true;
}