flake.lock

@@ -25,11 +25,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758545873,
+        "lastModified": 1756022458,
-        "narHash": "sha256-0VP5cVd6DyibHNPC/IJ5Ut+KuNYUeKmr5ltzf+IcpjA=",
+        "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "de5369834ff1f75246c46be89ef993392e961c26",
+        "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
         "type": "github"
       },
       "original": {
@@ -64,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758506415,
+        "lastModified": 1754100706,
-        "narHash": "sha256-nM3vIhN+dRm37VsaDLtnvYrTSJ44RxetY3rzJVT9Z7c=",
+        "narHash": "sha256-ctRwk+Fjl/jxN+J6GjD9pYmnyHvgR2ub04q1pXeaAho=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "d7cdbfe6c5f85827da2e10bc0c093e2808c341ec",
+        "rev": "1656ec240ab8de9f78eba6f38c5ae5f0d5c6d936",
         "type": "github"
       },
       "original": {
@@ -79,11 +79,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1757943327,
+        "lastModified": 1753122741,
-        "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=",
+        "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05",
+        "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1758277210,
+        "lastModified": 1753939845,
-        "narHash": "sha256-iCGWf/LTy+aY0zFu8q12lK8KuZp7yvdhStehhyX1v8w=",
+        "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
+        "rev": "94def634a20494ee057c76998843c015909d6311",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758425756,
+        "lastModified": 1752544651,
-        "narHash": "sha256-L3N8zV6wsViXiD8i3WFyrvjDdz76g3tXKEdZ4FkgQ+Y=",
+        "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "e0fdaea3c31646e252a60b42d0ed8eafdb289762",
+        "rev": "2c8def626f54708a9c38a5861866660395bb3461",
         "type": "github"
       },
       "original": {

flake.nix

@@ -59,7 +59,7 @@
 
       # Specify your home configuration modules here, for example,
       # the path to your home.nix.
-      modules = [ ./homes/scalizer ];
+      modules = [ ./home.nix ];
 
       # Optionally use extraSpecialArgs
       # to pass through arguments to home.nix

homes/me/default.nix

@@ -1,130 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-
-  home.stateVersion = "25.05"; # Please read the comment before changing.
-
-  programs.bash.enable = true;
-
-  programs.fish = {
-    enable = true;
-  };
-
-  programs.git = {
-    enable = true;
-    userName = "Julien Hémono";
-    userEmail = "julien@hemono.fr";
-  };
-
-  programs.jujutsu = {
-    enable = true;
-    settings = {
-      user = {
-        email = "julien@hemono.fr";
-        name = "Julien Hémono";
-      };
-      ui.default-command = "log";
-    };
-  };
-
-  programs.gh = {
-    enable = true;
-  };
-
-  programs.helix = {
-    enable = true;
-    defaultEditor = true;
-  };
-
-  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
-  ];
-
-  # Home Manager is pretty good at managing dotfiles. The primary way to manage
-  # plain files is through 'home.file'.
-  home.file = {
-    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
-    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
-    # # symlink to the Nix store copy.
-    # ".screenrc".source = dotfiles/screenrc;
-
-    # # You can also set the file content immediately.
-    # ".gradle/gradle.properties".text = ''
-    #   org.gradle.console=verbose
-    #   org.gradle.daemon.idletimeout=3600000
-    # '';
-  };
-
-  # Home Manager can also manage your environment variables through
-  # 'home.sessionVariables'. These will be explicitly sourced when using a
-  # shell provided by Home Manager. If you don't want to manage your shell
-  # through Home Manager then you have to manually source 'hm-session-vars.sh'
-  # located at either
-  #
-  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
-  #
-  # or
-  #
-  #  /etc/profiles/per-user/julien/etc/profile.d/hm-session-vars.sh
-  #
-  home.sessionVariables = {
-  };
-
-}

hosts/gwiad/configuration.nix

@@ -8,7 +8,6 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ./home.nix
       # Services
       ./btrbk.nix
       ./syncthing.nix
@@ -42,10 +41,64 @@
     ];
   };
 
+  # User account
+  users.users.jhemono = {
+    isNormalUser = true;
+    uid = 1000;
+    extraGroups = [ "wheel" ]; # Enable 'sudo' for the user.
+    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
+      # poetry
+      pre-commit
+      # nodejs
+      uv
+    ];
+  };
+  users.groups.jhemono.gid = 1000;
+
   # System packages
   environment.systemPackages = with pkgs; [
     android-tools
     bc
+    devenv
     git
     htop
     jq
@@ -58,6 +111,12 @@
     zip
   ];
 
+  programs.firefox = {
+    enable = true;
+    nativeMessagingHosts.packages = with pkgs; [ passff-host ];
+  };
+  programs.browserpass.enable = true;
+
   virtualisation.docker.rootless = {
     enable = true;
     setSocketVariable = true;
@@ -72,12 +131,12 @@
   services.xserver = {
     enable = true;
     xkb.layout = "fr";
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
     excludePackages = with pkgs; [
       xterm
     ];
   };
-  services.displayManager.gdm.enable = true;
-  services.desktopManager.gnome.enable = true;
   environment.gnome.excludePackages = with pkgs; [
     epiphany
     geary
@@ -88,19 +147,15 @@
   environment.variables.EDITOR = "vim";
 
   # Nix configuration
-  nix = {
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
-    gc = {
+  nix.gc = {
     automatic = true;
     dates = "weekly";
     options = "--delete-older-than 7d";
   };
-    settings = {
+  nix.settings.auto-optimise-store = true;
-      experimental-features = [ "nix-command" "flakes" ];
+  nix.settings.trusted-users = [ "jhemono" ];
-      auto-optimise-store = true;
+  nix.channel.enable = false;
-      trusted-users = [ "jhemono" ];
-    };
-    channel.enable = false;
-  };
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.

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;
-  };
-}