diff --git a/modules/base-server.nix b/modules/base-server.nix
index 1fc72f3..008959d 100755
--- a/modules/base-server.nix
+++ b/modules/base-server.nix
@@ -80,51 +80,51 @@
hardware.enableRedistributableFirmware = false;
services = {
-# prometheus = {
-# exporters = {
-# node = {
-# enable = true;
-# port = 9100;
-# enabledCollectors = [
-# #"logind" #too slow
-# "systemd"
-# "processes"
-# "interrupts"
-# # Testing:
-# "buddyinfo"
-# "cgroups"
-# "ksmd"
-# "lnstat"
-# "mountstats"
-# "network_route"
-# #"perf" # requires sysctl change
-# "qdisc"
-# "sysctl"
-# "softirqs"
-# "tcpstat"
-# ];
-# disabledCollectors = [
-# "textfile"
-# "xfs"
-# "zfs"
-# "selinux"
-# "cpufreq"
-# "btrfs"
-# "powersupplyclass"
-# "mdadm"
-# "tapestats"
-# "fibrechannel"
-# "cpu_vulnerabilities"
-# "watchdog"
-# "thermal_zone"
-# "logind"
-# "nfs"
-# "nfsd"
-# "infiniband"
-# ];
-# };
-# };
-# };
+ # prometheus = {
+ # exporters = {
+ # node = {
+ # enable = true;
+ # port = 9100;
+ # enabledCollectors = [
+ # #"logind" #too slow
+ # "systemd"
+ # "processes"
+ # "interrupts"
+ # # Testing:
+ # "buddyinfo"
+ # "cgroups"
+ # "ksmd"
+ # "lnstat"
+ # "mountstats"
+ # "network_route"
+ # #"perf" # requires sysctl change
+ # "qdisc"
+ # "sysctl"
+ # "softirqs"
+ # "tcpstat"
+ # ];
+ # disabledCollectors = [
+ # "textfile"
+ # "xfs"
+ # "zfs"
+ # "selinux"
+ # "cpufreq"
+ # "btrfs"
+ # "powersupplyclass"
+ # "mdadm"
+ # "tapestats"
+ # "fibrechannel"
+ # "cpu_vulnerabilities"
+ # "watchdog"
+ # "thermal_zone"
+ # "logind"
+ # "nfs"
+ # "nfsd"
+ # "infiniband"
+ # ];
+ # };
+ # };
+ # };
promtail = {
enable = true;
configuration = {
diff --git a/modules/base.nix b/modules/base.nix
index 15bfd08..d6f9aae 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -11,8 +11,8 @@
./users/Rory.nix
./extra-substituters.nix
./monitoring/module.nix
-
-# ../packages/overlays/openvpn.nix # Temporary: Fix a build failure
+
+ # ../packages/overlays/openvpn.nix # Temporary: Fix a build failure
];
boot = {
diff --git a/modules/environments/home.nix b/modules/environments/home.nix
index 3fbf14e..cf9f841 100755
--- a/modules/environments/home.nix
+++ b/modules/environments/home.nix
@@ -8,38 +8,40 @@
{
nix = {
distributedBuilds = true;
- #
- buildMachines = builtins.filter (machine: !builtins.any (ip: ip == machine.hostName) (builtins.map (iface: iface.ipv4.addresses) (builtins.attrValues config.networking.interfaces))) [
- {
- systems = [
- "x86_64-linux"
- "i686-linux"
+ #
+ buildMachines =
+ builtins.filter (machine: !builtins.any (ip: ip == machine.hostName) (builtins.map (iface: iface.ipv4.addresses) (builtins.attrValues config.networking.interfaces)))
+ [
+ {
+ systems = [
+ "x86_64-linux"
+ "i686-linux"
+ ];
+ hostName = "192.168.0.3";
+ sshUser = "Rory";
+ sshKey = "/home/Rory/.ssh/id_ed25519";
+ maxJobs = 6;
+ speedFactor = 43200;
+ }
+ {
+ systems = [
+ "x86_64-linux"
+ "i686-linux"
+ ];
+ hostName = "192.168.0.59";
+ sshUser = "Rory";
+ sshKey = "/home/Rory/.ssh/id_ed25519";
+ maxJobs = 2;
+ speedFactor = 16000;
+ }
];
- hostName = "192.168.0.3";
- sshUser = "Rory";
- sshKey = "/home/Rory/.ssh/id_ed25519";
- maxJobs = 6;
- speedFactor = 43200;
- }
- {
- systems = [
- "x86_64-linux"
- "i686-linux"
- ];
- hostName = "192.168.0.59";
- sshUser = "Rory";
- sshKey = "/home/Rory/.ssh/id_ed25519";
- maxJobs = 2;
- speedFactor = 16000;
- }
- ];
#ssh://Rory@192.168.0.3 x86_64-linux,i686-linux /home/Rory/.ssh/id_ed25519 12 1 - - -
registry.nixpkgs.flake = pkgs;
nixPath = [ "nixpkgs=flake:nixpkgs" ];
settings = {
builders-use-substitutes = true;
- #builders
+ #builders
trusted-substituters = [
"https://nix-community.cachix.org"
"https://cache.garnix.io"
diff --git a/modules/monitoring/crutches/synapse.nix b/modules/monitoring/crutches/synapse.nix
index 3145d11..7028396 100644
--- a/modules/monitoring/crutches/synapse.nix
+++ b/modules/monitoring/crutches/synapse.nix
@@ -1,10 +1,10 @@
-{lib, ...}:
+{ lib, ... }:
{
options.monitoring.synapse = {
workerNames = lib.mkOption {
type = lib.types.listOf lib.types.str;
- default = [];
+ default = [ ];
description = "Synapse worker names";
};
};
diff --git a/modules/monitoring/module.nix b/modules/monitoring/module.nix
index c8d1d61..f47c483 100644
--- a/modules/monitoring/module.nix
+++ b/modules/monitoring/module.nix
@@ -40,8 +40,8 @@ in
prometheus = lib.mkIf (cfg.localPrometheus) {
enable = true;
listenAddress = "127.0.0.1";
- extraFlags = [
- "--storage.tsdb.wal-compression"
+ extraFlags = [
+ "--storage.tsdb.wal-compression"
"--query.max-concurrency 128"
"--rules.max-concurrent-evals 64"
"--storage.tsdb.retention.size 250GB"
diff --git a/modules/software-templates/dotnet.client.nix b/modules/software-templates/dotnet.client.nix
index 3a959fe..6f1fdd8 100644
--- a/modules/software-templates/dotnet.client.nix
+++ b/modules/software-templates/dotnet.client.nix
@@ -1,9 +1,17 @@
-{ config, pkgs, nixpkgs-stable, ... }:
+{
+ config,
+ pkgs,
+ nixpkgs-stable,
+ ...
+}:
let
# We have to specify config to set allowUnfree, as nixpkgs-stable.legacyPackages doesn't pass through config.
# See: https://slab.midna.dev/public/posts/where-does-pkgs-come-from-xw6epo0t
- stablePkgs = import nixpkgs-stable { config = config.nixpkgs.config; system = pkgs.stdenv.hostPlatform.system; };
+ stablePkgs = import nixpkgs-stable {
+ config = config.nixpkgs.config;
+ system = pkgs.stdenv.hostPlatform.system;
+ };
in
{
#imports = [ ./dotnet.nix ];
diff --git a/modules/users/Rory.client.nix b/modules/users/Rory.client.nix
index fb6ad88..ede12df 100755
--- a/modules/users/Rory.client.nix
+++ b/modules/users/Rory.client.nix
@@ -35,7 +35,7 @@
#
# Install = { WantedBy = [ "default.target" ]; };
#
- # Service = {
+ # Service = {
# ExecStart = "${pkgs.keepassxc}/bin/keepassxc ~/.secrets.kdbx";
# Restart = "always";
# };
@@ -50,7 +50,7 @@
#
# Install = { WantedBy = [ "default.target" ]; };
#
- # Service = {
+ # Service = {
# ExecStart = "${pkgs.easyeffects}/bin/easyeffects";
# Restart = "always";
# };
diff --git a/modules/users/chris.nix b/modules/users/chris.nix
index 3ae92fd..ea939b6 100755
--- a/modules/users/chris.nix
+++ b/modules/users/chris.nix
@@ -4,7 +4,10 @@
users.users.chris = {
isNormalUser = true;
- extraGroups = [ "wheel" "dialout" ];
+ extraGroups = [
+ "wheel"
+ "dialout"
+ ];
packages = with pkgs; [
nano
#nodejs-slim
|
