Lots of formatting?
This commit is contained in:
+1
-1
@@ -2,7 +2,7 @@
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
|
||||
+2
-1
@@ -31,7 +31,8 @@ let
|
||||
# Local changes
|
||||
../modules/nix-conf.nix
|
||||
./baseline.nix
|
||||
] ++ lib.optionals (builtins.pathExists ./hosts/${name}) [ ./hosts/${name} ];
|
||||
]
|
||||
++ lib.optionals (builtins.pathExists ./hosts/${name}) [ ./hosts/${name} ];
|
||||
};
|
||||
in
|
||||
rec {
|
||||
|
||||
+2
-1
@@ -20,7 +20,8 @@ in
|
||||
top.nixvimunstable.homeModules.nixvim
|
||||
top.self.modules.homeManagerModule
|
||||
./baseline
|
||||
] ++ lib.optionals (builtins.pathExists ./hosts/${host}) [ ./hosts/${host} ];
|
||||
]
|
||||
++ lib.optionals (builtins.pathExists ./hosts/${host}) [ ./hosts/${host} ];
|
||||
|
||||
home = {
|
||||
inherit homeDirectory username;
|
||||
|
||||
+2
-1
@@ -38,7 +38,8 @@ let
|
||||
./baseline.nix
|
||||
top.self.modules.nixosModule
|
||||
./${name}
|
||||
] ++ extraMods;
|
||||
]
|
||||
++ extraMods;
|
||||
};
|
||||
in
|
||||
{
|
||||
|
||||
@@ -16,9 +16,7 @@
|
||||
efi.canTouchEfiVariables = true;
|
||||
};
|
||||
|
||||
environment.systemPackages =
|
||||
with pkgs;
|
||||
[
|
||||
environment.systemPackages = with pkgs; [
|
||||
];
|
||||
|
||||
greg = {
|
||||
|
||||
+5
-2
@@ -65,9 +65,12 @@ in
|
||||
++
|
||||
|
||||
# Items that are not supported on ARM/Linux
|
||||
(excludes [ "aarch64-linux" ] [
|
||||
(excludes
|
||||
[ "aarch64-linux" ]
|
||||
[
|
||||
synology-drive-client
|
||||
]);
|
||||
]
|
||||
);
|
||||
|
||||
programs.firefox = {
|
||||
enable = true; # (!pkgs.stdenv.hostPlatform.isDarwin);
|
||||
|
||||
@@ -432,8 +432,7 @@ in
|
||||
# TODO Use `udevadm trigger --settle` instead of the separate `udevadm settle`
|
||||
# once that feature is available to us with systemd >= 238;
|
||||
# see https://github.com/systemd/systemd/commit/792cc203a67edb201073351f5c766fce3d5eab45
|
||||
preStart =
|
||||
''
|
||||
preStart = ''
|
||||
set -x
|
||||
${ensureCephDirs}
|
||||
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 -x
|
||||
until [ -f /etc/ceph/${cfg.clusterName}.client.admin.keyring ]
|
||||
@@ -529,7 +527,8 @@ in
|
||||
path = [
|
||||
# TODO: use wrapProgram in the ceph package for this in the future
|
||||
pkgs.getopt
|
||||
] ++ cephDeviceHealthMonitoringPathsOrPackages;
|
||||
]
|
||||
++ cephDeviceHealthMonitoringPathsOrPackages;
|
||||
|
||||
restartTriggers = [ config.environment.etc."ceph/${cfg.clusterName}.conf".source ];
|
||||
|
||||
@@ -692,8 +691,7 @@ in
|
||||
) cfg.osds
|
||||
);
|
||||
|
||||
systemd.services =
|
||||
{
|
||||
systemd.services = {
|
||||
|
||||
ceph-mon-setup = mkIf cfg.monitor.enable {
|
||||
description = "Initialize ceph monitor";
|
||||
|
||||
@@ -22,8 +22,7 @@ with lib;
|
||||
};
|
||||
# Sets up a basic KDE installation
|
||||
systemd.services.bluetooth.requiredBy = [ "multi-user.target" ];
|
||||
services =
|
||||
{
|
||||
services = {
|
||||
libinput.enable = true;
|
||||
blueman.enable = true;
|
||||
|
||||
|
||||
@@ -56,8 +56,7 @@ in
|
||||
];
|
||||
|
||||
networking.firewall = {
|
||||
allowedTCPPorts =
|
||||
[
|
||||
allowedTCPPorts = [
|
||||
80
|
||||
443
|
||||
5432
|
||||
|
||||
Reference in New Issue
Block a user