chore: reorganise common modules

Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>

hosts/common/global/default.nix

@@ -0,0 +1,20 @@
+# This config will be applied to all hosts
+{
+  inputs,
+  outputs,
+  ...
+}:
+{
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+    inputs.lix-module.nixosModules.default
+    inputs.sops-nix.nixosModules.sops
+
+    ./locale.nix
+  ];
+
+  home-manager.useGlobalPkgs = true;
+  home-manager.extraSpecialArgs = { inherit inputs outputs; };
+
+  networking.domain = "lndr.be";
+}

hosts/common/global/locale.nix

@@ -0,0 +1,21 @@
+{ lib, ... }:
+{
+  time.timeZone = lib.mkDefault "Europe/Brussels";
+
+  location.provider = "geoclue2";
+
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    extraLocaleSettings = {
+      LC_ADDRESS = "nl_BE.UTF-8";
+      LC_IDENTIFICATION = "nl_BE.UTF-8";
+      LC_MEASUREMENT = "nl_BE.UTF-8";
+      LC_MONETARY = "nl_BE.UTF-8";
+      LC_NAME = "nl_BE.UTF-8";
+      LC_NUMERIC = "nl_BE.UTF-8";
+      LC_PAPER = "nl_BE.UTF-8";
+      LC_TELEPHONE = "nl_BE.UTF-8";
+      LC_TIME = "nl_BE.UTF-8";
+    };
+  };
+}

hosts/common/users/lander/default.nix

@@ -0,0 +1,20 @@
+{ pkgs, config, lib, ... }:
+let
+  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+in
+{
+  users.users.lander = {
+    isNormalUser = true;
+    description = "Lander";
+    extraGroups = ifTheyExist [
+      "networkmanager"
+      "wheel"
+    ];
+
+    packages = with pkgs; [
+        pkgs.home-manager
+    ];
+  };
+
+  home-manager.users.lander = import ../../../../home/lander/${config.networking.hostName}.nix;
+}

hosts/wodan/default.nix

@@ -1,16 +1,15 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
 { config, pkgs, ... }:
 
 {
   imports =
-    [ # Include the results of the hardware scan.
+    [
       ./hardware-configuration.nix
-      ./home-manager.nix
-      ./yubikey-gpg.nix
-      ./virt.nix 
+
+      ../common/global
+      ../common/users/lander
+
+      ../common/optional/yubikey-gpg.nix
+      ../common/optional/virt.nix 
     ];
 
   # Bootloader.
@@ -28,24 +27,6 @@
   # Enable networking
   networking.networkmanager.enable = true;
 
-  # Set your time zone.
-  time.timeZone = "Europe/Brussels";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "nl_BE.UTF-8";
-    LC_IDENTIFICATION = "nl_BE.UTF-8";
-    LC_MEASUREMENT = "nl_BE.UTF-8";
-    LC_MONETARY = "nl_BE.UTF-8";
-    LC_NAME = "nl_BE.UTF-8";
-    LC_NUMERIC = "nl_BE.UTF-8";
-    LC_PAPER = "nl_BE.UTF-8";
-    LC_TELEPHONE = "nl_BE.UTF-8";
-    LC_TIME = "nl_BE.UTF-8";
-  };
-
   # Enable the X11 windowing system.
   services.xserver.enable = true;
 
@@ -82,14 +63,6 @@
   # services.xserver.libinput.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.lander = {
-    isNormalUser = true;
-    description = "Lander";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-    #  thunderbird
-    ];
-  };
 
   # Install firefox.
   programs.firefox.enable = true;

hosts/wodan/home-manager.nix

@@ -1,12 +0,0 @@
-{ inputs, outputs, ... }: {
-  imports = [
-    inputs.home-manager.nixosModules.home-manager
-  ];
-
-  home-manager = {
-    extraSpecialArgs = { inherit inputs outputs; };
-    users = {
-      lander = import ../../home-manager/home.nix;
-    };
-  };
-}