addressed some tech debt

Author: izaac

flake.nix

@@ -42,8 +42,6 @@
   outputs = inputs @ {
     self,
     nixpkgs,
-    stylix,
-    sops-nix,
     darwin,
     ...
   }: let
@@ -58,7 +56,7 @@
     userConfig = import ./lib/user.nix;
 
     mkSystem = import ./lib/mkSystem.nix {
-      inherit inputs nixpkgs stylix sops-nix userConfig;
+      inherit inputs userConfig;
     };
 
     treefmtEval =
@@ -70,12 +68,12 @@
       windy = mkSystem "windy" "x86_64-linux";
       canoe = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        specialArgs = {inherit userConfig;};
+        specialArgs = {inherit inputs userConfig;};
         modules = [./hosts/canoe/minimal.nix];
       };
       canoe-cosmic = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        specialArgs = {inherit userConfig;};
+        specialArgs = {inherit inputs userConfig;};
         modules = [./hosts/canoe/cosmic.nix];
       };
     };

hosts/canoe/cosmic.nix

@@ -11,16 +11,18 @@
 
   isoImage.edition = "cosmic";
 
-  # cosmic-comp owns the seat; X server would race on tty1.
-  services.xserver.enable = lib.mkForce false;
+  services = {
+    # cosmic-comp owns the seat; X server would race on tty1.
+    xserver.enable = lib.mkForce false;
 
-  services.desktopManager.cosmic.enable = true;
+    desktopManager.cosmic.enable = true;
 
-  services.greetd = {
-    enable = true;
-    settings.initial_session = {
-      command = lib.getExe pkgs.cosmic-session;
-      user = "nixos";
+    greetd = {
+      enable = true;
+      settings.initial_session = {
+        command = lib.getExe pkgs.cosmic-session;
+        user = "nixos";
+      };
     };
   };
 }

hosts/ninja/configuration.nix

@@ -74,7 +74,7 @@
       home-manager.enable = true;
       nix-ld.enable = true;
       yubikey.enable = true;
-      sudoReadonly.enable = true;
+      "sudo-readonly".enable = true;
     };
   };
 

hosts/windy/configuration.nix

@@ -38,7 +38,7 @@
       theme.enable = true;
       nix-ld.enable = true;
       yubikey.enable = true;
-      sudoReadonly.enable = true;
+      "sudo-readonly".enable = true;
     };
   };
 

lib/mkSystem.nix

@@ -1,11 +1,8 @@
 {
   inputs,
-  nixpkgs,
-  stylix,
-  sops-nix,
   userConfig,
 }: hostname: system:
-nixpkgs.lib.nixosSystem {
+inputs.nixpkgs.lib.nixosSystem {
   inherit system;
   specialArgs = {
     inherit inputs userConfig;
@@ -14,8 +11,8 @@ nixpkgs.lib.nixosSystem {
   modules = [
     ../hosts/${hostname}/configuration.nix
     inputs.disko.nixosModules.disko
-    stylix.nixosModules.stylix
-    sops-nix.nixosModules.sops
+    inputs.stylix.nixosModules.stylix
+    inputs.sops-nix.nixosModules.sops
     ../modules/core/sops.nix
     {
       nixpkgs.config.allowUnfree = true;

modules/core/sudo-readonly.nix

@@ -5,7 +5,7 @@
   ...
 }:
 with lib; let
-  cfg = config.mySystem.core.sudoReadonly;
+  cfg = config.mySystem.core."sudo-readonly";
 
   bin = "/run/current-system/sw/bin";
 
@@ -51,7 +51,7 @@ with lib; let
     "${bin}/iotop"
   ];
 in {
-  options.mySystem.core.sudoReadonly = {
+  options.mySystem.core."sudo-readonly" = {
     enable = mkEnableOption "NOPASSWD sudo for read-only system diagnostics";
   };