From f999b06444cce214d5ee9a82c32027262202a518 Mon Sep 17 00:00:00 2001 From: Love Billenius Date: Mon, 13 Apr 2026 17:21:39 +0200 Subject: [PATCH] move dotfiles flake --- flake.lock | 21 --------------------- flake.nix | 5 ----- modules/flake/lib.nix | 15 +++++++++++++-- 3 files changed, 13 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 733b14d..6e8fcb2 100644 --- a/flake.lock +++ b/flake.lock @@ -56,26 +56,6 @@ "type": "github" } }, - "dotfiles": { - "inputs": { - "home-manager": [ - "home-manager-unstable" - ], - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1775547645, - "narHash": "sha256-rLzVQvDINEblrZxycGfFDjiHtjumSoUZnLuTjamm3Ao=", - "path": "/home/love/dotfiles", - "type": "path" - }, - "original": { - "path": "/home/love/dotfiles", - "type": "path" - } - }, "flake-compat": { "flake": false, "locked": { @@ -310,7 +290,6 @@ "inputs": { "disko-stable": "disko-stable", "disko-unstable": "disko-unstable", - "dotfiles": "dotfiles", "flake-parts": "flake-parts", "home-manager-unstable": "home-manager-unstable", "lolcat++-stable": "lolcat++-stable", diff --git a/flake.nix b/flake.nix index be0f9da..cdbf385 100644 --- a/flake.nix +++ b/flake.nix @@ -35,11 +35,6 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - dotfiles = { - url = "path:/home/love/dotfiles"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - inputs.home-manager.follows = "home-manager-unstable"; - }; }; outputs = inputs: diff --git a/modules/flake/lib.nix b/modules/flake/lib.nix index 805fd4d..c928009 100644 --- a/modules/flake/lib.nix +++ b/modules/flake/lib.nix @@ -3,7 +3,9 @@ ... }: let - inherit (inputs) dotfiles home-manager-unstable; + inherit (inputs) home-manager-unstable; + dotfilesHome = "/home/love/dotfiles/home.nix"; + hasDotfilesHome = builtins.pathExists dotfilesHome; in { mkHost = { @@ -42,7 +44,16 @@ in home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.backupFileExtension = "hm-backup"; - home-manager.users.love = import "${dotfiles}/home.nix"; + home-manager.users.love = + if hasDotfilesHome then + import (/. + dotfilesHome) + else + { + home.username = "love"; + home.homeDirectory = "/home/love"; + home.stateVersion = "25.11"; + programs.home-manager.enable = true; + }; } ] ++ hostModules; };