From 8eb2d911b2f15543598788cb0548521fe6b03e99 Mon Sep 17 00:00:00 2001 From: Gabriella Bere Date: Thu, 22 Aug 2024 11:13:44 +0100 Subject: [PATCH] clean up default xkb option setting, enabled hyprland again --- hosts/gabbielaptop/configuration.nix | 7 ++----- hosts/gabbielaptop/home.nix | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/hosts/gabbielaptop/configuration.nix b/hosts/gabbielaptop/configuration.nix index 15f6939..250b121 100644 --- a/hosts/gabbielaptop/configuration.nix +++ b/hosts/gabbielaptop/configuration.nix @@ -19,7 +19,7 @@ nix.settings.experimental-features = [ "nix-command" "flakes" ]; # default kernel causes issues with wpa_supplicant meaning shutdown times are > 10 mins updating to kernel 69 fixes this - boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_9; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_10; networking.hostName = "gabbielaptop"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -61,10 +61,7 @@ services.desktopManager.plasma6.enable = true; # Configure keymap in X11 - services.xserver.xkb = { - layout = "gb"; - variant = ""; - }; + services.xserver.xkb.layout = "gb"; # Configure console keymap console.keyMap = "uk"; diff --git a/hosts/gabbielaptop/home.nix b/hosts/gabbielaptop/home.nix index 211bba4..1167b91 100644 --- a/hosts/gabbielaptop/home.nix +++ b/hosts/gabbielaptop/home.nix @@ -73,5 +73,6 @@ # Let Home Manager install and manage itself. programs.home-manager.enable = true; + # Enable Hyprland compositor wayland.windowManager.hyprland.enable = true; }