From db7f132f6eef58a26a16ddeee314b6c4d3ca085d Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Thu, 28 Nov 2024 20:23:38 -0800
Subject: [PATCH] Apps, refactor, clean up, remove librewolf

Refactors to use app.nix for easier extension.

Removes librewolf from host, as it makes more sense on the user every
time.
---
 .../default.nix => animelauncher/app.nix}     | 12 ++++-----
 nixosModules/apps/default.nix                 | 16 ++++--------
 nixosModules/apps/games/default.nix           |  8 ------
 nixosModules/apps/input-remapper/default.nix  | 11 --------
 nixosModules/apps/inputremapper/app.nix       | 11 ++++++++
 nixosModules/apps/librewolf/default.nix       | 12 ---------
 .../apps/shells/{default.nix => app.nix}      |  2 +-
 .../steam/default.nix => steam/app.nix}       |  4 +--
 nixosModules/apps/syncthing/default.nix       | 25 -------------------
 .../apps/virtualbox/{default.nix => app.nix}  |  6 ++---
 10 files changed, 27 insertions(+), 80 deletions(-)
 rename nixosModules/apps/{games/anime-launcher/default.nix => animelauncher/app.nix} (73%)
 delete mode 100644 nixosModules/apps/games/default.nix
 delete mode 100644 nixosModules/apps/input-remapper/default.nix
 create mode 100644 nixosModules/apps/inputremapper/app.nix
 delete mode 100644 nixosModules/apps/librewolf/default.nix
 rename nixosModules/apps/shells/{default.nix => app.nix} (67%)
 rename nixosModules/apps/{games/steam/default.nix => steam/app.nix} (77%)
 delete mode 100644 nixosModules/apps/syncthing/default.nix
 rename nixosModules/apps/virtualbox/{default.nix => app.nix} (64%)

