From 8ec79eac11936de71ba46fec418bcfc654bcfaf2 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Fri, 2 Aug 2024 18:35:31 +0200 Subject: [PATCH] Update to address home-manager config changes --- flake.lock | 6 +++--- home/nki-framework.nix | 36 ++++++++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 14ddfee..e9c22bc 100644 --- a/flake.lock +++ b/flake.lock @@ -778,11 +778,11 @@ ] }, "locked": { - "lastModified": 1719037157, - "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=", + "lastModified": 1722462338, + "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=", "owner": "nix-community", "repo": "home-manager", - "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511", + "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8", "type": "github" }, "original": { diff --git a/home/nki-framework.nix b/home/nki-framework.nix index 88509eb..02ab99b 100644 --- a/home/nki-framework.nix +++ b/home/nki-framework.nix @@ -76,16 +76,32 @@ # Multiple screen setup services.kanshi = with config.common.monitors; { enable = true; - profiles.undocked.outputs = [{ - criteria = "eDP-1"; - }]; - profiles.work-both.outputs = [ - { criteria = "eDP-1"; position = "0,${toString (builtins.floor ((2160 / work.scale - 1200) + 1200 / 3))}"; status = "enable"; } - { criteria = work.name; position = "1920,0"; } - ]; - profiles.work-one.outputs = [ - { criteria = "eDP-1"; status = "disable"; } - { criteria = config.common.monitors.work.name; } + settings = [ + { + profile.name = "undocked"; + profile.outputs = [{ criteria = "eDP-1"; }]; + } + { + profile.name = "work-both"; + profile.outputs = [ + { + criteria = "eDP-1"; + position = "0,${toString (builtins.floor ((2160 / work.scale - 1200) + 1200 / 3))}"; + status = "enable"; + } + { criteria = work.name; position = "1920,0"; } + ]; + } + { + profile.name = "work-one"; + profile.outputs = [ + { + criteria = "eDP-1"; + status = "disable"; + } + ]; + } + { output.criteria = config.common.monitors.work.name; } ]; };