diff --git a/configuration.nix b/configuration.nix index 1e91dda..264d139 100644 --- a/configuration.nix +++ b/configuration.nix @@ -10,13 +10,38 @@ ./hardware-configuration.nix ]; - boot.loader.grub.enable = true; - boot.loader.grub.device = "/dev/sda"; + boot.loader.grub = { + enable = true; + device = "nodev"; + copyKernels = true; + }; + boot.loader.systemd-boot.enable = false; + boot.kernelPackages = pkgs.linuxPackages_zen; + #boot.loader.grub.device = "/dev/sda"; networking.hostName = "kami"; time.timeZone = "Asia/Shanghai"; i18n.defaultLocale = "en_US.UTF-8"; + + i18n.inputMethod = { + enable = true; + type = "fcitx5"; + fcitx5.addons = with pkgs; [ + qt6Packages.fcitx5-chinese-addons + qt6Packages.fcitx5-configtool + fcitx5-gtk + ]; + }; + + i18n.inputMethod.fcitx5.waylandFrontend = false; + environment.sessionVariables = { + GTK_IM_MODULE = "fcitx"; + QT_IM_MODULE = "fcitx"; + XMODIFIERS = "@im=fcitx"; + SDL_IM_MODULE = "fcitx"; + GLFW_IM_MODULE = "ibus"; + }; users.users.kami = { isNormalUser = true; @@ -33,14 +58,33 @@ htop git fastfetch + lvm2 + wpa_supplicant + dhcpcd + networkmanager + firefox + screen + noto-fonts + noto-fonts-cjk-sans + noto-fonts-color-emoji + alsa-lib + alsa-tools + alsa-utils + alsa-plugins + alsa-firmware ]; services.openssh.enable = true; services.openssh.settings.PasswordAuthentication = true; networking.firewall.enable = false; + networking.networkmanager.enable = true; system.copySystemConfiguration = true; + + services.xserver.enable = true; + services.xserver.displayManager.lightdm.enable = true; + services.xserver.desktopManager.xfce.enable = true; system.stateVersion = "26.05"; } diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 23d7b5c..8ea774a 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -12,12 +12,12 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/94775292-6fce-4e1a-b8f1-e99508b509ed"; + { device = "/dev/disk/by-uuid/f9d21cf3-b363-4b0c-be63-d1a6a70f764c"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/5d81f282-c3e2-4bc3-bbe9-857809194f90"; + { device = "/dev/disk/by-uuid/f9d21cf3-b363-4b0c-be63-d1a6a70f764c"; fsType = "ext4"; };