diff options
| author | Mx Kookie <kookie@spacekookie.de> | 2020-12-08 11:30:40 +0000 |
|---|---|---|
| committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-08 11:30:40 +0000 |
| commit | 3a31a84c7d3e589035ad08499206aac44a81f424 (patch) | |
| tree | e23bbaaca60f4b4247467ef40b0998149770fa7a | |
| parent | f6ae72071127e92dd82875c850a1e55dd88a9e6d (diff) | |
libkookie: loading the users harness
| -rw-r--r-- | infra/libkookie/modules/default.nix | 5 | ||||
| -rw-r--r-- | infra/libkookie/modules/workstation/ui/i3/config.nix | 3 | ||||
| -rw-r--r-- | infra/libkookie/modules/workstation/ui/i3/setup.nix | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/infra/libkookie/modules/default.nix b/infra/libkookie/modules/default.nix index df4da1be1b21..5d4e378d01cd 100644 --- a/infra/libkookie/modules/default.nix +++ b/infra/libkookie/modules/default.nix @@ -2,7 +2,10 @@ { ... }: { imports = [ + # libkookie module harness runs the show + ./harness/users.nix + + # Add modules based on use-case ./workstation - ../config/users ]; } diff --git a/infra/libkookie/modules/workstation/ui/i3/config.nix b/infra/libkookie/modules/workstation/ui/i3/config.nix index 7d6e7e8932b1..248b15ebd22b 100644 --- a/infra/libkookie/modules/workstation/ui/i3/config.nix +++ b/infra/libkookie/modules/workstation/ui/i3/config.nix @@ -1,4 +1,3 @@ - /** A base configuration template for i3 * * This set of configuration values is meant to work on _all_ @@ -11,7 +10,7 @@ let cfg = config.libkookie.ui.i3; xtraPkgs = pkgs // (import ./tools args); in -rec { +{ # This is not configurable by design modifier = "Mod4"; diff --git a/infra/libkookie/modules/workstation/ui/i3/setup.nix b/infra/libkookie/modules/workstation/ui/i3/setup.nix index e1c0aff48971..ccc88422ab26 100644 --- a/infra/libkookie/modules/workstation/ui/i3/setup.nix +++ b/infra/libkookie/modules/workstation/ui/i3/setup.nix @@ -10,4 +10,5 @@ in }; # TODO: add i3status config handling + } |