feat: initial switch from hm to hjem

configs/common.nix

@@ -5,15 +5,12 @@
   _utils,
   agenix,
   camasca,
-  home-manager,
+  hjem,
   nixpkgs,
   vencord,
   ...
 }:
 let
-  username = "leo";
-  stateVersion = "24.11";
-
   rootPassword = _utils.setupSingleSecret config "rootPassword" { };
   secrets = _utils.setupSharedSecrets config {
     secrets = [ "userPassword" ];
@@ -22,9 +19,7 @@ in
 {
   imports = [
     agenix.nixosModules.default
-    home-manager.nixosModules.home-manager
-
-    (lib.mkAliasOptionModule [ "hm" ] [ "home-manager" "users" username ])
+    hjem.nixosModules.default
 
     rootPassword.generate
     secrets.generate
@@ -69,21 +64,17 @@ in
     wget
   ];
 
-  hm = {
-    home = { inherit stateVersion; };
-
-    programs.ssh = {
-      enable = true;
-      addKeysToAgent = "yes";
-      forwardAgent = true;
+  hjem = {
+    clobberByDefault = true;
+    users.leo.files = {
+      ".ssh/config".text = ''
+        Host *
+          ForwardAgent yes
+          AddKeysToAgent yes
+      '';
     };
   };
 
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-  };
-
   i18n.defaultLocale = "en_US.UTF-8";
 
   networking = {
@@ -199,7 +190,7 @@ in
   time.timeZone = "Europe/Paris";
 
   users.users = {
-    "${username}" = {
+    leo = {
       isNormalUser = true;
       shell = pkgs.fish;
       extraGroups = [
@@ -228,5 +219,5 @@ in
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = lib.mkDefault stateVersion; # Did you read the comment?
+  system.stateVersion = lib.mkDefault "24.11"; # Did you read the comment?
 }

configs/desktop.nix

@@ -14,6 +14,7 @@
     ../programs/ghostty.nix
     ../programs/gnome.nix
     ../programs/java.nix
+    ../programs/neovim/neovide.nix
   ];
 
   boot = {
@@ -44,8 +45,30 @@
       sbctl
       wl-clipboard
 
+      chromium
+      (discord.override {
+        withOpenASAR = true;
+        withVencord = true;
+      })
+      gimp3
+      gparted
+      idea-wrapped
+      mpv
+      obsidian
+      strawberry
+      teams-for-linux
+      thunderbird
+      vscode
+
       niigo-miku-cursors
       patchouli-cursors
+
+      # libreoffice stuff
+      libreoffice-qt6-fresh
+      hunspell
+      hunspellDicts.en_US
+      hunspellDicts.fr-moderne
+
     ];
 
     sessionVariables = {
@@ -77,32 +100,6 @@
     enable32Bit = true;
   };
 
-  hm.imports = [ ../programs/neovim/neovide.nix ];
-  hm.home = {
-    packages = with pkgs; [
-      chromium
-      (discord.override {
-        withOpenASAR = true;
-        withVencord = true;
-      })
-      gimp3
-      gparted
-      idea-wrapped
-      mpv
-      obsidian
-      strawberry
-      teams-for-linux
-      thunderbird
-      vscode
-
-      # libreoffice stuff
-      libreoffice-qt6-fresh
-      hunspell
-      hunspellDicts.en_US
-      hunspellDicts.fr-moderne
-    ];
-  };
-
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "fr_FR.UTF-8";
     LC_IDENTIFICATION = "fr_FR.UTF-8";

configs/laptop.nix

@@ -1,7 +1,5 @@
 {
-  lib,
   pkgs,
-  config,
   ...
 }:
 {
@@ -31,9 +29,9 @@
   programs.light.enable = true;
 
   # hyprland stuff
-  services.blueman = lib.mkIf config.programs.hyprland.enable { enable = true; };
-  hm.wayland.windowManager.hyprland.settings.exec-once = with pkgs; [
-    "${lib.getExe networkmanagerapplet}"
-    "${lib.getExe' blueman "blueman-applet"}"
-  ];
+  # services.blueman = lib.mkIf config.programs.hyprland.enable { enable = true; };
+  # hm.wayland.windowManager.hyprland.settings.exec-once = with pkgs; [
+  #   "${lib.getExe networkmanagerapplet}"
+  #   "${lib.getExe' blueman "blueman-applet"}"
+  # ];
 }