From 79d3ca7ec4dd1f2d57e729f4514b71e99ee48683 Mon Sep 17 00:00:00 2001
From: alex <reizero@live.com>
Date: Wed, 7 May 2025 15:20:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0gnome/docker=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 home/desktop.nix                    |  1 -
 modules/nixos/gnome.nix             | 19 +++++++++++++------
 modules/nixos/virtualize/docker.nix |  1 +
 profiles/apollo/hm/default.nix      |  5 ++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/home/desktop.nix b/home/desktop.nix
index d87667b..350d523 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -13,7 +13,6 @@
 
     # You can also split up your configuration and import pieces of it here:
     ./core.nix
-    ../modules/home/hyprland
     ../modules/home/vscode
     ../modules/home/zsh
     ../modules/home/xdg.nix
diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix
index 95662b7..b338391 100644
--- a/modules/nixos/gnome.nix
+++ b/modules/nixos/gnome.nix
@@ -8,22 +8,21 @@
 
   environment = {
     systemPackages = (with pkgs;[
-      gnome.gnome-tweaks
+      gnome-tweaks
+      gnome-shell-extensions
     ]) ++ (with pkgs.gnomeExtensions;[
       dash-to-dock
-      captivate # cap button indicator
       appindicator # tray icon
     ]);
 
     gnome.excludePackages = (with pkgs; [
+      atomix # puzzle game
+      cheese # webcam tool
       gnome-photos
       gnome-tour
       gnome-text-editor
-    ]) ++ (with pkgs.gnome; [
-      atomix # puzzle game
-      cheese # webcam tool
       epiphany # web browser
-      # geary # email reader
+      geary # email reader
       evince # document viewer
       gedit # text editor
       gnome-contacts
@@ -39,6 +38,14 @@
       tali # poker game
       yelp # help viewer
     ]);
+
+    variables = {
+      "GTK_IM_MODULE" = "fcitx";
+      "QT_IM_MODULE" = "fcitx";
+      "XMODIFIERS" = "@im=fcitx";
+      "SDL_IM_MODULE" = "fcitx";
+      "GLFW_IM_MODULE" = "ibus";
+    };
   };
 }
 
diff --git a/modules/nixos/virtualize/docker.nix b/modules/nixos/virtualize/docker.nix
index 184e774..a18135d 100644
--- a/modules/nixos/virtualize/docker.nix
+++ b/modules/nixos/virtualize/docker.nix
@@ -8,6 +8,7 @@
       userland-proxy = false;
       experimental = true;
       ipv6 = true;
+      ip6tables = true;
       fixed-cidr-v6 = "fd00::/80";
       metrics-addr = "0.0.0.0:9323";
       log-driver = "json-file";
diff --git a/profiles/apollo/hm/default.nix b/profiles/apollo/hm/default.nix
index 490ee63..2883ab4 100644
--- a/profiles/apollo/hm/default.nix
+++ b/profiles/apollo/hm/default.nix
@@ -1,11 +1,10 @@
-{ pkgs, ... }: {
+{ self, pkgs, ... }: {
   imports = [
     ./ssh
-    ./hyprland.nix
   ];
 
   home.packages = with pkgs; [
     nextcloud-client
-    kodi-wayland
+    kodi
   ];
 }