2023-06-10

9 files changed, 43 insertions, 26 deletions

diff --git a/modules/common/common/shell/default.nix b/modules/common/common/shell/default.nix
index 1eebfa2..2b034e6 100644
--- a/modules/common/common/shell/default.nix
+++ b/modules/common/common/shell/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   pkgs,
+  pkgsStable,
   this,
   ...
 }:
@@ -64,15 +65,16 @@ with lib; {
                 pkg =
                   if this.isHeadful
                   then
-                    (coreutils.overrideAttrs (_: super: {
-                      patches =
-                        super.patches
-                        ++ [
-                          (fetchpatch {
-                            url = "https://raw.githubusercontent.com/jarun/advcpmv/ea268d870b475edd5960dcd55d5378abc9705958/advcpmv-0.9-9.1.patch";
-                            hash = "sha256-d+SRT/R4xmfHLAdOr7m4R3WFiW64P5ZH6iqDvErYCyg=";
-                          })
-                        ];
+                    # FIXME Update this to 9.3 when patches[1] become available
+                    #
+                    # [1]: https://github.com/jarun/advcpmv
+                    (pkgsStable.coreutils.overrideAttrs (_: _: {
+                      patches = [
+                        (fetchpatch {
+                          url = "https://raw.githubusercontent.com/jarun/advcpmv/ea268d870b475edd5960dcd55d5378abc9705958/advcpmv-0.9-9.1.patch";
+                          hash = "sha256-d+SRT/R4xmfHLAdOr7m4R3WFiW64P5ZH6iqDvErYCyg=";
+                        })
+                      ];
                     }))
                   else coreutils;
               in "${pkg}/bin/coreutils --coreutils-prog=${value}"))
diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index d9a5922..5499d48 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -113,8 +113,7 @@ in {
                     shfmt # :lang sh :editor format
                     sqlite # :lang (org +roam2) :tools lookup
                     texlab # lang (tex +lsp)
-                    # FIXME https://github.com/NixOS/nixpkgs/issues/235434
-                    # texlive.combined.scheme-full # :lang org tex
+                    texlive.combined.scheme-full # :lang org tex
                     unzip # :tools debugger
                     wordnet # :tools (lookup +dictionary +offline)
                     yaml-language-server # :lang (yaml +lsp)
diff --git a/modules/common/profiles/headful.nix b/modules/common/profiles/headful.nix
index 6ec092d..968b287 100644
--- a/modules/common/profiles/headful.nix
+++ b/modules/common/profiles/headful.nix
@@ -32,6 +32,7 @@ in {
         '';
 
         packages = with pkgs; [
+          anki
           comma
           fd
           ripgrep
diff --git a/modules/nixos/common/locale.nix b/modules/nixos/common/locale.nix
index 7529996..09e0686 100644
--- a/modules/nixos/common/locale.nix
+++ b/modules/nixos/common/locale.nix
@@ -1,4 +1,8 @@
-{lib, ...}:
+{
+  lib,
+  pkgs,
+  ...
+}:
 with lib; {
   i18n = {
     defaultLocale = mkDefault "en_GB.UTF-8";
@@ -9,22 +13,22 @@ with lib; {
       "ja_JP.UTF-8/UTF-8"
       "ru_RU.UTF-8/UTF-8"
     ];
+
+    inputMethod = {
+      enabled = "fcitx5";
+      fcitx5.addons = with pkgs; [
+        fcitx5-configtool
+        fcitx5-mozc
+      ];
+    };
   };
 
   services.xserver = {
-    layout = concatStringsSep "," [
-      "us"
-      "ru"
-    ];
-    xkbVariant = concatStringsSep "," [
-      ""
-      "phonetic"
-    ];
+    layout = "us";
     xkbOptions = concatStringsSep "," [
-      "terminate:ctrl_alt_bksp"
       "caps:escape"
       "compose:menu"
-      "grp:win_space_toggle"
+      "terminate:ctrl_alt_bksp"
     ];
   };
 }
diff --git a/modules/nixos/common/nix.nix b/modules/nixos/common/nix.nix
index 410e01d..9978513 100644
--- a/modules/nixos/common/nix.nix
+++ b/modules/nixos/common/nix.nix
@@ -19,7 +19,7 @@ in {
 
       overlays = with inputs; [
         nix-minecraft.overlay
-        pollymc.overlay
+        pollymc.overlays.default
         xmonad-ng.overlays.default
       ];
     };
diff --git a/modules/nixos/firefox/userContent.css b/modules/nixos/firefox/userContent.css
index 3903799..dc811ca 100644
--- a/modules/nixos/firefox/userContent.css
+++ b/modules/nixos/firefox/userContent.css
@@ -347,3 +347,11 @@
         display: none !important;
     }
 }
+
+@-moz-document regexp("https?://duckduckgo\.com/")
+{
+    .badge-link, /* Annoying "Make DuckDuckGo default" ad. */
+    .footer {
+        display: none !important;
+    }
+}
diff --git a/modules/nixos/games/minecraft.nix b/modules/nixos/games/minecraft.nix
index 09b9239..b8a2949 100644
--- a/modules/nixos/games/minecraft.nix
+++ b/modules/nixos/games/minecraft.nix
@@ -31,7 +31,7 @@ in {
 
   config = mkMerge [
     (mkIf cfg.client.enable {
-      hm.home.packages = with pkgs; [prismlauncher];
+      hm.home.packages = with pkgs; [pollymc-unwrapped];
     })
     (mkIf cfg.server.enable {
       nixfiles.modules.common.nix.allowedUnfreePackages = ["minecraft-server"];
diff --git a/modules/nixos/games/steam.nix b/modules/nixos/games/steam.nix
index 8dfa72c..679ce0e 100644
--- a/modules/nixos/games/steam.nix
+++ b/modules/nixos/games/steam.nix
@@ -20,6 +20,9 @@ in {
       };
     };
 
-    hm.home.packages = with pkgs; [steam];
+    programs.steam = {
+      enable = true;
+      package = with pkgs; steam.override {extraPkgs = _pkgs: [attr];};
+    };
   };
 }
diff --git a/modules/nixos/kde.nix b/modules/nixos/kde.nix
index 17fcf03..05be874 100644
--- a/modules/nixos/kde.nix
+++ b/modules/nixos/kde.nix
@@ -17,7 +17,7 @@ in {
     };
 
     hm = {
-      home.sessionVariables.GTK_USE_PORTAL = 1;
+      # home.sessionVariables.GTK_USE_PORTAL = 1;
 
       programs.firefox.profiles.default.settings = {
         "widget.use-xdg-desktop-portal.file-picker" = 1;