Merge branch 'kbd-fix' into 'main'

Add variables to make theKBDLayout configure console.keyMap and Hyprland

See merge request Zaney/zaneyos!4
This commit is contained in:
Tyler Kelley 2024-02-05 04:14:17 +00:00
commit d91434a8e4
3 changed files with 10 additions and 7 deletions

View File

@ -1,6 +1,6 @@
{ pkgs, config, lib, browser, { pkgs, config, lib, browser,
cpuType, gpuType, wallpaperDir, cpuType, gpuType, wallpaperDir,
inputs, borderAnim, ... }: inputs, borderAnim, theKBDLayout, ... }:
let let
theme = config.colorScheme.colors; theme = config.colorScheme.colors;
@ -30,7 +30,7 @@ in with lib; {
resize_on_border = true resize_on_border = true
} }
input { input {
kb_layout = us kb_layout = ${theKBDLayout}
kb_options=caps:super kb_options=caps:super
follow_mouse = 1 follow_mouse = 1
touchpad { touchpad {

View File

@ -71,11 +71,12 @@
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager {
home-manager.extraSpecialArgs = { inherit username; home-manager.extraSpecialArgs = { inherit username;
inherit gitUsername; inherit gitEmail; inherit gitUsername; inherit gitEmail;
inherit inputs; inherit theme; inherit theKBDLayout; inherit inputs;
inherit browser; inherit wallpaperDir; inherit theme; inherit browser;
inherit wallpaperGit; inherit flakeDir; inherit wallpaperDir; inherit wallpaperGit;
inherit gpuType; inherit cpuType; inherit flakeDir; inherit gpuType;
inherit waybarStyle; inherit borderAnim; inherit cpuType; inherit waybarStyle;
inherit borderAnim;
inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme; inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme;
}; };
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

View File

@ -31,6 +31,8 @@
LC_TIME = "${theLCVariables}"; LC_TIME = "${theLCVariables}";
}; };
console.keyMap = "${theKBDLayout}";
# Define a user account. # Define a user account.
users.users."${username}" = { users.users."${username}" = {
homeMode = "755"; homeMode = "755";