Moving more stuff around

nixos/modules/README.md

@@ -1,6 +1,6 @@
 ## Modules
 
-A set of 'custom' modules with the aim to enable easy on/off/settings to build up a system modulary to my 'specs'.
+A set of 'custom' modules with the aim to enable easy on/off/settings to build up a system modularly to my 'specs'.
 
 The main goal is to build up a `mySystem` options key which is easy to read and toggle functionality on and off.
 

nixos/modules/nixos/system/impermanence.nix

@@ -1,7 +1,4 @@
-{ lib
+{ lib, config, ... }:
-, config
-, ...
-}:
 let
   cfg = config.mySystem.system.impermanence;
 in

nixos/modules/nixos/system/nix.nix

@@ -1,8 +1,4 @@
-{ lib
+{ lib, config, ... }:
-, config
-, self
-, ...
-}:
 with lib;
 let
   cfg = config.mySystem.nix;
@@ -27,7 +23,6 @@ in
         };
     };
   };
-
   config.nix = {
     optimise.automatic = cfg.autoOptimiseStore;
     # automatically garbage collect nix store

nixos/modules/nixos/system/openssh.nix

@@ -1,8 +1,4 @@
-{ lib
+{ lib, config, ... }:
-, config
-, self
-, ...
-}:
 with lib;
 let
   cfg = config.mySystem.services.openssh;
@@ -23,7 +19,6 @@ in
         default = "no";
       };
   };
-
   config = mkIf cfg.enable {
     services.openssh = {
       enable = true;

nixos/modules/nixos/system/pushover/default.nix

@@ -8,7 +8,7 @@ let
   cfg = config.mySystem.system.systemd.pushover-alerts;
 in
 {
-  options.mySystem.system.systemd.pushover-alerts.enable = mkEnableOption "Pushover alers for systemd failures" // { default = true; };
+  options.mySystem.system.systemd.pushover-alerts.enable = mkEnableOption "Pushover alerts for systemd failures" // { default = true; };
   options.systemd.services = mkOption {
     type = with types; attrsOf (
       submodule {

nixos/modules/nixos/system/security.nix

@@ -1,7 +1,4 @@
-{ lib
+{ lib, config, ... }:
-, config
-, ...
-}:
 with lib;
 let
   cfg = config.mySystem.security;

nixos/modules/nixos/system/systempackages.nix

@@ -1,8 +1,4 @@
-{ lib
+{ lib, config, ... }:
-, config
-, self
-, ...
-}:
 with lib;
 let
   cfg = config.mySystem.system;

nixos/modules/nixos/system/time.nix

@@ -1,7 +1,4 @@
-{ lib
+{ lib, config, ... }:
-, config
-, ...
-}:
 let
   cfg = config.mySystem.time;
 in

nixos/modules/nixos/system/zfs.nix

@@ -1,8 +1,4 @@
-{ lib
+{ lib, config, pkgs, ... }:
-, config
-, pkgs
-, ...
-}:
 let
   cfg = config.mySystem.system.zfs;
 in
@@ -40,6 +36,5 @@ with lib;
       ZED_PUSHOVER_TOKEN = "$(${pkgs.busybox}/bin/cat ${config.sops.secrets.pushover-api-key.path})";
       ZED_PUSHOVER_USER = "$(${pkgs.busybox}/bin/cat ${config.sops.secrets.pushover-user-key.path})";
     };
-
   };
 }

nixos/profiles/global.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, imports, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 with lib;
 {

nixos/profiles/global/default.nix

@@ -5,5 +5,4 @@
     ./system.nix
     ./users.nix
   ];
-
 }

nixos/profiles/global/sops.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ ... }:
 {
   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
   # Secret for machine-specific pushover

nixos/profiles/global/system.nix

@@ -1,5 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
-with lib;
 {
   system = {
     # Enable printing changes on nix build etc with nvd