diff --git a/flake.lock b/flake.lock index 67a7233..fafd14d 100644 --- a/flake.lock +++ b/flake.lock @@ -124,26 +124,6 @@ "type": "github" } }, - "home-manager-unstable": { - "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1699025595, - "narHash": "sha256-e+o4PoSu2Z6Ww8y/AVUmMU200rNZoRK+p2opQ7Db8Rg=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "8765d4e38aa0be53cdeee26f7386173e6c65618d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -196,22 +176,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1699243549, @@ -267,11 +231,9 @@ "flake-utils": "flake-utils", "gitignore": "gitignore", "home-manager": "home-manager", - "home-manager-unstable": "home-manager-unstable", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks", "zigpkgs": "zigpkgs" diff --git a/flake.nix b/flake.nix index 6c8a6a7..ba5ccc0 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,6 @@ description = "motiejus/config"; inputs = { - nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; flake-utils.url = "github:numtide/flake-utils"; flake-compat.url = "github:nix-community/flake-compat"; @@ -18,9 +16,6 @@ home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager-unstable.url = "github:nix-community/home-manager"; - home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable"; - agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; agenix.inputs.home-manager.follows = "home-manager"; @@ -53,12 +48,10 @@ outputs = { self, nixpkgs, - nixpkgs-unstable, agenix, deploy-rs, flake-utils, home-manager, - home-manager-unstable, nixos-hardware, nix-index-database, pre-commit-hooks, @@ -272,18 +265,8 @@ ]; }; in { - homeConfigurations.motiejusja = home-manager-unstable.lib.homeManagerConfiguration { - pkgs = import nixpkgs-unstable { - inherit system; - overlays = [ - (_final: prev: { - zigpkgs = import zigpkgs { - inherit (prev) pkgs; - inherit system; - }; - }) - ]; - }; + homeConfigurations.motiejusja = home-manager.lib.homeManagerConfiguration { + inherit pkgs; modules = [ shared/home ];