From b28a7d7fbb60f0953f47c62e1a1732aad66f7d33 Mon Sep 17 00:00:00 2001 From: Martin Berg Alstad Date: Mon, 30 Dec 2024 20:21:06 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=87=B3=F0=9F=87=B4/=F0=9F=87=AC?= =?UTF-8?q?=F0=9F=87=A7=20Locale=20switcher?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Added no to list of keyboard locales. - Added no and gb to list of supported locales. - Added a waybar language switcher, that can be clicked to toggle - Toggle languages using ALT+SHIFT - Enable numlock at boot --- configuration.nix | 57 ++++++------------------ home/hyprland/hyprland.conf | 5 ++- home/hyprland/waybar/config/config.jsonc | 9 +++- home/hyprland/waybar/config/style.css | 9 +++- locale.nix | 36 +++++++++++++++ 5 files changed, 67 insertions(+), 49 deletions(-) create mode 100644 locale.nix diff --git a/configuration.nix b/configuration.nix index 1e2d8b4..7152e7d 100644 --- a/configuration.nix +++ b/configuration.nix @@ -17,33 +17,13 @@ ./networking.nix ./development.nix ./security.nix + ./locale.nix ]; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - # Set your time zone. - time.timeZone = "Europe/Oslo"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_GB.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "nb_NO.UTF-8"; - LC_IDENTIFICATION = "nb_NO.UTF-8"; - LC_MEASUREMENT = "nb_NO.UTF-8"; - LC_MONETARY = "nb_NO.UTF-8"; - LC_NAME = "nb_NO.UTF-8"; - LC_NUMERIC = "nb_NO.UTF-8"; - LC_PAPER = "nb_NO.UTF-8"; - LC_TELEPHONE = "nb_NO.UTF-8"; - LC_TIME = "nb_NO.UTF-8"; - }; - - # Configure console keymap - console.keyMap = "uk"; - # Define a user account. Don't forget to set a password with ‘passwd’. users.users.martin = { isNormalUser = true; @@ -124,6 +104,7 @@ services = { displayManager.sddm = { enable = true; + autoNumlock = true; # Enable numlock at login wayland.enable = true; }; @@ -135,11 +116,6 @@ enable = true; # Load Nvidia driver for Xorg and Wayland videoDrivers = [ "nvidia" ]; - # Configure keymap in X11 - xkb = { - layout = "gb"; - variant = ""; - }; }; }; @@ -156,26 +132,19 @@ }; }; - qt = { - enable = true; - #platformTheme = "gnome"; - #style = "adwaita-dark"; - }; + qt.enable = true; # Enable OpenGL - hardware.graphics = { - enable = true; - }; - - hardware.nvidia = { - # Required - modesetting.enable = true; - - # Use closed-source drivers - open = false; - - # Enable the Nvidia settings menu - nvidiaSettings = true; + hardware = { + graphics.enable = true; + nvidia = { + # Required + modesetting.enable = true; + # Use closed-source drivers + open = false; + # Enable the Nvidia settings menu + nvidiaSettings = true; + }; }; xdg.mime.defaultApplications = { diff --git a/home/hyprland/hyprland.conf b/home/hyprland/hyprland.conf index b6fd895..0770fc6 100644 --- a/home/hyprland/hyprland.conf +++ b/home/hyprland/hyprland.conf @@ -254,11 +254,12 @@ misc { ############# # https://wiki.hyprland.org/Configuring/Variables/#input +# Must match configs in nixos! input { - kb_layout = gb + kb_layout = gb,no kb_variant = kb_model = - kb_options = + kb_options = grp:alt_shift_toggle kb_rules = follow_mouse = 1 diff --git a/home/hyprland/waybar/config/config.jsonc b/home/hyprland/waybar/config/config.jsonc index 8b233ac..5b9ea95 100644 --- a/home/hyprland/waybar/config/config.jsonc +++ b/home/hyprland/waybar/config/config.jsonc @@ -13,11 +13,12 @@ "hyprland/window" ], "modules-right": [ + "hyprland/language", "wireplumber", "backlight", "clock", - "tray", "custom/notification", + "tray", "custom/lock", "custom/power" ], @@ -87,6 +88,12 @@ }, "on-click": "pavucontrol" }, + "hyprland/language": { + "format-en": "EN", + "format-no": "NO", + "keyboard-name": "logitech-logitech-g710-keyboard", + "on-click": "hyprctl switchxkblayout logitech-logitech-g710-keyboard next" + }, "custom/lock": { "tooltip": false, "on-click": "sh -c '(sleep 0.5s; swaylock)' & disown", diff --git a/home/hyprland/waybar/config/style.css b/home/hyprland/waybar/config/style.css index 8a14e51..72bc2ea 100644 --- a/home/hyprland/waybar/config/style.css +++ b/home/hyprland/waybar/config/style.css @@ -35,6 +35,7 @@ border-radius: 1rem; } +#language, #window, #custom-notification, #custom-music, @@ -61,10 +62,14 @@ border-radius: 0; } +#language { + color: @red; + border-radius: 1rem 0 0 1rem; + margin-left: 1rem; +} + #wireplumber { color: @maroon; - border-radius: 1rem 0px 0px 1rem; - margin-left: 1rem; } #custom-music { diff --git a/locale.nix b/locale.nix new file mode 100644 index 0000000..c5db006 --- /dev/null +++ b/locale.nix @@ -0,0 +1,36 @@ +{ ... }: + +# TODO move locale config for hyprland here +{ + # Configure console keymap + console.keyMap = "uk"; + + # Select internationalisation properties. + i18n = { + defaultLocale = "en_GB.UTF-8"; + supportedLocales = [ + "en_GB.UTF-8/UTF-8" + "nb_NO.UTF-8/UTF-8" + ]; + extraLocaleSettings = { + LC_ADDRESS = "nb_NO.UTF-8"; + LC_IDENTIFICATION = "nb_NO.UTF-8"; + LC_MEASUREMENT = "nb_NO.UTF-8"; + LC_MONETARY = "nb_NO.UTF-8"; + LC_NAME = "nb_NO.UTF-8"; + LC_NUMERIC = "nb_NO.UTF-8"; + LC_PAPER = "nb_NO.UTF-8"; + LC_TELEPHONE = "nb_NO.UTF-8"; + LC_TIME = "nb_NO.UTF-8"; + }; + }; + + # Configure keymaps + services.xserver.xkb = { + layout = "gb,no"; + options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT + }; + + # Set your time zone. + time.timeZone = "Europe/Oslo"; +}