Lots of formatting?

This commit is contained in:
Greg Hellings
2025-11-02 22:59:43 -06:00
parent 9c66f1ae1d
commit 1e7bf67597
9 changed files with 311 additions and 311 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }: { pkgs, ... }:
{ {
imports = [ imports = [
+2 -1
View File
@@ -31,7 +31,8 @@ let
# Local changes # Local changes
../modules/nix-conf.nix ../modules/nix-conf.nix
./baseline.nix ./baseline.nix
] ++ lib.optionals (builtins.pathExists ./hosts/${name}) [ ./hosts/${name} ]; ]
++ lib.optionals (builtins.pathExists ./hosts/${name}) [ ./hosts/${name} ];
}; };
in in
rec { rec {
+2 -1
View File
@@ -20,7 +20,8 @@ in
top.nixvimunstable.homeModules.nixvim top.nixvimunstable.homeModules.nixvim
top.self.modules.homeManagerModule top.self.modules.homeManagerModule
./baseline ./baseline
] ++ lib.optionals (builtins.pathExists ./hosts/${host}) [ ./hosts/${host} ]; ]
++ lib.optionals (builtins.pathExists ./hosts/${host}) [ ./hosts/${host} ];
home = { home = {
inherit homeDirectory username; inherit homeDirectory username;
+2 -1
View File
@@ -38,7 +38,8 @@ let
./baseline.nix ./baseline.nix
top.self.modules.nixosModule top.self.modules.nixosModule
./${name} ./${name}
] ++ extraMods; ]
++ extraMods;
}; };
in in
{ {
+1 -3
View File
@@ -16,9 +16,7 @@
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };
environment.systemPackages = environment.systemPackages = with pkgs; [
with pkgs;
[
]; ];
greg = { greg = {
+5 -2
View File
@@ -65,9 +65,12 @@ in
++ ++
# Items that are not supported on ARM/Linux # Items that are not supported on ARM/Linux
(excludes [ "aarch64-linux" ] [ (excludes
[ "aarch64-linux" ]
[
synology-drive-client synology-drive-client
]); ]
);
programs.firefox = { programs.firefox = {
enable = true; # (!pkgs.stdenv.hostPlatform.isDarwin); enable = true; # (!pkgs.stdenv.hostPlatform.isDarwin);
+5 -7
View File
@@ -432,8 +432,7 @@ in
# TODO Use `udevadm trigger --settle` instead of the separate `udevadm settle` # TODO Use `udevadm trigger --settle` instead of the separate `udevadm settle`
# once that feature is available to us with systemd >= 238; # once that feature is available to us with systemd >= 238;
# see https://github.com/systemd/systemd/commit/792cc203a67edb201073351f5c766fce3d5eab45 # see https://github.com/systemd/systemd/commit/792cc203a67edb201073351f5c766fce3d5eab45
preStart = preStart = ''
''
set -x set -x
${ensureCephDirs} ${ensureCephDirs}
install -m 755 -o ${config.users.users.ceph.name} -g ${config.users.groups.ceph.name} -d /var/lib/ceph/bootstrap-osd install -m 755 -o ${config.users.users.ceph.name} -g ${config.users.groups.ceph.name} -d /var/lib/ceph/bootstrap-osd
@@ -464,8 +463,7 @@ in
'' ''
)); ));
script = script = ''
''
set -euo pipefail set -euo pipefail
set -x set -x
until [ -f /etc/ceph/${cfg.clusterName}.client.admin.keyring ] until [ -f /etc/ceph/${cfg.clusterName}.client.admin.keyring ]
@@ -529,7 +527,8 @@ in
path = [ path = [
# TODO: use wrapProgram in the ceph package for this in the future # TODO: use wrapProgram in the ceph package for this in the future
pkgs.getopt pkgs.getopt
] ++ cephDeviceHealthMonitoringPathsOrPackages; ]
++ cephDeviceHealthMonitoringPathsOrPackages;
restartTriggers = [ config.environment.etc."ceph/${cfg.clusterName}.conf".source ]; restartTriggers = [ config.environment.etc."ceph/${cfg.clusterName}.conf".source ];
@@ -692,8 +691,7 @@ in
) cfg.osds ) cfg.osds
); );
systemd.services = systemd.services = {
{
ceph-mon-setup = mkIf cfg.monitor.enable { ceph-mon-setup = mkIf cfg.monitor.enable {
description = "Initialize ceph monitor"; description = "Initialize ceph monitor";
+1 -2
View File
@@ -22,8 +22,7 @@ with lib;
}; };
# Sets up a basic KDE installation # Sets up a basic KDE installation
systemd.services.bluetooth.requiredBy = [ "multi-user.target" ]; systemd.services.bluetooth.requiredBy = [ "multi-user.target" ];
services = services = {
{
libinput.enable = true; libinput.enable = true;
blueman.enable = true; blueman.enable = true;
+1 -2
View File
@@ -56,8 +56,7 @@ in
]; ];
networking.firewall = { networking.firewall = {
allowedTCPPorts = allowedTCPPorts = [
[
80 80
443 443
5432 5432