Modularize with numtide/blueprint

hosts/gwiad/configuration.nix

@@ -1,19 +1,13 @@
-# Edit this configuration file to define what should be installed on
-# your system. Help is available in the configuration.nix(5) man page, on
-# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
-
-{ config, lib, pkgs, inputs, outputs, ... }:
-
+{ inputs, flake, pkgs, hostName, ... }:
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ../common
-      ./home.nix
-      # Services
-      ./btrbk.nix
-      ./syncthing.nix
-    ];
+  imports = with flake.nixosModules; [
+    ./hardware-configuration.nix
+    base
+    jhemono
+    # Services
+    ./btrbk.nix
+    ./syncthing.nix
+  ];
 
   # Boot configuration
   boot.loader.systemd-boot.enable = true;
@@ -21,7 +15,7 @@
   boot.loader.efi.canTouchEfiVariables = true;
 
   # Networking
-  networking.hostName = "gwiad";
+  networking.hostName = hostName;
   networking.networkmanager.enable = true;
 
   # Set your time zone.
@@ -32,6 +26,9 @@
     keyMap = "fr";
   };
 
+  users.users.jhemono.uid = 1000;
+  users.groups.jhemono.gid = 1000;
+
   # Enable CUPS to print documents.
   # services.printing.enable = true;
 

hosts/gwiad/home.nix

@@ -1,25 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system. Help is available in the configuration.nix(5) man page, on
-# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
-
-{ config, lib, pkgs, inputs, outputs, ... }:
-
-{
-  imports = [
-    inputs.home-manager.nixosModules.home-manager
-  ];
-
-  users.users.jhemono = {
-    isNormalUser = true;
-    uid = 1000;
-    extraGroups = [ "wheel" ]; # Enable 'sudo' for the user.
-  };
-  users.groups.jhemono.gid = 1000;
-
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    backupFileExtension = "bak";
-    users.jhemono = ../../homes/me;
-  };
-}

hosts/gwiad/users/jhemono.nix

@@ -0,0 +1,69 @@
+{ flake, config, pkgs, ... }:
+
+{
+
+  imports = with flake.homeModules; [
+    base
+    git
+  ];
+
+  home.stateVersion = "25.05"; # Please read the comment before changing.
+
+  programs.uv.enable = true;
+
+  programs.firefox = {
+    enable = true;
+    nativeMessagingHosts = with pkgs; [ passff-host ];
+  };
+
+  programs.browserpass.enable = true;
+
+  # The home.packages option allows you to install Nix packages into your
+  # environment.
+  home.packages = with pkgs; let
+    tex = texlive.combine {
+      inherit (texlive)
+      scheme-basic
+      moderncv
+      fontawesome5
+      pgf # For tikz.sty
+      multirow
+      arydshln;
+    };
+    my-vscode = vscode-with-extensions.override {
+      vscodeExtensions = with vscode-marketplace; [
+        ms-python.python
+        ms-python.vscode-pylance
+        ms-python.debugpy
+        ms-python.black-formatter
+        ms-python.isort
+        ms-vscode-remote.remote-containers
+        github.copilot
+        github.copilot-chat
+        dbaeumer.vscode-eslint
+      ];
+    };
+  in [
+    chromium
+    docker-compose
+    drawing
+    hunspell
+    hunspellDicts.fr-classique
+    # inkscape
+    libreoffice-fresh
+    my-vscode
+    # nixfmt
+    pass-wayland
+    pwgen
+    # scribus
+    tex
+
+    # General development
+    # dbeaver-bin
+    devenv
+    # poetry
+    pre-commit
+    # nodejs
+  ];
+
+}