From 2d4e9a5abfc08386250f42ba0f0c25ae63073d3e Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sat, 10 Jun 2023 22:21:25 +0300
Subject: 2023-06-10

---
 modules/nixos/common/locale.nix       | 26 +++++++++++++++-----------
 modules/nixos/common/nix.nix          |  2 +-
 modules/nixos/firefox/userContent.css |  8 ++++++++
 modules/nixos/games/minecraft.nix     |  2 +-
 modules/nixos/games/steam.nix         |  5 ++++-
 modules/nixos/kde.nix                 |  2 +-
 6 files changed, 30 insertions(+), 15 deletions(-)

(limited to 'modules/nixos')

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;
-- 
cgit v1.2.3