From 46384d49c1c6c1ad7d7f744fc2a551c352da544e Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Sat, 30 Dec 2023 13:12:33 +0100 Subject: [PATCH] Convert Vifm configuration to module --- home-manager/cli/default.nix | 1 - home-manager/cli/vifm/default.nix | 12 ----------- hosts/luci/home-config.nix | 1 + modules/home-manager/cli/vifm/default.nix | 21 +++++++++++++++++++ .../cli/vifm/files/base16-default-dark.vifm | 0 .../cli/vifm/files/devicons.vifm | 0 .../home-manager}/cli/vifm/files/vifmrc | 0 modules/home-manager/default.nix | 1 + 8 files changed, 23 insertions(+), 13 deletions(-) delete mode 100644 home-manager/cli/vifm/default.nix create mode 100644 modules/home-manager/cli/vifm/default.nix rename {home-manager => modules/home-manager}/cli/vifm/files/base16-default-dark.vifm (100%) rename {home-manager => modules/home-manager}/cli/vifm/files/devicons.vifm (100%) rename {home-manager => modules/home-manager}/cli/vifm/files/vifmrc (100%) diff --git a/home-manager/cli/default.nix b/home-manager/cli/default.nix index dc0a3b6..d6db79e 100644 --- a/home-manager/cli/default.nix +++ b/home-manager/cli/default.nix @@ -5,7 +5,6 @@ ./git.nix ./pass.nix ./gnupg.nix - ./vifm ./bat.nix ./eza.nix ./direnv.nix diff --git a/home-manager/cli/vifm/default.nix b/home-manager/cli/vifm/default.nix deleted file mode 100644 index d1c5620..0000000 --- a/home-manager/cli/vifm/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ...}: -{ - home.packages = with pkgs; [ - vifm - chafa # Preview images - poppler_utils # Preview PDF file - ]; - - home.file.".config/vifm/vifmrc".source = ./files/vifmrc; - home.file.".config/vifm/colors/base16-default-dark.vifm".source = ./files/base16-default-dark.vifm; - home.file.".config/vifm/devicons.vifm".source = ./files/devicons.vifm; -} diff --git a/hosts/luci/home-config.nix b/hosts/luci/home-config.nix index 9c26a36..246d67d 100644 --- a/hosts/luci/home-config.nix +++ b/hosts/luci/home-config.nix @@ -1,6 +1,7 @@ { ... }: { config.modules = { cli.neovim.enable = true; + cli.vifm.enable = true; video.kdenlive.enable = false; web.firefox.enable = true; web.qutebrowser.enable = true; diff --git a/modules/home-manager/cli/vifm/default.nix b/modules/home-manager/cli/vifm/default.nix new file mode 100644 index 0000000..bced364 --- /dev/null +++ b/modules/home-manager/cli/vifm/default.nix @@ -0,0 +1,21 @@ +{ lib, config, pkgs, ... }: +with lib; +let + cfg = config.modules.cli.vifm; +in +{ + options.modules.cli.vifm = { + enable = mkEnableOption "enable Vifm file browser"; + }; + config = mkIf cfg.enable { + home.packages = with pkgs; [ + vifm + chafa # Preview images + poppler_utils # Preview PDF file + ]; + + home.file.".config/vifm/vifmrc".source = ./files/vifmrc; + home.file.".config/vifm/colors/base16-default-dark.vifm".source = ./files/base16-default-dark.vifm; + home.file.".config/vifm/devicons.vifm".source = ./files/devicons.vifm; + }; +} diff --git a/home-manager/cli/vifm/files/base16-default-dark.vifm b/modules/home-manager/cli/vifm/files/base16-default-dark.vifm similarity index 100% rename from home-manager/cli/vifm/files/base16-default-dark.vifm rename to modules/home-manager/cli/vifm/files/base16-default-dark.vifm diff --git a/home-manager/cli/vifm/files/devicons.vifm b/modules/home-manager/cli/vifm/files/devicons.vifm similarity index 100% rename from home-manager/cli/vifm/files/devicons.vifm rename to modules/home-manager/cli/vifm/files/devicons.vifm diff --git a/home-manager/cli/vifm/files/vifmrc b/modules/home-manager/cli/vifm/files/vifmrc similarity index 100% rename from home-manager/cli/vifm/files/vifmrc rename to modules/home-manager/cli/vifm/files/vifmrc diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 0256121..97f7cb2 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -2,6 +2,7 @@ { imports = [ ./cli/neovim + ./cli/vifm ./desktop/sway ./gaming/lutris ./video/kdenlive