2023-11-26

5 files changed, 8 insertions, 24 deletions

diff --git a/modules/common/emacs/doom/init.el b/modules/common/emacs/doom/init.el
index 0a5a417..7ee2112 100644
--- a/modules/common/emacs/doom/init.el
+++ b/modules/common/emacs/doom/init.el
@@ -54,7 +54,7 @@
        gist
        (lookup +dictionary +offline)
        (lsp +peek)
-       magit
+       (magit +forge)
        make
        (pass +auth)
        pdf
@@ -79,7 +79,7 @@
        (latex +latexmk +cdlatex +lsp)
        markdown
        (nix +lsp +tree-sitter)
-       (org +contacts +gnuplot +pandoc +pomodoro +roam2)
+       (org +pandoc +roam2)
        plantuml
        (python +poetry +lsp +tree-sitter)
        (rust +lsp +tree-sitter)
diff --git a/modules/nixos/games/default.nix b/modules/nixos/games/default.nix
index 1c5766b..78aae62 100644
--- a/modules/nixos/games/default.nix
+++ b/modules/nixos/games/default.nix
@@ -8,7 +8,6 @@ with lib; let
 in {
   imports = [
     ./gamemode.nix
-    ./gog.nix
     ./lutris.nix
     ./mangohud.nix
     ./minecraft.nix
diff --git a/modules/nixos/games/gog.nix b/modules/nixos/games/gog.nix
deleted file mode 100644
index 86039f1..0000000
--- a/modules/nixos/games/gog.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; let
-  cfg = config.nixfiles.modules.games.gog;
-in {
-  options.nixfiles.modules.games.gog.enable =
-    mkEnableOption "stand-alone GOG clients and the ability to run GOG games";
-
-  config = mkIf cfg.enable {
-    nixfiles.modules.games.steam-run.enable = true;
-
-    hm.home.packages = with pkgs; [lgogdownloader];
-  };
-}
diff --git a/modules/nixos/games/lutris.nix b/modules/nixos/games/lutris.nix
index feaeefa..f130be3 100644
--- a/modules/nixos/games/lutris.nix
+++ b/modules/nixos/games/lutris.nix
@@ -18,10 +18,12 @@ in {
 
     hm.home.packages = with pkgs; [
       (lutris.override {
-        extraPkgs = _: [wine];
+        extraPkgs = _: [
+          vkBasalt
+          wine
+          winetricks
+        ];
       })
-      vkBasalt
-      winetricks
     ];
   };
 }
diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix
index dcfbb0d..97ff5e5 100644
--- a/nixosConfigurations/eonwe/default.nix
+++ b/nixosConfigurations/eonwe/default.nix
@@ -122,6 +122,7 @@ with lib; {
     # The boot drive is Samsung SSD 980 PRO 2TB.
     initrd.kernelModules = ["nvme"];
 
+    # These pools were configured manually with a specific mountpoint.
     zfs.extraPools = ["udata" "vdata"];
   };