From bac57f149336949cf6cc8173ee4ff1a6ffaa6bf5 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Tue, 22 Jul 2025 20:55:21 +0100 Subject: [PATCH] Refactor to use Home Manager --- flake.lock | 22 ++++++++++++++++++++++ flake.nix | 6 ++++++ modules/git.nix | 9 +++------ modules/tmux.nix | 9 +++------ 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 32f18f1..c156dce 100644 --- a/flake.lock +++ b/flake.lock @@ -18,6 +18,27 @@ "type": "github" } }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1753180535, + "narHash": "sha256-KEtlzMs2O7FDvciFtjk9W4hyau013Pj9qZNK9a0PxEc=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "847711c7ffa9944b0c5c39a8342ac8eb6a9f9abc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "home-manager", + "type": "github" + } + }, "import-tree": { "locked": { "lastModified": 1752730890, @@ -67,6 +88,7 @@ "root": { "inputs": { "flake-parts": "flake-parts", + "home-manager": "home-manager", "import-tree": "import-tree", "nixpkgs": "nixpkgs" } diff --git a/flake.nix b/flake.nix index 22bc84d..641916a 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,12 @@ { inputs = { flake-parts.url = "github:hercules-ci/flake-parts"; + + home-manager = { + inputs.nixpkgs.follows = "nixpkgs"; + url = "github:nix-community/home-manager/master"; + }; + import-tree.url = "github:vic/import-tree"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; }; diff --git a/modules/git.nix b/modules/git.nix index 6c50893..f5ca655 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -1,8 +1,5 @@ { - flake.modules.nixos.pc = { pkgs, ... }: - { - environment.systemPackages = with pkgs; [ - git - ]; - }; + flake.modules.homeManager.base { + programs.git.enable = true; + }; } diff --git a/modules/tmux.nix b/modules/tmux.nix index ae86c3b..2a8cdd6 100644 --- a/modules/tmux.nix +++ b/modules/tmux.nix @@ -1,8 +1,5 @@ { - flake.modules.nixos.pc = { pkgs, ... }: - { - environment.systemPackages = with pkgs; [ - tmux - ]; - }; + flake.modules.homeManager.base = { + programs.tmux.enable = true; + }; }