From 2b12c02b9ed331e45f4f6b51974913640b1e372f Mon Sep 17 00:00:00 2001 From: iiogama Date: Sat, 13 Jan 2024 13:43:02 -0800 Subject: [PATCH] Initial attempt at adding river-bsp-layout flake --- flake.lock | 20 +------------------- flake.nix | 8 ++++++-- nixos/wayland.nix | 1 + 3 files changed, 8 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index d9a1c67..72e2204 100644 --- a/flake.lock +++ b/flake.lock @@ -36,28 +36,10 @@ "type": "github" } }, - "river-bsp-layout": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1, - "narHash": "sha256-9l80YSyV6CEKAJVnJ3LoUc88O/M0b9wKbj0mMGmL6gI=", - "path": "./packages/river-bsp-layout", - "type": "path" - }, - "original": { - "path": "./packages/river-bsp-layout", - "type": "path" - } - }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "river-bsp-layout": "river-bsp-layout" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 4769829..77c4a00 100644 --- a/flake.nix +++ b/flake.nix @@ -9,8 +9,12 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + river-bsp-layout = { + url = "path:./packages/river-bsp-layout"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = inputs @ { self, nixpkgs, home-manager }: + outputs = inputs @ { self, nixpkgs, home-manager, river-bsp-layout }: let system = "x86_64-linux"; user = { @@ -27,7 +31,7 @@ nixosConfigurations = ( import ./hosts { inherit (nixpkgs) lib; - inherit inputs system home-manager user; + inherit inputs home-manager river-bsp-layout system user; } ); }; diff --git a/nixos/wayland.nix b/nixos/wayland.nix index cb902e3..56feffd 100644 --- a/nixos/wayland.nix +++ b/nixos/wayland.nix @@ -48,5 +48,6 @@ wl-clipboard ]; environment.systemPackages = [ + inputs.river-bsp-layout.default ]; }