diff --git a/nixosModules/apps/games/anime-launcher/default.nix b/nixosModules/apps/animelauncher/app.nix
similarity index 73%
rename from nixosModules/apps/games/anime-launcher/default.nix
rename to nixosModules/apps/animelauncher/app.nix
index bdf76d9..5cf1a9b 100644
--- a/nixosModules/apps/games/anime-launcher/default.nix
+++ b/nixosModules/apps/animelauncher/app.nix
@@ -1,14 +1,14 @@
-{ config, inputs, pkgs, lib, ... }:
+{ config, inputs, lib, ... }:
 
 {
-  options = {
-    aagl.enable = lib.mkEnableOption
+  options.aagl = {
+    enable = lib.mkEnableOption
       "Enables another anime game launcher settings";
-    aagl.honkai-rail = lib.mkEnableOption
+    honkai-rail = lib.mkEnableOption
       "Enables honkai star rail";
-    aagl.genshin = lib.mkEnableOption
+    genshin = lib.mkEnableOption
       "Enables genshin impact";
-    aagl.honkai-3rd = lib.mkEnableOption
+    honkai-3rd = lib.mkEnableOption
       "Enables honkai 3rd impact";
   };
 
diff --git a/nixosModules/apps/default.nix b/nixosModules/apps/default.nix
index aebe893..cb0c66b 100644
--- a/nixosModules/apps/default.nix
+++ b/nixosModules/apps/default.nix
@@ -1,12 +1,6 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./games
-    ./input-remapper
-    ./librewolf
-    ./shells
-    ./syncthing
-    ./virtualbox
-  ];
+{ lib, ... }: let
+  fs = lib.fileset;
+  appFilter = {name, ...}: name == "app.nix";
+in {
+  imports = fs.toList (fs.fileFilter appFilter ./.);
 }
diff --git a/nixosModules/apps/games/default.nix b/nixosModules/apps/games/default.nix
deleted file mode 100644
index 905db78..0000000
--- a/nixosModules/apps/games/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./anime-launcher
-    ./steam
-  ];
-}
diff --git a/nixosModules/apps/input-remapper/default.nix b/nixosModules/apps/input-remapper/default.nix
deleted file mode 100644
index 0646dfc..0000000
--- a/nixosModules/apps/input-remapper/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  options = {
-    input-remapper.enable = lib.mkEnableOption "Enables input-remapper";
-  };
-
-  config = lib.mkIf config.input-remapper.enable {
-    services.input-remapper.enable = true;
-  };
-}
diff --git a/nixosModules/apps/inputremapper/app.nix b/nixosModules/apps/inputremapper/app.nix
new file mode 100644
index 0000000..336e811
--- /dev/null
+++ b/nixosModules/apps/inputremapper/app.nix
@@ -0,0 +1,11 @@
+{ config, lib, ... }:
+
+{
+  options.input-remapper = {
+    enable = lib.mkEnableOption "Enables input-remapper";
+  };
+
+  config = lib.mkIf config.input-remapper.enable {
+    services.input-remapper.enable = true;
+  };
+}
diff --git a/nixosModules/apps/librewolf/default.nix b/nixosModules/apps/librewolf/default.nix
deleted file mode 100644
index f0d4406..0000000
--- a/nixosModules/apps/librewolf/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  options = {
-    librewolf.enable = lib.mkEnableOption "Enables librewolf";
-  };
-
-  config = lib.mkIf config.librewolf.enable {
-    environment.variables.BROWSER = "librewolf";
-    environment.systemPackages = with pkgs; [ librewolf ];
-  };
-}
diff --git a/nixosModules/apps/shells/default.nix b/nixosModules/apps/shells/app.nix
similarity index 67%
rename from nixosModules/apps/shells/default.nix
rename to nixosModules/apps/shells/app.nix
index 03ae484..6eab99e 100644
--- a/nixosModules/apps/shells/default.nix
+++ b/nixosModules/apps/shells/app.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ ... }:
 
 {
   imports = [
diff --git a/nixosModules/apps/games/steam/default.nix b/nixosModules/apps/steam/app.nix
similarity index 77%
rename from nixosModules/apps/games/steam/default.nix
rename to nixosModules/apps/steam/app.nix
index b45dcb0..6311d9b 100644
--- a/nixosModules/apps/games/steam/default.nix
+++ b/nixosModules/apps/steam/app.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.steam = {
@@ -12,6 +12,6 @@
       remotePlay.openFirewall = true;
       dedicatedServer.openFirewall = true;
     };
-    programs.gamemode.enable = true;
+    programs.gamemode.enable = lib.mkIf config.steam.gamemode true;
   };
 }
diff --git a/nixosModules/apps/syncthing/default.nix b/nixosModules/apps/syncthing/default.nix
deleted file mode 100644
index fee80a5..0000000
--- a/nixosModules/apps/syncthing/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ config, lib, ... }:
-
-{
-  options = {
-    syncthing.enable = lib.mkEnableOption "Enables syncthing";
-  };
-
-  config = lib.mkIf config.syncthing.enable {
-    services.syncthing = {
-      enable = true;
-      # user = config.user.name;
-      # dataDir = "/home/" + config.user.name + "/dox/Sync";
-      # configDir = "/home/" + config.user.name + "/.config/syncthing";
-      # overrideFolders = true;
-      # overrideDevices = true;
-      #
-      # settings = {
-      #   gui = {
-      #     user = config.user.name;
-      #     password = "password";
-      #   };
-      # };
-    };
-  };
-}
diff --git a/nixosModules/apps/virtualbox/default.nix b/nixosModules/apps/virtualbox/app.nix
similarity index 64%
rename from nixosModules/apps/virtualbox/default.nix
rename to nixosModules/apps/virtualbox/app.nix
index 87e825d..7bd6c59 100644
--- a/nixosModules/apps/virtualbox/default.nix
+++ b/nixosModules/apps/virtualbox/app.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
   options.virtualbox = {
@@ -8,8 +8,6 @@
 
   config = lib.mkIf config.virtualbox.enable {
     virtualisation.virtualbox.host.enable = true;
-    users.extraGroups.vboxusers.members = [
-      config.user.name
-    ] ++ config.virtualbox.extra-users;
+    users.extraGroups.vboxusers.members = config.virtualbox.extra-users;
   };
 }