From ee91268f3053e794c66da021479556eebc36383e Mon Sep 17 00:00:00 2001
From: Alejandro Angulo <iam@alejandr0angul0.dev>
Date: Mon, 31 Oct 2022 17:18:11 -0700
Subject: [PATCH] Updated to home manager master (22.11)

Using nixpkgs unstable so updating home manager to track more closely
with that (ran into an issue building).
---
 flake.nix                | 31 +++++++++++++++++++++----------
 users/alejandro/home.nix | 15 ---------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/flake.nix b/flake.nix
index c34eba9..2fafc91 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager/release-22.05";
+    home-manager.url = "github:nix-community/home-manager/master";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     ssbm-nix.url = github:djanatyn/ssbm-nix;
   };
@@ -27,15 +27,26 @@
   in {
     homeManagerConfigurations = {
       alejandro = home-manager.lib.homeManagerConfiguration {
-        inherit system pkgs;
-        username = "alejandro";
-        homeDirectory = "/home/alejandro";
-        stateVersion = "22.05";
-        configuration = {
-          imports = [
-            ./users/alejandro/home.nix
-          ];
-        };
+        inherit pkgs;
+        modules = [
+          ./users/alejandro/home.nix
+          {
+            home = {
+              username = "alejandro";
+              homeDirectory = "/home/alejandro";
+
+              # 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.
+              stateVersion = "22.05";
+            };
+          }
+        ];
       };
     };
 
diff --git a/users/alejandro/home.nix b/users/alejandro/home.nix
index 50701bf..cd802d7 100644
--- a/users/alejandro/home.nix
+++ b/users/alejandro/home.nix
@@ -17,11 +17,6 @@
     ./zsh.nix
   ];
 
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
-  home.username = "alejandro";
-  home.homeDirectory = "/home/alejandro";
-
   home.packages = with pkgs; [
     kitty
     signal-desktop
@@ -49,16 +44,6 @@
     #longitude = -118.4;
   };
 
-  # 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.05";
-
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 }