extern/zaneyos
1
0
Fork 1
mirror of https://gitlab.com/Zaney/zaneyos.git synced 2024-11-21 14:13:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added keyboard layout support during install

Browse Source
This commit is contained in:
Zsolt Németh 2024-07-24 15:32:51 +02:00
parent a2efb8a089
commit 39ba31d669
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/hyprland.nix
View File

@ -14,6 +14,7 @@ let
browser browser
terminal terminal
extraMonitorSettings extraMonitorSettings
keyboardLayout
; ;
in in
with lib; with lib;
@ -63,7 +64,7 @@ with lib;
col.inactive_border = rgb(${config.stylix.base16Scheme.base01}) col.inactive_border = rgb(${config.stylix.base16Scheme.base01})
} }
input { input {
kb_layout = us kb_layout = ${keyboardLayout}
kb_options = grp:alt_shift_toggle kb_options = grp:alt_shift_toggle
kb_options = caps:super kb_options = caps:super
follow_mouse = 1 follow_mouse = 1

10
hosts/default/config.nix
View File

@ -6,7 +6,9 @@
options, options,
... ...
}: }:
let
inherit (import ../hosts/${host}/variables.nix) keyboardLayout;
in
{ {
imports = [ imports = [
./hardware.nix ./hardware.nix
@ -329,7 +331,7 @@
xserver = { xserver = {
enable = false; enable = false;
xkb = { xkb = {
layout = "us"; layout = "${keyboardLayout}";
variant = ""; variant = "";
}; };
}; };
@ -359,7 +361,7 @@
printing = { printing = {
enable = true; enable = true;
drivers = [ drivers = [
# pkgs.hplipWithPlugin # pkgs.hplipWithPlugin
]; ];
}; };
gnome.gnome-keyring.enable = true; gnome.gnome-keyring.enable = true;
@ -467,6 +469,8 @@
driSupport32Bit = true; driSupport32Bit = true;
}; };
console.keyMap = "${keyboardLayout}";
# Open ports in the firewall. # Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ];

1
hosts/default/variables.nix
View File

@ -12,4 +12,5 @@
# Program Options # Program Options
browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome) browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome)
terminal = "kitty"; # Set Default System Terminal terminal = "kitty"; # Set Default System Terminal
keyboardLayout = "us";
} }

8
install-zaneyos.sh
View File

@ -65,6 +65,14 @@ git config --global user.email "installer@gmail.com"
git add . git add .
sed -i "/^\s*host[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$hostName\"/" ./flake.nix sed -i "/^\s*host[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$hostName\"/" ./flake.nix
read -rp "Enter your keyboard layout: [ us ] " keyboardLayout
if [ -z "$keyboardLayout" ]; then
keyboardLayout="us"
fi
sed -i "/^\s*keyboardLayout[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"$keyboardLayout\"/" ./hosts/$hostName/variables.nix
echo "-----" echo "-----"
installusername=$(echo $USER) installusername=$(echo $USER)