From 70dba827e81f7380e992506426ec7f1d36518ea8 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Sun, 28 Jan 2024 10:21:16 -0500 Subject: [PATCH] Cleaned up a bit --- .../modules/alacritty/default.nix | 9 +-------- .../desktopEnvironments/modules/fun/default.nix | 4 +++- .../gui/desktopEnvironments/sway/default.nix | 15 +++++++++++---- homeConfig/modules/security/default.nix | 4 +++- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/homeConfig/modules/gui/desktopEnvironments/modules/alacritty/default.nix b/homeConfig/modules/gui/desktopEnvironments/modules/alacritty/default.nix index 6f6e61a..9a639b6 100644 --- a/homeConfig/modules/gui/desktopEnvironments/modules/alacritty/default.nix +++ b/homeConfig/modules/gui/desktopEnvironments/modules/alacritty/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, ... }: +{ lib, config, ... }: with lib; let @@ -11,12 +11,5 @@ in enable = true; settings = import ./config/alacritty.nix; }; - - home.packages = with pkgs; [ - terminus-nerdfont - noto-fonts - noto-fonts-cjk - noto-fonts-emoji - ]; }; } diff --git a/homeConfig/modules/gui/desktopEnvironments/modules/fun/default.nix b/homeConfig/modules/gui/desktopEnvironments/modules/fun/default.nix index dfb5d25..14b73bb 100644 --- a/homeConfig/modules/gui/desktopEnvironments/modules/fun/default.nix +++ b/homeConfig/modules/gui/desktopEnvironments/modules/fun/default.nix @@ -17,7 +17,9 @@ in }; home.packages = with pkgs; [ - spotify webcord showmethekey + spotify + webcord + showmethekey ]; }; } diff --git a/homeConfig/modules/gui/desktopEnvironments/sway/default.nix b/homeConfig/modules/gui/desktopEnvironments/sway/default.nix index 7ea3589..9d56070 100644 --- a/homeConfig/modules/gui/desktopEnvironments/sway/default.nix +++ b/homeConfig/modules/gui/desktopEnvironments/sway/default.nix @@ -32,10 +32,6 @@ in platformTheme = "gtk"; }; - programs = { - imv.enable = true; - }; - home.packages = with pkgs; [ xdg-utils grim @@ -45,8 +41,19 @@ in ranger highlight + + terminus-nerdfont + noto-fonts + noto-fonts-cjk + noto-fonts-emoji + + emote ]; + programs = { + imv.enable = true; + }; + fonts.fontconfig.enable = true; modules = { diff --git a/homeConfig/modules/security/default.nix b/homeConfig/modules/security/default.nix index f568e8e..b388ba1 100644 --- a/homeConfig/modules/security/default.nix +++ b/homeConfig/modules/security/default.nix @@ -8,7 +8,9 @@ in { options.modules.security = { enable = mkEnableOption "security"; }; config = mkIf cfg.enable { home.packages = with pkgs; [ - pass wireguard-tools ipscan + pass + wireguard-tools + ipscan ]; }; }