hosts/adalbert/default.nix

@@ -29,11 +29,10 @@
 
     ../common/optional/systemd-boot.nix
     ../common/optional/wireshark.nix
+    ../common/optional/gamemode.nix
     ../common/optional/kde-connect.nix
     ../common/optional/gnome-keyring.nix
     ../common/optional/adb.nix
-    ../common/optional/gaming/gamemode.nix
-    ../common/optional/gaming/vr.nix
   ];
 
   nixpkgs = {

hosts/common/global/user.nix

@@ -8,6 +8,7 @@
 }: let
   ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
 in {
+  imports = builtins.attrValues outputs.nixosModules; #propagates imports downwards
   users.users.${vars.user} = {
     isNormalUser = true;
     shell = pkgs.fish;

hosts/common/optional/gaming/vr.nix

@@ -1,6 +0,0 @@
-{
-  programs.alvr = {
-    enable = true;
-    openFirewall = true;
-  };
-}

modules/nixos/alvr.nix

@@ -1,34 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-with lib; let
-  cfg = config.programs.alvr;
-in {
-  options = {
-    programs.alvr = {
-      enable = mkEnableOption (lib.mdDoc "ALVR");
-
-      package = mkPackageOption pkgs "alvr" {};
-
-      openFirewall = mkOption {
-        type = types.bool;
-        default = false;
-        description = lib.mdDoc ''
-          Open the default ports in the firewall for the ALVR server.
-        '';
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [cfg.package];
-
-    networking.firewall = mkIf cfg.openFirewall {
-      allowedTCPPorts = [9943 9944];
-      allowedUDPPorts = [9943 9944];
-    };
-  };
-}

modules/nixos/default.nix

@@ -2,5 +2,5 @@
 # These should be stuff you would like to share with others, not your personal configurations.
 {
   # List your module files here
-  alvr = import ./alvr.nix;
+  # my-module = import ./my-module.nix;
 }

pkgs/default.nix

@@ -1,6 +1,6 @@
 # Custom packages, that can be defined similarly to ones from nixpkgs
 # You can build them using 'nix build .#example'
-{pkgs, ...}: {
+pkgs: {
   # example = pkgs.callPackage ./example { };
   alvr = pkgs.callPackage ./alvr {};
 }