Use Flakes for home-manager config also

bin/update-system.bash

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 pushd ~/.my_config
-nix flake update --recreate-lock-file
+nix flake update
 popd
 pushd ~/.my_config/bin
 ./apply-system.bash

flake.lock

@@ -2,7 +2,9 @@
   "nodes": {
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "utils": "utils"
       },
       "locked": {
@@ -14,8 +16,9 @@
         "type": "github"
       },
       "original": {
-        "id": "home-manager",
+        "owner": "nix-community",
-        "type": "indirect"
+        "repo": "home-manager",
+        "type": "github"
       }
     },
     "nixpkgs": {
@@ -34,26 +37,10 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1678293141,
-        "narHash": "sha256-lLlQHaR0y+q6nd6kfpydPTGHhl1rS9nU9OQmztzKOYs=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c90c4025bb6e0c4eaf438128a3b2640314b1c58d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     },
     "utils": {

flake.nix

@@ -3,6 +3,10 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs@{ nixpkgs, home-manager, ... }: {
@@ -12,6 +16,14 @@
 
         modules = [
           ./system/configuration.nix
+
+          home-manager.nixosModules.home-manager {
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users.tsv = import users/tsv/home.nix;
+            };
+          }
         ];
       };
     };

system/configuration.nix

@@ -82,7 +82,6 @@ in
 
   services.openssh.enable = true;
 
-
   system.stateVersion = "22.11"; # Don't change this
 }
 

users/tsv/home.nix

@@ -1,22 +1,11 @@
 { config, pkgs, ... }:
 
 {
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
   home.username = "tsv";
   home.homeDirectory = "/home/tsv";
 
-  # This value determines the Home Manager release that your
-  # configuration is compatible with. This helps avoid breakage
-  # when a new Home Manager release introduces backwards
-  # incompatible changes.
-  #
-  # You can update Home Manager without changing this value. See
-  # the Home Manager release notes for a list of state version
-  # changes in each release.
   home.stateVersion = "22.11";
 
-  # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
   nixpkgs.config.allowUnfree = true;
 
@@ -55,7 +44,6 @@
     slack
     spotify
     thunderbird
-    vimPlugins.packer-nvim
     wine
     winetricks
     zoom-us