diff --git a/flake.nix b/flake.nix index bc7a327e..34d6d993 100644 --- a/flake.nix +++ b/flake.nix @@ -14,31 +14,6 @@ nixpkgs, home-manager, }: let - locale-en_GB = { - services.xserver = { - layout = "gb"; - xkbVariant = ""; - }; - console.keyMap = "uk"; - - # Set your time zone. - time.timeZone = "Europe/London"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_GB.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_GB.UTF-8"; - LC_IDENTIFICATION = "en_GB.UTF-8"; - LC_MEASUREMENT = "en_GB.UTF-8"; - LC_MONETARY = "en_GB.UTF-8"; - LC_NAME = "en_GB.UTF-8"; - LC_NUMERIC = "en_GB.UTF-8"; - LC_PAPER = "en_GB.UTF-8"; - LC_TELEPHONE = "en_GB.UTF-8"; - LC_TIME = "en_GB.UTF-8"; - }; - }; hardware-audio = {pkgs, ...}: { # Enable sound with pipewire. sound.enable = true; @@ -64,7 +39,6 @@ system = "x86_64-linux"; modules = [ home-manager.nixosModules.home-manager - locale-en_GB ./hosts/Legion/configuration.nix ./common.nix ./services/Legion.nix @@ -74,7 +48,6 @@ system = "x86_64-linux"; modules = [ home-manager.nixosModules.home-manager - locale-en_GB hardware-audio hardware-bluetooth ./hosts/N0245/configuration.nix diff --git a/hosts/Legion/configuration.nix b/hosts/Legion/configuration.nix index 27be2c7d..66ea34d7 100644 --- a/hosts/Legion/configuration.nix +++ b/hosts/Legion/configuration.nix @@ -11,6 +11,30 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + services.xserver = { + layout = "gb"; + xkbVariant = ""; + }; + console.keyMap = "uk"; + + # Set your time zone. + time.timeZone = "Europe/London"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_GB.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_GB.UTF-8"; + LC_IDENTIFICATION = "en_GB.UTF-8"; + LC_MEASUREMENT = "en_GB.UTF-8"; + LC_MONETARY = "en_GB.UTF-8"; + LC_NAME = "en_GB.UTF-8"; + LC_NUMERIC = "en_GB.UTF-8"; + LC_PAPER = "en_GB.UTF-8"; + LC_TELEPHONE = "en_GB.UTF-8"; + LC_TIME = "en_GB.UTF-8"; + }; + networking = { hostName = "Legion"; # Define your hostname. nameservers = ["192.168.1.230" "127.0.0.1" "9.9.9.9"]; diff --git a/hosts/N0245/configuration.nix b/hosts/N0245/configuration.nix index fe442658..91658a5d 100644 --- a/hosts/N0245/configuration.nix +++ b/hosts/N0245/configuration.nix @@ -25,6 +25,30 @@ boot.initrd.luks.devices."luks-761eeb11-3091-4142-9232-4fb33165eccd".device = "/dev/disk/by-uuid/761eeb11-3091-4142-9232-4fb33165eccd"; boot.initrd.luks.devices."luks-761eeb11-3091-4142-9232-4fb33165eccd".keyFile = "/crypto_keyfile.bin"; + services.xserver = { + layout = "gb"; + xkbVariant = ""; + }; + console.keyMap = "uk"; + + # Set your time zone. + time.timeZone = "Europe/London"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_GB.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "en_GB.UTF-8"; + LC_IDENTIFICATION = "en_GB.UTF-8"; + LC_MEASUREMENT = "en_GB.UTF-8"; + LC_MONETARY = "en_GB.UTF-8"; + LC_NAME = "en_GB.UTF-8"; + LC_NUMERIC = "en_GB.UTF-8"; + LC_PAPER = "en_GB.UTF-8"; + LC_TELEPHONE = "en_GB.UTF-8"; + LC_TIME = "en_GB.UTF-8"; + }; + networking.hostName = "N0245"; # Define your hostname. system.autoUpgrade = { enable = false;