From b039acd9c1aa8a8a08469215600d52588ec48a40 Mon Sep 17 00:00:00 2001
From: Hektor Misplon <hektor.misplon@pm.me>
Date: Mon, 10 Nov 2025 17:47:30 +0100
Subject: [PATCH] Merge 'home-manager' flake into NixOS flake

---
 {dots/.config/home-manager => home}/flake.lock            | 8 ++++----
 {dots/.config/home-manager => home}/flake.nix             | 2 +-
 .../.config/home-manager => home}/hosts/work/default.nix  | 0
 .../.config/home-manager => home}/hosts/work/packages.nix | 0
 {dots/.config/home-manager => home}/modules/anki.nix      | 0
 .../home-manager => home}/modules/bookmarks/jira.nix      | 0
 .../home-manager => home}/modules/bookmarks/k8s.nix       | 0
 .../home-manager => home}/modules/bookmarks/repos.nix     | 0
 {dots/.config/home-manager => home}/modules/firefox.nix   | 0
 {dots/.config/home-manager => home}/modules/git.nix       | 0
 {dots/.config/home-manager => home}/modules/keepassxc.nix | 0
 {dots/.config/home-manager => home}/modules/neovim.nix    | 0
 12 files changed, 5 insertions(+), 5 deletions(-)
 rename {dots/.config/home-manager => home}/flake.lock (95%)
 rename {dots/.config/home-manager => home}/flake.nix (95%)
 rename {dots/.config/home-manager => home}/hosts/work/default.nix (100%)
 rename {dots/.config/home-manager => home}/hosts/work/packages.nix (100%)
 rename {dots/.config/home-manager => home}/modules/anki.nix (100%)
 rename {dots/.config/home-manager => home}/modules/bookmarks/jira.nix (100%)
 rename {dots/.config/home-manager => home}/modules/bookmarks/k8s.nix (100%)
 rename {dots/.config/home-manager => home}/modules/bookmarks/repos.nix (100%)
 rename {dots/.config/home-manager => home}/modules/firefox.nix (100%)
 rename {dots/.config/home-manager => home}/modules/git.nix (100%)
 rename {dots/.config/home-manager => home}/modules/keepassxc.nix (100%)
 rename {dots/.config/home-manager => home}/modules/neovim.nix (100%)

diff --git a/dots/.config/home-manager/flake.lock b/home/flake.lock
similarity index 95%
rename from dots/.config/home-manager/flake.lock
rename to home/flake.lock
index 2c25682..6d5e264 100644
--- a/dots/.config/home-manager/flake.lock
+++ b/home/flake.lock
@@ -101,16 +101,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1762111121,
-        "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",
+        "lastModified": 1762498405,
+        "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",
+        "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/dots/.config/home-manager/flake.nix b/home/flake.nix
similarity index 95%
rename from dots/.config/home-manager/flake.nix
rename to home/flake.nix
index e88f66c..a44d5a1 100644
--- a/dots/.config/home-manager/flake.nix
+++ b/home/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
     nixpkgs = {
-      url = "github:nixos/nixpkgs/nixos-unstable";
+      url = "github:nixos/nixpkgs?ref=nixos-25.05";
     };
     home-manager = {
       url = "github:nix-community/home-manager";
diff --git a/dots/.config/home-manager/hosts/work/default.nix b/home/hosts/work/default.nix
similarity index 100%
rename from dots/.config/home-manager/hosts/work/default.nix
rename to home/hosts/work/default.nix
diff --git a/dots/.config/home-manager/hosts/work/packages.nix b/home/hosts/work/packages.nix
similarity index 100%
rename from dots/.config/home-manager/hosts/work/packages.nix
rename to home/hosts/work/packages.nix
diff --git a/dots/.config/home-manager/modules/anki.nix b/home/modules/anki.nix
similarity index 100%
rename from dots/.config/home-manager/modules/anki.nix
rename to home/modules/anki.nix
diff --git a/dots/.config/home-manager/modules/bookmarks/jira.nix b/home/modules/bookmarks/jira.nix
similarity index 100%
rename from dots/.config/home-manager/modules/bookmarks/jira.nix
rename to home/modules/bookmarks/jira.nix
diff --git a/dots/.config/home-manager/modules/bookmarks/k8s.nix b/home/modules/bookmarks/k8s.nix
similarity index 100%
rename from dots/.config/home-manager/modules/bookmarks/k8s.nix
rename to home/modules/bookmarks/k8s.nix
diff --git a/dots/.config/home-manager/modules/bookmarks/repos.nix b/home/modules/bookmarks/repos.nix
similarity index 100%
rename from dots/.config/home-manager/modules/bookmarks/repos.nix
rename to home/modules/bookmarks/repos.nix
diff --git a/dots/.config/home-manager/modules/firefox.nix b/home/modules/firefox.nix
similarity index 100%
rename from dots/.config/home-manager/modules/firefox.nix
rename to home/modules/firefox.nix
diff --git a/dots/.config/home-manager/modules/git.nix b/home/modules/git.nix
similarity index 100%
rename from dots/.config/home-manager/modules/git.nix
rename to home/modules/git.nix
diff --git a/dots/.config/home-manager/modules/keepassxc.nix b/home/modules/keepassxc.nix
similarity index 100%
rename from dots/.config/home-manager/modules/keepassxc.nix
rename to home/modules/keepassxc.nix
diff --git a/dots/.config/home-manager/modules/neovim.nix b/home/modules/neovim.nix
similarity index 100%
rename from dots/.config/home-manager/modules/neovim.nix
rename to home/modules/neovim.nix