diff --git a/config/home/hyprland.nix b/config/home/hyprland.nix index 7bcf4f5..909088a 100644 --- a/config/home/hyprland.nix +++ b/config/home/hyprland.nix @@ -1,6 +1,6 @@ { pkgs, config, lib, browser, cpuType, gpuType, wallpaperDir, - inputs, borderAnim, ... }: + inputs, borderAnim, theKBDLayout, ... }: let theme = config.colorScheme.colors; @@ -30,7 +30,7 @@ in with lib; { resize_on_border = true } input { - kb_layout = us + kb_layout = ${theKBDLayout} kb_options=caps:super follow_mouse = 1 touchpad { diff --git a/flake.nix b/flake.nix index 8a8bc7b..62de748 100644 --- a/flake.nix +++ b/flake.nix @@ -71,11 +71,12 @@ home-manager.nixosModules.home-manager { home-manager.extraSpecialArgs = { inherit username; inherit gitUsername; inherit gitEmail; - inherit inputs; inherit theme; - inherit browser; inherit wallpaperDir; - inherit wallpaperGit; inherit flakeDir; - inherit gpuType; inherit cpuType; - inherit waybarStyle; inherit borderAnim; + inherit theKBDLayout; inherit inputs; + inherit theme; inherit browser; + inherit wallpaperDir; inherit wallpaperGit; + inherit flakeDir; inherit gpuType; + inherit cpuType; inherit waybarStyle; + inherit borderAnim; inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme; }; home-manager.useGlobalPkgs = true; diff --git a/system.nix b/system.nix index ae24d02..2a0512a 100644 --- a/system.nix +++ b/system.nix @@ -31,6 +31,8 @@ LC_TIME = "${theLCVariables}"; }; + console.keyMap = "${theKBDLayout}"; + # Define a user account. users.users."${username}" = { homeMode = "755";