refactor(gaming): move home-managed config into home manager module

home/hosts/andromache/default.nix

@@ -31,6 +31,7 @@
   browser.enable = true;
   browser.primary = "librewolf";
   cloud.hetzner.enable = true;
+  gaming.enable = true;
   comms.signal.enable = true;
   git.enable = true;
   git.github.enable = true;

home/modules/anki/default.nix

@@ -53,6 +53,9 @@ in
           keyFile = "${sops.secrets."anki/sync-key".path}";
         };
       };
+
+      # allow Anki to write prefs
+      home.file."${config.xdg.dataHome}/Anki2/prefs21.db".enable = lib.mkForce false;
     }
   );
 }

home/modules/default.nix

@@ -2,13 +2,14 @@
   config,
   lib,
   pkgs,
+  myUtils,
   ...
 }:
 
 {
   imports =
     let
-      dirs = lib.attrNames (lib.filterAttrs (_: v: v == "directory") (builtins.readDir ./.));
+      dirs = myUtils.dirNames ./.;
       hasDef = name: builtins.pathExists ./${name}/default.nix;
     in
     map (name: ./${name}) (builtins.filter hasDef dirs);

home/modules/desktop/niri/default.nix

@@ -6,15 +6,6 @@
 }:
 
 {
-  imports = [
-    ../../clipboard
-    ../../fuzzel
-    ../../mako
-    ../../shikane
-    ../../swayidle
-    ../../waybar
-  ];
-
   options.desktop.niri.enable = lib.mkEnableOption "niri desktop";
 
   config = lib.mkIf config.desktop.niri.enable {

home/modules/gaming/default.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  ...
+}:
+
+{
+  options.gaming.enable = lib.mkEnableOption "gaming";
+
+  config = lib.mkIf config.gaming.enable {
+    xdg.configFile."lutris/system.yml".text = lib.generators.toJSON { } {
+      system.game_path = "${config.home.homeDirectory}/games";
+    };
+  };
+}

home/modules/shell/default.nix

@@ -9,7 +9,6 @@
     ./bash.nix
     ./utils.nix
     ./prompt.nix
-    ../tmux
   ];
 
   options.shell.enable = lib.mkEnableOption "shell";

hosts/andromache/default.nix

@@ -33,10 +33,6 @@ in
   bluetooth.enable = true;
   bootloader.enable = true;
   desktop.niri.enable = true;
-  firewall = {
-    enable = true;
-    allowedTCPPorts = [ 22 ];
-  };
   gaming.enable = true;
   git.enable = true;
   keyboard.enable = true;

hosts/astyanax/default.nix

@@ -67,11 +67,6 @@ in
   docker.enable = true;
   nfc.enable = true;
 
-  firewall = {
-    enable = true;
-    allowedTCPPorts = [ 22 ];
-  };
-
   hardware = {
     cpu.intel.updateMicrocode = true;
     # https://wiki.nixos.org/wiki/Intel_Graphics

modules/firewall/default.nix

@@ -1,27 +0,0 @@
-{ lib, config, ... }:
-
-let
-  inherit (lib) mkEnableOption mkOption types;
-in
-{
-  options.firewall = {
-    enable = mkEnableOption "firewall";
-
-    allowedTCPPorts = mkOption {
-      type = types.listOf types.port;
-      default = [ ];
-    };
-
-    allowedUDPPorts = mkOption {
-      type = types.listOf types.port;
-      default = [ ];
-    };
-  };
-
-  config = lib.mkIf config.firewall.enable {
-    networking.firewall = {
-      enable = true;
-      inherit (config.firewall) allowedTCPPorts allowedUDPPorts;
-    };
-  };
-}

modules/gaming/default.nix

@@ -38,12 +38,6 @@ in
       mangohud
     ];
 
-    home-manager.users.${config.host.username} = {
-      xdg.configFile."lutris/system.yml".text = lib.generators.toJSON { } {
-        system.game_path = "/home/${config.host.username}/games";
-      };
-    };
-
     security.pam.loginLimits = [
       {
         domain = config.host.username;

modules/wol/default.nix

@@ -28,6 +28,6 @@ in
       inherit (iface) macAddress;
     }) config.wol.interfaces;
 
-    # firewall.allowedUDPPorts = [ 9 ];
+    # networking.firewall.allowedUDPPorts = [ 9 ];
   };
 }