From 8390c5463940f2a1555ee427c53b6929901365e5 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Mon, 10 Jun 2024 20:09:04 +0200 Subject: [PATCH] Fix various issues --- home/programs/graphical/launchers/walker/default.nix | 4 ++-- home/programs/graphical/launchers/wofi/default.nix | 4 ++-- options/home/programs/default.nix | 6 ------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/home/programs/graphical/launchers/walker/default.nix b/home/programs/graphical/launchers/walker/default.nix index 11335eb..ed21743 100644 --- a/home/programs/graphical/launchers/walker/default.nix +++ b/home/programs/graphical/launchers/walker/default.nix @@ -5,8 +5,8 @@ ... }: let inherit (lib) mkIf; - cfg = osConfig.myOptions.programs.launchers.walker; -in: { + cfg = osConfig.myOptions.home-manager.programs.launchers.walker; +in { config = mkIf cfg.enable { home.packages = with pkgs; [ walker diff --git a/home/programs/graphical/launchers/wofi/default.nix b/home/programs/graphical/launchers/wofi/default.nix index b165d67..37f945d 100644 --- a/home/programs/graphical/launchers/wofi/default.nix +++ b/home/programs/graphical/launchers/wofi/default.nix @@ -4,8 +4,8 @@ ... }: let inherit (lib) mkIf; - cfg = osConfig.myOptions.programs.launchers.wofi; -in: { + cfg = osConfig.myOptions.home-manager.programs.launchers.wofi; +in { config = mkIf cfg.enable { programs.wofi = { enable = true; diff --git a/options/home/programs/default.nix b/options/home/programs/default.nix index 071a174..cd18b5f 100644 --- a/options/home/programs/default.nix +++ b/options/home/programs/default.nix @@ -2,12 +2,6 @@ inherit (lib) mkEnableOption mkOption types; in { - imports = [ - ./programs - ./git.nix - ./wms.nix - ]; - options.myOptions.home-manager.programs = { launchers = { wofi.enable = mkEnableOption "Wofi launcher";