Skip to content

feat: use the kbd layout from localectl #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sergiusens wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: use the kbd layout from localectl #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion home-manager/desktop/compositor/hyprland/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
...
}:
let
xkbLayout = "gb";
xkbLayout = let
envLayout = builtins.getEnv "NOUGHTY_KEYBOARD_LAYOUT";
in if envLayout != "" then envLayout else "gb";
palette = noughtyConfig.catppuccin.palette;
in
{
Expand Down
2 changes: 2 additions & 0 deletions just/home-manager.just
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ build-home: _header _is_compatible _has_config
export HOSTNAME="${HOSTNAME:-$(hostname -s)}"
export USER="${USER}"
export HOME="${HOME}"
export NOUGHTY_KEYBOARD_LAYOUT="$(localectl status | grep "X11 Layout" | awk '{print $3}' || echo "gb")"
nom build {{NIX_OPTS}} ".#homeConfigurations.${USER}@${HOSTNAME}.activationPackage"
rm result 2> /dev/null || true

Expand All @@ -19,5 +20,6 @@ switch-home: build-home
export HOSTNAME="${HOSTNAME:-$(hostname -s)}"
export USER="${USER}"
export HOME="${HOME}"
export NOUGHTY_KEYBOARD_LAYOUT="$(localectl status | grep "X11 Layout" | awk '{print $3}' || echo "gb")"
home-manager --impure -b noughty-{{STAMP}} --flake ".#${USER}@${HOSTNAME}" switch 2> /dev/null
rm result 2> /dev/null || true