fix: Pack bindings into attrset

This commit is contained in:
Jalil David Salamé Messina 2024-04-12 21:55:51 +02:00
parent 8773670e70
commit 4ed1d835ac
Signed by: jalil
GPG key ID: F016B9E770737A0B

View file

@ -18,41 +18,54 @@ let
in in
{ {
config = lib.mkIf (jhome.enable && cfg.enable) { config = lib.mkIf (jhome.enable && cfg.enable) {
home.packages = [ home.packages =
pkgs.webcord with pkgs;
pkgs.ferdium [
pkgs.xournalpp webcord
pkgs.signal-desktop ferdium
pkgs.lxqt.pcmanfm-qt xournalpp
pkgs.wl-clipboard signal-desktop
lxqt.pcmanfm-qt
wl-clipboard
# Extra fonts # Extra fonts
pkgs.noto-fonts-cjk # Chinese, Japanese and Korean characters noto-fonts-cjk # Chinese, Japanese and Korean characters
] ++ lib.optional flatpakEnabled pkgs.flatpak; ]
++ lib.optional flatpakEnabled flatpak;
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
# Browser # Browser
programs.firefox.enable = true; programs.firefox.enable = true;
# Dynamic Menu # Dynamic Menu
programs.fuzzel.enable = true; programs.fuzzel = {
programs.fuzzel.settings.main.icon-theme = "Papirus-Dark"; enable = true;
programs.fuzzel.settings.main.terminal = cfg.terminal; settings.main = {
programs.fuzzel.settings.main.layer = "overlay"; icon-theme = "Papirus-Dark";
terminal = cfg.terminal;
layer = "overlay";
};
};
# Video player # Video player
programs.mpv.enable = true; programs.mpv = {
programs.mpv.scripts = builtins.attrValues { inherit (pkgs.mpvScripts) uosc thumbfast; }; enable = true;
scripts = builtins.attrValues { inherit (pkgs.mpvScripts) uosc thumbfast; };
};
# Status bar # Status bar
programs.waybar.enable = true; programs.waybar = {
programs.waybar.systemd.enable = true; enable = true;
programs.waybar.settings = import ./waybar-settings.nix { inherit config lib; }; systemd.enable = true;
settings = import ./waybar-settings.nix { inherit config lib; };
};
# Terminal # Terminal
programs.wezterm.enable = cfg.terminal == "wezterm"; programs.wezterm = {
programs.wezterm.extraConfig = '' enable = cfg.terminal == "wezterm";
extraConfig = ''
config = {} config = {}
config.hide_tab_bar_if_only_one_tab = true config.hide_tab_bar_if_only_one_tab = true
config.window_padding = { left = 1, right = 1, top = 1, bottom = 1 } config.window_padding = { left = 1, right = 1, top = 1, bottom = 1 }
return config return config
''; '';
};
programs.alacritty.enable = cfg.terminal == "alacritty"; programs.alacritty.enable = cfg.terminal == "alacritty";
programs.zellij.enable = cfg.terminal == "alacritty"; # alacritty has no terminal multiplexerr built in programs.zellij.enable = cfg.terminal == "alacritty"; # alacritty has no terminal multiplexerr built in
# PDF reader # PDF reader