challenger: update flake, various small fixes

flake.nix

@@ -14,8 +14,7 @@
     matrix-synapse-next.url = "github:dali99/nixos-matrix-modules/v0.6.0";
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
 
-    # voyager-addons.url = "git+ssh://git@git.feal.no:2222/felixalb/voyager-addons.git";
-    voyager-addons.url = "git+file:///home/felixalb/voyager-addons";
+    extra-config.url = "git+file:///home/felixalb/nix-extra-config";
 
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
@@ -30,7 +29,7 @@
     , nixpkgs
     , sops-nix
     , unstable
-    , voyager-addons
+    , extra-config
   , ... }@inputs:
     let
       pkgs-overlay = final: prev: {
@@ -48,25 +47,6 @@
     in
     {
       nixosConfigurations = {
-        voyager = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          specialArgs = {
-            inherit inputs;
-          };
-          modules = [
-            # Overlays-module makes "pkgs.unstable" available in configuration.nix
-            ({ config, pkgs, ... }: { nixpkgs.overlays = [ pkgs-overlay ]; })
-
-            ./hosts/voyager/configuration.nix
-            voyager-addons.nixosModules.default
-            sops-nix.nixosModules.sops
-            home-manager.nixosModules.home-manager {
-              home-manager.useGlobalPkgs = true;
-              home-manager.useUserPackages = true;
-              home-manager.users."felixalb" = import ./hosts/voyager/home.nix;
-            }
-          ];
-        };
         challenger = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           specialArgs = {
@@ -77,6 +57,7 @@
             ({ config, pkgs, ... }: { nixpkgs.overlays = [ pkgs-overlay ]; })
 
             ./hosts/challenger/configuration.nix
+            extra-config.nixosModules.default
             sops-nix.nixosModules.sops
             home-manager.nixosModules.home-manager {
               home-manager.useGlobalPkgs = true;