configs/common.nix

@@ -5,13 +5,16 @@
   _utils,
   agenix,
   camasca,
-  hjem,
+  home-manager,
   nixpkgs,
   nix-index-database,
   vencord,
   ...
 }:
 let
+  username = "leo";
+  stateVersion = "24.11";
+
   rootPassword = _utils.setupSingleSecret config "rootPassword" { };
   secrets = _utils.setupSharedSecrets config {
     secrets = [ "userPassword" ];
@@ -20,10 +23,10 @@ in
 {
   imports = [
     agenix.nixosModules.default
-    hjem.nixosModules.default
+    home-manager.nixosModules.home-manager
     nix-index-database.nixosModules.nix-index
 
-    (lib.mkAliasOptionModule [ "hj" ] [ "hjem" "users" "leo" "files" ])
+    (lib.mkAliasOptionModule [ "hm" ] [ "home-manager" "users" username ])
 
     rootPassword.generate
     secrets.generate
@@ -68,17 +71,21 @@ in
     wget
   ];
 
-  hjem = {
+  hm = {
-    clobberByDefault = true;
+    home = { inherit stateVersion; };
-    users.leo.files = {
+
-      ".ssh/config".text = ''
+    programs.ssh = {
-        Host *
+      enable = true;
-          ForwardAgent yes
+      addKeysToAgent = "yes";
-          AddKeysToAgent yes
+      forwardAgent = true;
-      '';
     };
   };
 
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+  };
+
   i18n.defaultLocale = "en_US.UTF-8";
 
   networking = {
@@ -189,7 +196,7 @@ in
   time.timeZone = "Europe/Paris";
 
   users.users = {
-    leo = {
+    "${username}" = {
       isNormalUser = true;
       shell = pkgs.fish;
       extraGroups = [
@@ -218,5 +225,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 "24.11"; # Did you read the comment?
+  system.stateVersion = lib.mkDefault stateVersion; # Did you read the comment?
 }

configs/desktop.nix

@@ -14,7 +14,6 @@
     ../programs/ghostty.nix
     ../programs/gnome.nix
     ../programs/java.nix
-    ../programs/neovim/neovide.nix
   ];
 
   boot = {
@@ -45,30 +44,8 @@
       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 = {
@@ -100,6 +77,32 @@
     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

@@ -2,7 +2,6 @@
   lib,
   pkgs,
   config,
-  _utils,
   ...
 }:
 {
@@ -33,10 +32,8 @@
 
   # hyprland stuff
   services.blueman = lib.mkIf config.programs.hyprland.enable { enable = true; };
-  hj.".config/hypr/hyprland.conf".text = _utils.toHyprconf {
+  hm.wayland.windowManager.hyprland.settings.exec-once = with pkgs; [
-    exec-once = with pkgs; [
     "${lib.getExe networkmanagerapplet}"
     "${lib.getExe' blueman "blueman-applet"}"
   ];
-  };
 }

flake.lock

@@ -3,7 +3,9 @@
     "agenix": {
       "inputs": {
         "darwin": [],
-        "home-manager": [],
+        "home-manager": [
+          "home-manager"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -143,23 +145,23 @@
         "type": "github"
       }
     },
-    "hjem": {
+    "home-manager": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1746355589,
+        "lastModified": 1746413188,
-        "narHash": "sha256-LguszqsDBTtdBxblQTtN7vOAYmfoe43aHkB8aK1dChE=",
+        "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=",
-        "owner": "feel-co",
+        "owner": "nix-community",
-        "repo": "hjem",
+        "repo": "home-manager",
-        "rev": "77b37eeb583d43e1c723119a69c906235174ce57",
+        "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a",
         "type": "github"
       },
       "original": {
-        "owner": "feel-co",
+        "owner": "nix-community",
-        "repo": "hjem",
+        "repo": "home-manager",
         "type": "github"
       }
     },
@@ -281,7 +283,7 @@
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
         "getchvim": "getchvim",
-        "hjem": "hjem",
+        "home-manager": "home-manager",
         "lanzaboote": "lanzaboote",
         "mystia": "mystia",
         "nix-index-database": "nix-index-database",

flake.nix

@@ -68,7 +68,7 @@
       url = "github:uku3lig/agenix";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.systems.follows = "systems";
-      inputs.home-manager.follows = "";
+      inputs.home-manager.follows = "home-manager";
       inputs.darwin.follows = "";
     };
 
@@ -89,8 +89,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    hjem = {
+    home-manager = {
-      url = "github:feel-co/hjem";
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

global/utils.nix

@@ -111,62 +111,4 @@
       alias = builtins.toString (pkgs.writeTextDir filename content) + "/";
       tryFiles = "${filename} =${builtins.toString status}";
     };
-
-  # https://github.com/nix-community/home-manager/blob/ec71b5162848e6369bdf2be8d2f1dd41cded88e8/modules/lib/generators.nix#L4-L61
-  toHyprconf =
-    attrs:
-    let
-      inherit (lib)
-        all
-        concatMapStringsSep
-        concatStrings
-        concatStringsSep
-        filterAttrs
-        foldl
-        generators
-        hasPrefix
-        isAttrs
-        isList
-        mapAttrsToList
-        replicate
-        ;
-
-      indentLevel = 0;
-      importantPrefixes = [ "$" ];
-      initialIndent = concatStrings (replicate indentLevel "  ");
-
-      toHyprconf' =
-        indent: attrs:
-        let
-          sections = filterAttrs (n: v: isAttrs v || (isList v && all isAttrs v)) attrs;
-
-          mkSection =
-            n: attrs:
-            if lib.isList attrs then
-              (concatMapStringsSep "\n" (a: mkSection n a) attrs)
-            else
-              ''
-                ${indent}${n} {
-                ${toHyprconf' "  ${indent}" attrs}${indent}}
-              '';
-
-          mkFields = generators.toKeyValue {
-            listsAsDuplicateKeys = true;
-            inherit indent;
-          };
-
-          allFields = filterAttrs (n: v: !(isAttrs v || (isList v && all isAttrs v))) attrs;
-
-          isImportantField =
-            n: _: foldl (acc: prev: if hasPrefix prev n then true else acc) false importantPrefixes;
-
-          importantFields = filterAttrs isImportantField allFields;
-
-          fields = builtins.removeAttrs allFields (mapAttrsToList (n: _: n) importantFields);
-        in
-        mkFields importantFields
-        + concatStringsSep "\n" (mapAttrsToList mkSection sections)
-        + mkFields fields;
-    in
-    toHyprconf' initialIndent attrs;
 }

programs/alacritty.nix

@@ -3,23 +3,24 @@
   pkgs,
   ...
 }:
-let
+{
-  toml = pkgs.formats.toml { };
+  hm.programs.alacritty =
-
+    let
       theme = pkgs.fetchurl {
         # url = "https://raw.githubusercontent.com/catppuccin/alacritty/ce476fb41f307d90f841c1a4fd7f0727c21248b2/catppuccin-macchiato.toml";
         url = "https://raw.githubusercontent.com/rose-pine/alacritty/3c3e36eb5225b0eb6f1aa989f9d9e783a5b47a83/dist/rose-pine.toml";
         hash = "sha256-MheSmzz02ZLAOS2uaclyazu6E//eikcdFydFfkio0/U=";
       };
+
       themeAttr = builtins.fromTOML (builtins.readFile theme);
-in
+    in
-{
+    {
-  hj.".config/alacritty/alacritty.toml".source = toml.generate "alacritty.toml" (
+      enable = true;
-    lib.recursiveUpdate themeAttr {
+      settings = lib.recursiveUpdate themeAttr {
         font = {
           normal.family = "Iosevka Nerd Font";
           size = 12;
         };
-    }
+      };
-  );
+    };
 }

programs/fish.nix

@@ -6,16 +6,17 @@
     fishPlugins.hydro
   ];
 
-  hj.".config/fish/config.fish".text = ''
+  hm.programs.fish = {
-    function fish_greeting
+    enable = true;
-    end
 
-    if status is-interactive
+    interactiveShellInit = ''
       set --global hydro_symbol_git_dirty "*"
       set --global hydro_color_pwd blue
       set --global hydro_color_git magenta
       set --global hydro_color_prompt green
       set --global hydro_color_duration yellow
-    end
     '';
+
+    functions.fish_greeting = "";
+  };
 }

programs/fuzzel.nix

@@ -1,8 +1,7 @@
-{ lib, pkgs, ... }:
 {
-  environment.systemPackages = [ pkgs.fuzzel ];
+  hm.programs.fuzzel = {
-
+    enable = true;
-  hj.".config/fuzzel/fuzzel.ini".text = lib.generators.toINI { } {
+    settings = {
       main = {
         font = "Iosevka Nerd Font:size=16";
         dpi-aware = false;
@@ -21,4 +20,5 @@
         selection-match = "40a02bff"; # latte green
       };
     };
+  };
 }

programs/games.nix

@@ -5,7 +5,7 @@
     xpadneo.enable = true;
   };
 
-  environment.systemPackages = with pkgs; [
+  hm.home.packages = with pkgs; [
     obs-studio
     osu-lazer-bin
     krita

programs/ghostty.nix

@@ -1,12 +1,14 @@
-{ pkgs, ... }:
 {
-  environment.systemPackages = [ pkgs.ghostty ];
+  hm.programs.ghostty = {
-
+    enable = true;
-  hj.".config/ghostty/config".text = ''
+    settings = {
-    font-family = Iosevka Term
+      theme = "light:catppuccin-latte,dark:catppuccin-mocha";
-    font-feature = -calt
+      font-family = "Iosevka Term";
-    font-feature = -dlig
+      font-size = 12;
-    font-size = 12
+      font-feature = [
-    theme = light:catppuccin-latte,dark:catppuccin-mocha
+        "-calt"
-  '';
+        "-dlig"
+      ];
+    };
+  };
 }

programs/git.nix

@@ -1,36 +1,36 @@
-{ lib, pkgs, ... }:
+{ config, ... }:
 {
-  environment.systemPackages = with pkgs; [
+  programs.git.enable = true;
-    git
-    gh
-  ];
 
-  hj = {
+  hm.programs = {
-    ".gitconfig".text = lib.generators.toGitINI {
+    git = {
-      user = {
+      inherit (config.programs.git) enable package;
-        name = "uku";
+      userName = "uku";
-        email = "hi@uku.moe";
+      userEmail = "hi@uku.moe";
-        signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN+7+KfdOrhcnHayxvOENUeMx8rE4XEIV/AxMHiaNUP8";
+
+      signing = {
+        format = "ssh";
+        key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN+7+KfdOrhcnHayxvOENUeMx8rE4XEIV/AxMHiaNUP8";
+        signByDefault = true;
       };
 
-      commit = {
+      # delta.enable = true;
-        gpgSign = true;
-        verbose = true;
-      };
 
-      gpg.format = "ssh";
+      extraConfig = {
-      tag.gpgSign = true;
-      core.autocrlf = "input";
-      diff.submodule = "log";
         init.defaultBranch = "main";
-      merge.conflictStyle = "zdiff3";
+        core.autocrlf = "input";
         push.autoSetupRemote = true;
+        merge.conflictStyle = "zdiff3";
         rebase.autoStash = true;
         status.submoduleSummary = true;
+        diff.submodule = "log";
         submodule.recurse = true;
+        commit.verbose = true;
+      };
     };
 
-    ".config/gh/config.yml".text = lib.generators.toYAML { } {
+    gh = {
+      enable = true;
       settings.git_protocol = "ssh";
     };
   };

programs/gnome.nix

@@ -16,6 +16,14 @@
     terminal = "ghostty";
   };
 
+  hm.programs.gnome-shell = {
+    enable = true;
+    extensions = with pkgs.gnomeExtensions; [
+      { package = appindicator; }
+      { package = dash-to-panel; }
+    ];
+  };
+
   # ssh-agent is provided by gnome-keyring-daemon
   # (mabye soon by gcr, see NixOS/nixpkgs#140824)
   programs.ssh.startAgent = lib.mkForce false;
@@ -24,8 +32,6 @@
     systemPackages = [
       adw-gtk3
       gnome-tweaks
-      gnomeExtensions.appindicator
-      gnomeExtensions.dash-to-panel
     ];
 
     gnome.excludePackages = [

programs/hyprland-misc.nix

@@ -1,7 +1,8 @@
 { pkgs, ... }:
 {
   # utility packages for hyprland, since you know it's not a DE
-  environment.systemPackages = with pkgs; [
+
+  hm.home.packages = with pkgs; [
     gnome.gnome-calculator
     mate.eom
     nwg-look

programs/hyprland.nix

@@ -1,7 +1,6 @@
 {
   lib,
   pkgs,
-  _utils,
   ...
 }:
 {
@@ -24,7 +23,8 @@
 
   xdg.portal.extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
 
-  environment.systemPackages = with pkgs; [
+  hm = {
+    home.packages = with pkgs; [
       hyprpaper
       hyprpicker
       wl-clipboard
@@ -36,7 +36,9 @@
       polkit_gnome
     ];
 
-  hj.".config/hypr/hyprland.conf".text =
+    wayland.windowManager.hyprland = {
+      enable = true;
+      settings =
         let
           inherit (lib) getExe getExe';
           keys = [
@@ -53,7 +55,7 @@
           ];
         in
         with pkgs;
-    _utils.toHyprconf {
+        {
           "$mod" = "SUPER";
           "$wl-paste" = getExe' wl-clipboard "wl-paste";
           "$wpctl" = getExe' wireplumber "wpctl";
@@ -183,4 +185,6 @@
             "$mod SHIFT, mouse:272, resizewindow"
           ];
         };
+    };
+  };
 }

programs/neovim/neovide.nix

@@ -1,6 +1,7 @@
-{ pkgs, ... }:
+# home-manager module
 {
-  environment.systemPackages = [ pkgs.neovide ];
+  programs.neovide = {
-
+    enable = true;
-  hj.".config/neovide/config.toml".text = "fork = true";
+    settings.fork = true;
+  };
 }

programs/rust.nix

@@ -8,8 +8,8 @@ let
   toml = pkgs.formats.toml { };
 in
 {
-  hj.".cargo/config.toml".source = toml.generate "config.toml" {
+  hm.home.file.".cargo/config.toml".source = toml.generate "config.toml" {
-    build.target-dir = "${config.hjem.users.leo.directory}/.cargo/target";
+    build.target-dir = "${config.hm.home.homeDirectory}/.cargo/target";
 
     target.x86_64-unknown-linux-gnu = {
       linker = "${lib.getExe pkgs.clang}";

programs/starship/default.nix

@@ -1,24 +1,13 @@
-{ lib, pkgs, ... }:
-let
-  toml = pkgs.formats.toml { };
-in
 {
-  environment.systemPackages = [ pkgs.starship ];
+  hm.programs.starship = {
-
+    enable = true;
-  hj = {
+    settings = {
-    ".config/starship.toml" =
-      toml.generate "starship.toml" {
       add_newline = false;
 
       directory = {
         truncation_length = 3;
         truncation_symbol = "…/";
       };
-      }
+    } // (import ./nerd-font.nix);
-      // (import ./nerd-font.nix);
-
-    ".config/fish/config.fish".text = lib.mkAfter ''
-      starship init fish | source
-    '';
   };
 }

programs/waybar/default.nix

@@ -5,12 +5,12 @@
   ...
 }:
 {
-  environment.systemPackages = [ pkgs.waybar ];
+  hm.programs.waybar = {
+    enable = true;
+    style = ./style.css;
 
-  hj = {
+    settings = [
-    ".config/waybar/style.css".source = ./style.css;
+      {
-
-    ".config/waybar/config".text = builtins.toJSON {
         position = "bottom";
         layer = "top";
         height = 24;
@@ -91,6 +91,7 @@
           return-type = "";
           interval = 2;
         };
-    };
+      }
+    ];
   };
 }

systems/fuji/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, _utils, ... }:
+{ pkgs, ... }:
 {
   imports = [
     ./nvidia.nix
@@ -7,16 +7,20 @@
 
   services.xserver.videoDrivers = [ "amdgpu" ];
 
-  environment.systemPackages = with pkgs; [
+  hm = {
+    home.packages = with pkgs; [
       wineWowPackages.waylandFull
     ];
 
-  hj.".config/hypr/hyprland.conf".text = _utils.toHyprconf {
+    wayland.windowManager.hyprland.settings = {
       monitor = "DP-1,3840x2160@144,0x0,1.5";
+
       xwayland.force_zero_scaling = true;
+
       env = [
         "GDK_SCALE,1.5"
         "XCURSOR_SIZE,24"
       ];
     };
+  };
 }

systems/fuji/nvidia.nix

@@ -2,7 +2,6 @@
   lib,
   pkgs,
   config,
-  _utils,
   ...
 }:
 {
@@ -38,12 +37,10 @@
     };
   };
 
-  hj.".config/hypr/hyprland.conf".text = _utils.toHyprconf {
+  hm.wayland.windowManager.hyprland.settings.env = [
-    env = [
     "XDG_SESSION_TYPE,wayland"
     "GBM_BACKEND,nvidia-drm"
     "__GLX_VENDOR_LIBRARY_NAME,nvidia"
     "NVD_BACKEND,direct"
   ];
-  };
 }

systems/mottarone/default.nix

@@ -29,14 +29,9 @@ in
 
   i18n.defaultLocale = lib.mkForce "fr_FR.UTF-8";
 
-  hj = {
+  hm.programs = {
-    ".gitconfig".text = lib.generators.toGitINI {
+    git.includes = [ { path = "~/.config/git/work_config"; } ];
-      include.path = "~/.config/git/work_config";
+    ssh.includes = [ "work_config" ];
-    };
-
-    ".ssh/config".text = lib.mkBefore ''
-      Include work_config
-    '';
   };
 
   networking.firewall.allowedTCPPorts = [ 8000 ];