diff --git a/home/toast/programs/hyprland.nix b/home/toast/programs/hyprland.nix index ba43329..83da3b6 100644 --- a/home/toast/programs/hyprland.nix +++ b/home/toast/programs/hyprland.nix @@ -10,19 +10,22 @@ package = pkgs.hyprland; systemd.enable = false; settings = { - exec-once = [ "uwsm app -- firefox" ]; - "$terminal" = "uwsm app -- kitty"; - "$fileManager" = "uwsm app -- kitty yazi"; - "$menu" = "uwsm app -- $(tofi-drun)"; - "$mod" = "SUPER"; + exec-once = [ "uwsm app -- firefox" "kime" ]; + + "$terminal" = "uwsm app -- kitty"; + "$fileManager" = "uwsm app -- kitty yazi"; + "$menu" = "uwsm app -- $(tofi-drun)"; + "$mod" = "SUPER"; env = [ "XCURSOR_SIZE,24" "HYPRCURSOR_SIZE,24" "LIBVA_DRIVER_NAME,nvidia" "__GLX_VENDOR_LIBRARY_NAME,nvidia" - "INPUT_METHOD,fcitx" "QT_QPA_PLATFORM,wayland" + "GTK_IM_MODULE,kime" + "QT_IM_MODULE,kime" + "XMODIFIERS,@im=kime" ]; bind = [ @@ -160,6 +163,8 @@ }; input = { + kb_layout = "us,kr"; + kb_options = "grp:alt_shift_toggle"; sensitivity = -0.6; }; diff --git a/hosts/nixos/configuration.nix b/hosts/nixos/configuration.nix index ce2c1d0..ee94390 100644 --- a/hosts/nixos/configuration.nix +++ b/hosts/nixos/configuration.nix @@ -11,19 +11,26 @@ networking.hostName = "nixos"; networking.networkmanager.enable = true; + networking.firewall.enable = false; time.timeZone = "Asia/Seoul"; - i18n.defaultLocale = "en_US.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "ko_KR.UTF-8"; - LC_IDENTIFICATION = "ko_KR.UTF-8"; - LC_MEASUREMENT = "ko_KR.UTF-8"; - LC_MONETARY = "ko_KR.UTF-8"; - LC_NAME = "ko_KR.UTF-8"; - LC_NUMERIC = "ko_KR.UTF-8"; - LC_PAPER = "ko_KR.UTF-8"; - LC_TELEPHONE = "ko_KR.UTF-8"; - LC_TIME = "ko_KR.UTF-8"; + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_ADDRESS = "ko_KR.UTF-8"; + LC_IDENTIFICATION = "ko_KR.UTF-8"; + LC_MEASUREMENT = "ko_KR.UTF-8"; + LC_MONETARY = "ko_KR.UTF-8"; + LC_NAME = "ko_KR.UTF-8"; + LC_NUMERIC = "ko_KR.UTF-8"; + LC_PAPER = "ko_KR.UTF-8"; + LC_TELEPHONE = "ko_KR.UTF-8"; + LC_TIME = "ko_KR.UTF-8"; + }; + inputMethod = { + enable = true; + type = "kime"; + }; }; users.users.toast = { @@ -46,11 +53,10 @@ withUWSM = true; xwayland.enable = true; }; - services.xserver.xkb = { - layout = "us"; - variant = ""; + services.xserver = { + xkb.layout = "us"; + videoDrivers = [ "nvidia" ]; }; - services.xserver.videoDrivers = [ "nvidia" ]; environment.sessionVariables = { # WLR_NO_HARDWARE_CURSORS = "1"; NIXOS_OZONE_WL = "1";