configs/nixos/i3/default.nix

@@ -20,7 +20,6 @@
       greeters.gtk.enable = false;
       greeter.enable = false;
     };
-    xkb.options = "ctrl:nocaps,compose:rctrl";
   };
   home-manager.users.${config.host.user} = {config, ...}: {
     home.packages = with pkgs; [

configs/nixos/jellyfin.nix

@@ -5,9 +5,6 @@
   lib,
   ...
 }: {
-  imports = [
-    ./nginx.nix
-  ];
   services.jellyfin = {
     enable = true;
     openFirewall = true;

hosts/cirrostratus/default.nix

@@ -13,6 +13,7 @@ inputs.nixpkgs.lib.nixosSystem {
     inputs.disko.nixosModules.disko
     ./disk-config.nix
     ./hardware-configuration.nix
+    ./nginx.nix
     ./restic.nix
     ../../configs/nixos/common.nix
     ../../configs/nixos/tailscale.nix
@@ -61,6 +62,11 @@ inputs.nixpkgs.lib.nixosSystem {
       sops = lib.mkIf (inputs ? nix-secrets) {
         secrets = {
           duckdns-token.sopsFile = "${inputs.nix-secrets}/duckdns.yaml";
+          gabevenberg-draft-credentials = {
+            sopsFile = "${inputs.nix-secrets}/draft.gabevenberg.com";
+            format = "binary";
+            owner = config.services.nginx.user;
+          };
         };
       };
 

hosts/cirrus/default.nix

@@ -12,7 +12,6 @@ inputs.nixpkgs.lib.nixosSystem {
     inputs.home-manager.nixosModules.home-manager
     inputs.disko.nixosModules.disko
     ./disk-config.nix
-    ./nginx.nix
     ./restic.nix
     ../../roles/nixos/vm.nix
     ../../configs/nixos/common.nix
@@ -54,11 +53,6 @@ inputs.nixpkgs.lib.nixosSystem {
             format = "binary";
             owner = "radicale";
           };
-          gabevenberg-draft-credentials = {
-            sopsFile = "${inputs.nix-secrets}/draft.gabevenberg.com";
-            format = "binary";
-            owner = config.services.nginx.user;
-          };
         };
       };
       home-manager.users.${config.host.user} = {