From a63b4c9b0ed8f9daf45c8f180b4a27f415d41b86 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Fri, 1 Nov 2024 20:54:33 +0100 Subject: [PATCH] btop: remove home-manager --- modules/programs/tui/btop.nix | 49 +++++++++++++++++++-------------- modules/programs/tui/module.nix | 2 +- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/modules/programs/tui/btop.nix b/modules/programs/tui/btop.nix index 7016159..324a280 100644 --- a/modules/programs/tui/btop.nix +++ b/modules/programs/tui/btop.nix @@ -1,31 +1,38 @@ { config, lib, + pkgs, ... -}: -with lib; let +}: let + inherit (lib) mkEnableOption mkIf; cfg = config.modules.programs.btop; - inherit (config.modules.other.system) username; + + btop-settings = pkgs.writeTextDir "btop/btop.conf" '' + truecolor = True + vim_keys = True + rounded_corners = True + update_ms = 100 + graph_symbol = "braille" + cpu_single_graph = True + clock_format = "%X" + use_fstab = True + io_mode = True + net_sync = True + net_iface = "enp4s0" + log_level = "ERROR" + ''; + + btop-wrapped = pkgs.symlinkJoin { + name = "btop-wrapped"; + paths = [pkgs.btop]; + buildInputs = [pkgs.makeWrapper]; + postBuild = '' + wrapProgram $out/bin/btop --set XDG_CONFIG_HOME "${btop-settings}" + ''; + }; in { options.modules.programs.btop.enable = mkEnableOption "btop"; - config = mkIf cfg.enable { - home-manager.users.${username} = { - programs.btop = { - enable = true; - settings = { - theme_background = false; - vim_keys = true; - update_ms = 1000; - cpu_single_graph = true; - clock_format = "%X"; - use_fstab = true; - io_mode = true; - net_sync = true; - net_iface = "enp4s0"; - log_level = "WARNING"; - }; - }; - }; + environment.systemPackages = [btop-wrapped]; }; } diff --git a/modules/programs/tui/module.nix b/modules/programs/tui/module.nix index 844e89a..76c2a09 100644 --- a/modules/programs/tui/module.nix +++ b/modules/programs/tui/module.nix @@ -1,3 +1,3 @@ _: { - imports = [./btop.nix ./newsboat.nix ./ncmpcpp.nix ./yazi.nix ./wtfutil.nix]; + imports = [./btop.nix ./ncmpcpp.nix ./yazi.nix ./wtfutil.nix]; }