From 5b0a9850bc663aab9a442652eaa58ce4bbef0f19 Mon Sep 17 00:00:00 2001 From: Mars Date: Sun, 28 Jul 2024 22:13:42 -0400 Subject: [PATCH] tried to add home-manager back as an input --- flake.in.nix | 5 +++ flake.lock | 55 ++++++++++++++++++++--------- flake.nix | 4 +++ systems/x86_64-linux/navis/home.nix | 1 - 4 files changed, 47 insertions(+), 18 deletions(-) diff --git a/flake.in.nix b/flake.in.nix index f979e70..048af79 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -33,6 +33,7 @@ treefmt-nix = mkInput "numtide/treefmt-nix"; darwin = mkFollowingNixpkgs "LnL7/nix-darwin/master"; + home-manager = mkFollowingNixpkgs "nix-community/home-manager"; nix-index-database = mkFollowingNixpkgs "nix-community/nix-index-database"; snowfall-flake = mkFollowingNixpkgs "snowfallorg/flake"; snowfall-lib = mkFollowingNixpkgs "snowfallorg/lib/dev"; @@ -64,6 +65,10 @@ impermanence.nixosModules.impermanence ]; + systems.modules.darwin = [ + "${home-manager}/nix-darwin" + ]; + outputs-builder = channels: { formatter = treefmt-nix.lib.mkWrapper channels.nixpkgs { projectRootFile = "flake.nix"; diff --git a/flake.lock b/flake.lock index 5c70cce..55a85f1 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1722126515, - "narHash": "sha256-Pz8/0lFWhoHOReOJwbf4Fbx0ANGWc306QnuUeMR9keU=", + "lastModified": 1722198001, + "narHash": "sha256-CC+hi1esCjv26J+Zryr+j5Vz2azEgS2lGIETEEnkI2o=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "d11e6cfcb6c09dbb9ae0265cfe7a684bcde02ec6", + "rev": "50e805f8d8255795063d8b0833590e5e05723fc9", "type": "github" }, "original": { @@ -600,11 +600,11 @@ ] }, "locked": { - "lastModified": 1722067813, - "narHash": "sha256-nxpzoKXwn+8RsxpxwD86mtEscOMw64ZD/vGSNWzGMlA=", + "lastModified": 1722119539, + "narHash": "sha256-2kU90liMle0vKR8exJx1XM4hZh9CdNgZGHCTbeA9yzY=", "owner": "nix-community", "repo": "home-manager", - "rev": "975b83ca560d17db51a66cb2b0dc0e44213eab27", + "rev": "d0240a064db3987eb4d5204cf2400bc4452d9922", "type": "github" }, "original": { @@ -614,6 +614,26 @@ } }, "home-manager_3": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722203588, + "narHash": "sha256-91V5FMSQ4z9bkhTCf0f86Zjw0bh367daSf0mzCIW0vU=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "792757f643cedc13f02098d8ed506d82e19ec1da", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_4": { "inputs": { "nixpkgs": [ "nixvim", @@ -676,11 +696,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1722112981, - "narHash": "sha256-0tpOoFxpyYwoo9craExTcxx1yroUuSjHTP2+8toM7Qw=", + "lastModified": 1722203795, + "narHash": "sha256-Ml3cL8ayTGozjo8QW08J7jEPIRMWtQmdW1Y44pb2SYQ=", "ref": "refs/heads/main", - "rev": "bc86afea7e177a7ad4335737417fc0e468698dc4", - "revCount": 5002, + "rev": "a9d87bd6669568741704de08b6f0328a92e29396", + "revCount": 5009, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -735,11 +755,11 @@ ] }, "locked": { - "lastModified": 1718746314, - "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=", + "lastModified": 1721326555, + "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290", + "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", "type": "github" }, "original": { @@ -1205,7 +1225,7 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", - "home-manager": "home-manager_3", + "home-manager": "home-manager_4", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_8", "treefmt-nix": "treefmt-nix" @@ -1263,6 +1283,7 @@ "chaotic": "chaotic", "darwin": "darwin_2", "flakegen": "flakegen", + "home-manager": "home-manager_3", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "impermanence": "impermanence", @@ -1540,11 +1561,11 @@ ] }, "locked": { - "lastModified": 1721755049, - "narHash": "sha256-O17b38bQnmfxv7It3OnVYx7fp1seEdI7xxnw5vJFv30=", + "lastModified": 1722181019, + "narHash": "sha256-Lj/g1UzrsTZUixtveQix6eB3pon2j23qv5/5pzTx0LQ=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "5555f467f68ce7cdf1060991c24263073b95e9da", + "rev": "0e2f3b9c85f7bab3983098a01366876d34daf383", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0c9713e..221bbeb 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,10 @@ url = "github:LnL7/nix-darwin/master"; }; flakegen.url = "github:jorsn/flakegen"; + home-manager = { + inputs.nixpkgs.follows = "nixpkgs"; + url = "github:nix-community/home-manager"; + }; hyprland = { submodules = true; type = "git"; diff --git a/systems/x86_64-linux/navis/home.nix b/systems/x86_64-linux/navis/home.nix index bbb769c..5779f87 100644 --- a/systems/x86_64-linux/navis/home.nix +++ b/systems/x86_64-linux/navis/home.nix @@ -12,7 +12,6 @@ hyprland.homeManagerModules.default nix-colors.homeManagerModules.default nix-index-database.hmModules.nix-index - schizofox.homeManagerModules.default ./hyprland ./screenshot