m

5 files changed, 44 insertions, 6 deletions

diff --git a/hosts/local/wayland.nix b/hosts/local/wayland.nix
index 7aae78d..256c84d 100644
--- a/hosts/local/wayland.nix
+++ b/hosts/local/wayland.nix
@@ -115,7 +115,13 @@
     type = "fcitx5";
     fcitx5 = {
       # enabled = true;
-      addons = with pkgs; [fcitx5-rime fcitx5-mozc];
+      addons = with pkgs; [
+        fcitx5-rime
+        fcitx5-mozc
+        fcitx5-configtool
+        fcitx5-chinese-addons
+        fcitx5-gtk
+      ];
       waylandFrontend = true;
     };
   };
diff --git a/hosts/nixos.nix b/hosts/nixos.nix
index b76285f..4602318 100644
--- a/hosts/nixos.nix
+++ b/hosts/nixos.nix
@@ -1,4 +1,4 @@
-inputs: let
+{inputs, ...}: let
   mkNixosSystem = system: path:
     inputs.nixpkgs.lib.nixosSystem {
       inherit system;
diff --git a/hosts/wrappers/chromium/default.nix b/hosts/wrappers/chromium/default.nix
new file mode 100644
index 0000000..7f070d2
--- /dev/null
+++ b/hosts/wrappers/chromium/default.nix
@@ -0,0 +1,27 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  wrappers.ungoogled-chromium = {
+    basePackage = pkgs.ungoogled-chromium;
+    env.NIXOS_OZONE_WL = {
+      force = true;
+      value = null;
+    };
+    flags = [
+      "--enable-features=${
+        lib.concatStringsSep "," [
+          "ClearDataOnExit"
+          "WebUIDarkMode"
+          "WaylandWindowDecorations"
+        ]
+      }"
+      "--ozone-platform-hint=auto"
+      "--ozone-platform=wayland"
+      "--force-dark-mode"
+      "--gtk-version=4"
+      "--enable-wayland-ime"
+    ];
+  };
+}
diff --git a/hosts/wrappers/git/default.nix b/hosts/wrappers/git/default.nix
new file mode 100644
index 0000000..ffea5a4
--- /dev/null
+++ b/hosts/wrappers/git/default.nix
@@ -0,0 +1,7 @@
+{pkgs, ...}: {
+  wrappers.git = {
+    basePackage = pkgs.gitFull;
+    extraPackages = [pkgs.git-extras];
+    env.GIT_CONFIG_GLOBAL.value = ../../../misc/gitconfig;
+  };
+}
diff --git a/outputs.nix b/outputs.nix
index 846c4d9..7b2675b 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -6,10 +6,8 @@
   git-hooks,
   ...
 } @ inputs: let
-  localHosts = {
-    # x86_64-linux = import ./hosts/x86
-  };
+  args = {inherit inputs;};
 in {
-  nixosConfigurations = import ./hosts/nixos.nix inputs;
+  nixosConfigurations = import ./hosts/nixos.nix args;
   darwinConfigurations = import ./hosts/darwin.nix inputs;
 }