diff --git a/home/programs/graphical/bars/eww/default.nix b/home/programs/graphical/bars/eww/default.nix index fa511f9..82d92b4 100644 --- a/home/programs/graphical/bars/eww/default.nix +++ b/home/programs/graphical/bars/eww/default.nix @@ -15,7 +15,28 @@ in { }; systemd.user.services = { - "eww" = { + "eww" = let + # All dependencies required for eww and for the scripts/widgets it uses + dependencies = with pkgs; [ + python3 + bash + coreutils + gnugrep + gawk + netcat-openbsd + jq + util-linux + systemd + bluez + upower + wl-gammarelay-rs + gammastep + networkmanager + wireplumber + pulseaudio + hyprland + ]; + in { Unit = { Description = "ElKowar's Wacky Widgets (eww) daemon"; After = [ "graphical-session-pre.target" ]; @@ -24,7 +45,8 @@ in { Service = { Type = "simple"; - Restart = "always"; + Restart = "alwayss"; + Environment = "PATH=/run/wrappers/bin:${lib.makeBinPath dependencies}"; ExecStart = pkgs.writeShellScript "eww-daemon" '' ${pkgs.eww}/bin/eww daemon --no-daemonize ''; diff --git a/home/programs/terminal/tools/default.nix b/home/programs/terminal/tools/default.nix index 00fcb55..6dd48fb 100644 --- a/home/programs/terminal/tools/default.nix +++ b/home/programs/terminal/tools/default.nix @@ -9,6 +9,7 @@ _: { ./zoxide.nix ./tealdeer.nix ./hyfetch.nix + ./fastfetch.nix ./btop.nix ./bottom.nix ./bat.nix diff --git a/home/programs/terminal/tools/fastfetch.nix b/home/programs/terminal/tools/fastfetch.nix new file mode 100644 index 0000000..ae82717 --- /dev/null +++ b/home/programs/terminal/tools/fastfetch.nix @@ -0,0 +1,14 @@ +{ + lib, + osConfig, + ... +}: let + inherit (lib) mkIf; + + cfg = osConfig.myOptions.home-manager.programs.tools.fastfetch; +in { + config = mkIf cfg.enable { + programs.fastfetch.enable = true; + }; +} + diff --git a/home/programs/terminal/tools/hyfetch.nix b/home/programs/terminal/tools/hyfetch.nix index 53be5f8..cc2ff7f 100644 --- a/home/programs/terminal/tools/hyfetch.nix +++ b/home/programs/terminal/tools/hyfetch.nix @@ -1,21 +1,31 @@ { - programs.hyfetch = { - enable = true; - settings = { - preset = "rainbow"; - mode = "rgb"; - light_dark = "dark"; - lightness = 0.65; - color_align = { - mode = "horizontal"; - custom_colors = []; - force_back = null; + lib, + osConfig, + ... +}: let + inherit (lib) mkIf; + + cfg = osConfig.myOptions.home-manager.programs.tools.hyfetch; +in { + config = mkIf cfg.enable { + programs.hyfetch = { + enable = true; + settings = { + preset = "rainbow"; + mode = "rgb"; + light_dark = "dark"; + lightness = 0.65; + color_align = { + mode = "custom"; + custom_colors = {}; + force_back = null; + }; + backend = "neofetch"; + args = null; + distro = null; + pride_month_shown = []; + pride_month_disable = true; }; - backend = "neofetch"; - args = null; - distro = null; - pride_month_shown = []; - pride_month_disable = true; }; }; } diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix index 2aeb09d..bf7e3bb 100644 --- a/hosts/voyager/default.nix +++ b/hosts/voyager/default.nix @@ -125,7 +125,17 @@ wms.hyprland = { enable = true; monitor = [ - "eDP-1, 1920x1080@60, 0x0, 1" + # Primary / laptop display + "eDP-1, 1920x1200@60, 0x1080, 1" + + # HDMI-A-1 above primary + "HDMI-A-1, 1920x1080@60, 0x0, 1" + + # HDMI-A-1 left to primary + #"HDMI-A-1, 1920x1080@60, 1920x1080, 1" + + # Mirror the primary (laptop) monitor on externals + ", preferred, auto, 1, mirror, eDP-1" ]; }; @@ -136,6 +146,10 @@ chromium.enable = true; mullvad-browser.enable = true; }; + tools = { + fastfetch.enable = true; + hyfetch.enable = true; + }; spotify.enable = true; stremio.enable = true; vesktop = { diff --git a/options/home/programs/default.nix b/options/home/programs/default.nix index f271c18..422399e 100644 --- a/options/home/programs/default.nix +++ b/options/home/programs/default.nix @@ -32,5 +32,10 @@ in enable = mkEnableOption "Vesktop (An alternate client for Discord with Vencord built-in)"; autoStart = mkEnableOption "Auto-Start for Vesktop"; }; + + tools = { + fastfetch.enable = mkEnableOption "FastFetch (fast neofetch)"; + hyfetch.enable = mkEnableOption "Neofetch with pride flags"; + }; }; }