From 6ef0f3707d3db994d13a843a32b097c93739604e Mon Sep 17 00:00:00 2001
From: Giulio De Pasquale <depasquale+git@giugl.io>
Date: Thu, 1 Jul 2021 03:13:41 +0200
Subject: [PATCH 1/2] import home-manager files

---
 users.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/users.nix b/users.nix
index fc56c82..fcf4c1b 100644
--- a/users.nix
+++ b/users.nix
@@ -1,10 +1,16 @@
 {config, pkgs, ...}:
 
 {
+  imports = [ <home-manager/nixos> ];
+
   users.users.giulio = {
     description = "Giulio De Pasquale";
     isNormalUser = true;
     shell = pkgs.zsh;
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
   };
+
+  home-manager.users.giulio = {
+    imports = [ ./home ];
+  };
 }

From 5f70797834c021c0b75130b5f9d61b57da623e52 Mon Sep 17 00:00:00 2001
From: Giulio De Pasquale <depasquale+git@giugl.io>
Date: Thu, 1 Jul 2021 03:23:08 +0200
Subject: [PATCH 2/2] renamed deprecated options

---
 common.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/common.nix b/common.nix
index 13fe971..c3ed937 100644
--- a/common.nix
+++ b/common.nix
@@ -2,12 +2,14 @@
 
 {
   # Select internationalisation properties.
-  i18n = {
-    consoleFont = "Lat2-Terminus16";
-    consoleKeyMap = "us";
-    defaultLocale = "en_US.UTF-8";
+
+  console = {
+    keyMap = "us";
+    font = "Lat2-Terminus16";
   };
 
+  i18n.defaultLocale = "en_US.UTF-8";
+
   nix = {
     autoOptimiseStore = true;
     nixPath = [