From 0e4e976a2d08f2bd99c320bff51d65dcd09105be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20R=C3=B6ger?= Date: Sat, 13 Apr 2024 23:12:09 +0200 Subject: [PATCH] put system modules back into host configurations --- hosts/comfy-station/configuration.nix | 38 ++++++++++++++++++++++++--- hosts/vm/configuration.nix | 38 ++++++++++++++++++++++++--- modules/system/boot.nix | 6 ----- modules/system/console.nix | 6 ----- modules/system/localization.nix | 21 --------------- modules/system/network.nix | 13 --------- 6 files changed, 68 insertions(+), 54 deletions(-) delete mode 100644 modules/system/boot.nix delete mode 100644 modules/system/console.nix delete mode 100644 modules/system/localization.nix delete mode 100644 modules/system/network.nix diff --git a/hosts/comfy-station/configuration.nix b/hosts/comfy-station/configuration.nix index 8d5ea75..e47f574 100644 --- a/hosts/comfy-station/configuration.nix +++ b/hosts/comfy-station/configuration.nix @@ -9,10 +9,6 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix inputs.home-manager.nixosModules.home-manager - ../../modules/system/boot.nix - ../../modules/system/console.nix - ../../modules/system/localization.nix - ../../modules/system/network.nix ../../modules/hardware/bluetooth.nix ../../modules/hardware/printing.nix ../../modules/hardware/sound.nix @@ -75,4 +71,38 @@ # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "23.11"; # Did you read the comment? + # boot + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # Configure console keymap + console.keyMap = "de"; + + # Set your time zone. + time.timeZone = "Europe/Berlin"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "de_DE.UTF-8"; + LC_IDENTIFICATION = "de_DE.UTF-8"; + LC_MEASUREMENT = "de_DE.UTF-8"; + LC_MONETARY = "de_DE.UTF-8"; + LC_NAME = "de_DE.UTF-8"; + LC_NUMERIC = "de_DE.UTF-8"; + LC_PAPER = "de_DE.UTF-8"; + LC_TELEPHONE = "de_DE.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; + + networking.hostName = "comfy-station"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; } diff --git a/hosts/vm/configuration.nix b/hosts/vm/configuration.nix index f58afdd..8b788c4 100644 --- a/hosts/vm/configuration.nix +++ b/hosts/vm/configuration.nix @@ -9,10 +9,6 @@ [ # Include the results of the hardware scan. ./hardware-configuration.nix inputs.home-manager.nixosModules.home-manager - ../../modules/system/boot.nix - ../../modules/system/console.nix - ../../modules/system/localization.nix - ../../modules/system/network.nix ../../modules/hardware/bluetooth.nix ../../modules/hardware/printing.nix ../../modules/hardware/sound.nix @@ -80,4 +76,38 @@ # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "23.11"; # Did you read the comment? + # boot + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # Configure console keymap + console.keyMap = "de"; + + # Set your time zone. + time.timeZone = "Europe/Berlin"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "de_DE.UTF-8"; + LC_IDENTIFICATION = "de_DE.UTF-8"; + LC_MEASUREMENT = "de_DE.UTF-8"; + LC_MONETARY = "de_DE.UTF-8"; + LC_NAME = "de_DE.UTF-8"; + LC_NUMERIC = "de_DE.UTF-8"; + LC_PAPER = "de_DE.UTF-8"; + LC_TELEPHONE = "de_DE.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; + + networking.hostName = "vm"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Enable networking + networking.networkmanager.enable = true; } diff --git a/modules/system/boot.nix b/modules/system/boot.nix deleted file mode 100644 index f60cdb3..0000000 --- a/modules/system/boot.nix +++ /dev/null @@ -1,6 +0,0 @@ -{config, ...}: -{ - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; -} \ No newline at end of file diff --git a/modules/system/console.nix b/modules/system/console.nix deleted file mode 100644 index 4f52fed..0000000 --- a/modules/system/console.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, ... }: - -{ - # Configure console keymap - console.keyMap = "de"; -} \ No newline at end of file diff --git a/modules/system/localization.nix b/modules/system/localization.nix deleted file mode 100644 index 80ce299..0000000 --- a/modules/system/localization.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, ... }: - -{ - # Set your time zone. - time.timeZone = "Europe/Berlin"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "de_DE.UTF-8"; - LC_IDENTIFICATION = "de_DE.UTF-8"; - LC_MEASUREMENT = "de_DE.UTF-8"; - LC_MONETARY = "de_DE.UTF-8"; - LC_NAME = "de_DE.UTF-8"; - LC_NUMERIC = "de_DE.UTF-8"; - LC_PAPER = "de_DE.UTF-8"; - LC_TELEPHONE = "de_DE.UTF-8"; - LC_TIME = "de_DE.UTF-8"; - }; -} \ No newline at end of file diff --git a/modules/system/network.nix b/modules/system/network.nix deleted file mode 100644 index 1756aef..0000000 --- a/modules/system/network.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, ... }: - -{ - networking.hostName = "comfy-station"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking - networking.networkmanager.enable = true; -} \ No newline at end of file