diff --git a/flake.lock b/flake.lock index 039c8c6..1c795ba 100644 --- a/flake.lock +++ b/flake.lock @@ -22,15 +22,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", - "owner": "nixos", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" diff --git a/flake.nix b/flake.nix index 3298687..bb07cc5 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,14 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, ... }: { - nixosModules.default = import ./nixos95; + outputs = { self, nixpkgs, home-manager,... }: { + nixosModules.default = import ./nixos95 { inherit home-manager; }; }; } diff --git a/nixos95/core.nix b/nixos95/core.nix index 5695274..5786d43 100644 --- a/nixos95/core.nix +++ b/nixos95/core.nix @@ -2,6 +2,9 @@ cfg = config.nixos95; in lib.mkIf cfg.enable { + + home-manager.users.${cfg.user}.home.stateVersion = lib.mkDefault "25.05"; + services.xserver = { enable = true; desktopManager.xfce.enable = true; diff --git a/nixos95/default.nix b/nixos95/default.nix index 744b77b..641050f 100644 --- a/nixos95/default.nix +++ b/nixos95/default.nix @@ -1,4 +1,4 @@ -{ config, lib, ...}: let +{ home-manager }: { config, lib, ...}: let cfg = config.nixos95; in { @@ -14,6 +14,8 @@ in { }; imports = [ + home-manager.nixosModules.home-manager + ./core.nix ./desktop.nix ./keybinds.nix