From 014b061d11abe8edcd27de37ac40b4c908407f06 Mon Sep 17 00:00:00 2001 From: polwex Date: Fri, 26 Jul 2024 19:22:57 +0700 Subject: m --- hosts/local/fw11/configuration.nix | 25 +++++++++++++++++++------ hosts/local/wayland.nix | 3 +++ 2 files changed, 22 insertions(+), 6 deletions(-) (limited to 'hosts/local') diff --git a/hosts/local/fw11/configuration.nix b/hosts/local/fw11/configuration.nix index b3b6b0f..37ca6a9 100644 --- a/hosts/local/fw11/configuration.nix +++ b/hosts/local/fw11/configuration.nix @@ -1,7 +1,20 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{...}: { +{ + inputs, + pkgs, + ... +}: let + wrappers = + inputs.wrapper-manager.lib.build + { + inherit pkgs; + modules = [ + ../../../wrappers/chromium + ]; + }; +in { imports = [ # Include the results of the hardware scan. ../../base.nix @@ -12,6 +25,10 @@ # ../android.nix ]; + environment.systemPackages = [ + wrappers + ]; + # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -38,10 +55,6 @@ # firmware update services.fwupd.enable = true; - # android - # programs.adb.enable = true; - # users.users.y.extraGroups = ["adbusers"]; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave @@ -49,5 +62,5 @@ # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.05"; # Did you read the comment? + system.stateVersion = "24.05"; # Did you read the comment? } diff --git a/hosts/local/wayland.nix b/hosts/local/wayland.nix index 3b7c6c4..b470939 100644 --- a/hosts/local/wayland.nix +++ b/hosts/local/wayland.nix @@ -112,9 +112,11 @@ i18n.inputMethod = { type = "fcitx5"; + enable = true; fcitx5 = { # enabled = true; addons = with pkgs; [ + rime-data fcitx5-rime fcitx5-mozc fcitx5-configtool @@ -124,6 +126,7 @@ waylandFrontend = true; }; }; + services.xserver.desktopManager.runXdgAutostartIfNone = true; fonts = { enableDefaultPackages = true; -- cgit v1.2.3