Break up graphic related stuff into graphics module

This commit is contained in:
Sameer Rahmani 2024-04-17 12:16:54 +01:00
parent f0ffe856da
commit 54649939b2
Signed by: lxsameer
GPG Key ID: 8741FACBF412FFA5
5 changed files with 65 additions and 17 deletions

View File

@ -26,6 +26,7 @@ let
./elisp
./git
./minibuffer-vertico
./graphics
];
pkgsModule = { config, ... }: {

View File

@ -41,15 +41,11 @@ let
yasnippet
yasnippet-snippets
flycheck
svg-tag-mode
all-the-icons
org
org-super-agenda
org-ql
org-modern
base16-theme
] ++ lib.optionals (config.fg42.emojify) [
emojify
] ++ lib.optionals (config.fg42.modeline == "noether") [
posframe
extraPackages.noether
@ -63,19 +59,9 @@ let
};
dicts = pkgs.aspellWithDicts (dicts: with dicts; [ en en-computers en-science ]);
emojifyDocString = "Whether or not to use the `emojify' package.";
in
{
options = (with lib; {
fg42.emojify = mkOption
{
type = types.bool;
default = false;
description = emojifyDocString;
};
});
config = {
fg42.elispPackages = [ drv ] ++ deps;
@ -93,8 +79,5 @@ in
fg42.font = lib.mkDefault '''("Fira Mono" 11)'';
fg42.requires = [ drv.pname ];
fg42.vars = [
(lib.defVar "emojify" cfg.emojify emojifyDocString)
];
};
}

View File

@ -0,0 +1,62 @@
# Fg42 - Emacs Editor for advance users
#
# Copyright (c) 2010-2024 Sameer Rahmani <lxsameer@gnu.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, version 2.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# This is the home manager module that exposes FG42. It differs
# from FG42 modules that are structurally the same but used in
# different context
# A list of default FG42 modules to build FG42 with.
{ lib, config, pkgs, makeFG42Drv, ... }:
with lib;
let
cfg = config.fg42.graphics;
deps =
(with pkgs.emacsPackages; [
svg-tag-mode
all-the-icons
] ++ lib.optionals (cfg.emojify) [
emojify
]);
drv = makeFG42Drv {
pname = "graphics";
version = config.fg42.version;
buildInputs = deps;
src = ./.;
};
emojifyDocString = "Whether or not to use the `emojify' package.";
in
{
options = (with lib; {
fg42.graphics.enable = mkAndEnableOption "graphics";
fg42.graphics.emojify = mkOption
{
type = types.bool;
default = false;
description = emojifyDocString;
};
});
config = mkIf cfg.enable {
fg42.elispPackages = [ drv ] ++ deps;
fg42.requires = [ drv.pname ];
fg42.vars = [
(lib.defVar "emojify" cfg.emojify emojifyDocString)
];
};
}

View File

@ -31,6 +31,7 @@
:if (display-graphic-p)
:hook (emacs-startup . global-emojify-mode))
(use! all-the-icons
"A utility package to collect various Icon Fonts and propertize them within
Emacs."

View File

@ -38,6 +38,7 @@
(require 'vertico-indexed)
(require 'vertico-quick)
(require 'vertico-repeat)
(vertico-mode)
(vertico-multiform-mode)
;; Configure the display per command.