From 3b768c3693c032184e4ddabf775ad3a3992fb303 Mon Sep 17 00:00:00 2001 From: John Ogle Date: Sat, 24 Aug 2024 10:05:19 -0700 Subject: [PATCH] Add home configurations --- flake.lock | 22 ++++++++++++++++++++++ flake.nix | 32 +++++++++++++++++++++++++------- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 4d54575..72725ee 100644 --- a/flake.lock +++ b/flake.lock @@ -53,6 +53,27 @@ "type": "github" } }, + "hy3": { + "inputs": { + "hyprland": [ + "hyprland" + ] + }, + "locked": { + "lastModified": 1723267004, + "narHash": "sha256-gyhpW3Mv9RgWsB8jAMoA7yoMSb01ol0jyPFNsghaZ0w=", + "owner": "outfoxxed", + "repo": "hy3", + "rev": "6af5f6004180664d883bd428f1da117bb6b1b6dc", + "type": "github" + }, + "original": { + "owner": "outfoxxed", + "ref": "hl0.42.0", + "repo": "hy3", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -251,6 +272,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "hy3": "hy3", "hyprland": "hyprland", "nixpkgs": "nixpkgs_2" } diff --git a/flake.nix b/flake.nix index b122540..322f14c 100644 --- a/flake.nix +++ b/flake.nix @@ -4,8 +4,10 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; hyprland = { type = "git"; @@ -13,9 +15,13 @@ submodules = true; rev = "9a09eac79b85c846e3a865a9078a3f8ff65a9259"; }; + hy3 = { + url = "github:outfoxxed/hy3?ref=hl0.42.0"; + inputs.hyprland.follows = "hyprland"; + }; }; - outputs = { self, nixpkgs, home-manager, ... } @ inputs: { + outputs = { self, nixpkgs, ... } @ inputs: { nixosConfigurations.z790prors-nix = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; @@ -25,10 +31,22 @@ nixosConfigurations.nix-book = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; - modules = [ - ./machines/nix-book/configuration.nix - home-manager.nixosModules.home-manager - ]; + modules = [ ./machines/nix-book/configuration.nix ]; + }; + + homeConfigurations = let + system = "x86_64-linux"; + pkgs = nixpkgs.legacyPackages.${system}; + in { + "johno@nix-book" = inputs.home-manager.lib.homeManagerConfiguration { + inherit pkgs; + + extraSpecialArgs = { inherit inputs; }; + modules = [ + inputs.hyprland.homeManagerModules.default + /home/johno/.config/home-manager/home-nix-book.nix + ]; + }; }; }; }