From 1a047c27406a8895fc1af3ed23fbd40e710973cd Mon Sep 17 00:00:00 2001 From: mehbark Date: Tue, 15 Aug 2023 18:31:53 -0400 Subject: [PATCH] give up :( --- build.conf.nix | 5 ++--- flake.nix | 11 ++++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/build.conf.nix b/build.conf.nix index 2f85c27..6770b9c 100644 --- a/build.conf.nix +++ b/build.conf.nix @@ -1,8 +1,7 @@ -{ wm ? null, ...}: +input@{ wm ? null, ...}: with builtins; +input // rec { - wm = wm; - x11-wms = ["plasma" "xmonad" "i3"]; wayland-wms = ["hyprland" "sway"]; wms = x11-wms ++ wayland-wms; diff --git a/flake.nix b/flake.nix index 431b5c5..a572235 100644 --- a/flake.nix +++ b/flake.nix @@ -8,19 +8,16 @@ outputs = inputs@{ self, nixpkgs, home-manager, flake-utils, ... }: let - conf = (import ./build.conf.nix) {}; + # :( + conf = (import ./build.conf.nix) { wm = "plasma"; }; in { nixosConfigurations = - flake-utils.lib.eachSystem conf.wms (wm: - let - conf = import (./build.conf.nix) { wm = wm; }; - in { nix = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - (./configuration.nix conf) + ((import ./configuration.nix) conf) home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; @@ -29,6 +26,6 @@ } ]; }; - }); + }; }; }