From 43de971de3f8860bbbc0c57a183e54264aae4dfb Mon Sep 17 00:00:00 2001
From: Laurent Gueret <gueretlob@pm.me>
Date: Wed, 11 Feb 2026 20:04:42 +0100
Subject: [PATCH] Fix on configuration files

---
 hosts/nixos/home/users/alistreaza.nix         |  3 +-
 hosts/nixos/system/hardware-configuration.nix | 49 +++++++------------
 hosts/nixos/system/partials/zsh.nix           |  1 +
 modules/home/common/env.nix                   |  4 +-
 modules/home/common/git.nix                   |  1 +
 modules/home/common/zsh.nix                   |  2 +-
 6 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/hosts/nixos/home/users/alistreaza.nix b/hosts/nixos/home/users/alistreaza.nix
index b91190a..37d00d7 100644
--- a/hosts/nixos/home/users/alistreaza.nix
+++ b/hosts/nixos/home/users/alistreaza.nix
@@ -16,8 +16,9 @@
     home.shell.zsh.enable = true;
     home.shell.git.enable = true;
     home.shell.neovim.enable = true;
+
     home.shell.nh.enable = true;
-    home.shell.devenv.enable = true;
+    home.shell.env.enable = true;
 
     # Code editor
     home.ide.zed.enable = true;
diff --git a/hosts/nixos/system/hardware-configuration.nix b/hosts/nixos/system/hardware-configuration.nix
index 9f3de55..cfd79d1 100644
--- a/hosts/nixos/system/hardware-configuration.nix
+++ b/hosts/nixos/system/hardware-configuration.nix
@@ -1,47 +1,32 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usbhid"
-    "uas"
-    "sd_mod"
-  ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "uas" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/6c7250d7-8a40-4b12-94de-276c4b325473";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/3baee95a-6c53-4e20-90c0-946e1faf3d24";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/2620-29F6";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/2731-04DA";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/ad7bef67-655a-4800-8882-17bb5c61ec62"; }
     ];
-  };
-
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/7c10a8e6-c396-457e-a66f-577bd217b2e3"; }
-  ];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/hosts/nixos/system/partials/zsh.nix b/hosts/nixos/system/partials/zsh.nix
index dbde0ef..38c654b 100644
--- a/hosts/nixos/system/partials/zsh.nix
+++ b/hosts/nixos/system/partials/zsh.nix
@@ -2,5 +2,6 @@
 {
   programs.zsh = {
     enable = true;
+    enableCompletion = true;
   };
 }
diff --git a/modules/home/common/env.nix b/modules/home/common/env.nix
index 73988b3..7db6970 100644
--- a/modules/home/common/env.nix
+++ b/modules/home/common/env.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.home.shell.devenv;
+  cfg = config.home.shell.env;
 in
 {
-  options.home.shell.devenv = {
+  options.home.shell.env = {
     enable = mkEnableOption "System devenv service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/common/git.nix b/modules/home/common/git.nix
index 6853e90..01e3c8c 100644
--- a/modules/home/common/git.nix
+++ b/modules/home/common/git.nix
@@ -14,6 +14,7 @@ in
   config = mkIf cfg.enable {
 
     programs.git = {
+      enable = true;
       settings = {
         user = {
           name = "Laurent Gueret";
diff --git a/modules/home/common/zsh.nix b/modules/home/common/zsh.nix
index bedc245..2ef461a 100644
--- a/modules/home/common/zsh.nix
+++ b/modules/home/common/zsh.nix
@@ -10,7 +10,7 @@ in
   config = mkIf cfg.enable {
 
     programs.zsh = {
-      enableCompletion = true;
+      enable = true;
       autosuggestion.enable = true;
       syntaxHighlighting.enable = true;
       oh-my-zsh = {