diff --git a/home/programs/graphical/apps/vesktop/default.nix b/home/programs/graphical/apps/vesktop/default.nix index ead6064..8ef56eb 100644 --- a/home/programs/graphical/apps/vesktop/default.nix +++ b/home/programs/graphical/apps/vesktop/default.nix @@ -11,24 +11,20 @@ in { config = mkIf cfg.enable { home.packages = with pkgs; [ vesktop ]; - xdg.configFile = { - "vesktop/settings.json".text = builtins.toJSON { - discordBranch = "stable"; # consider "ptb" - firstLaunch = false; - arRPC = "on"; - splashColor = "rgb(219, 222, 225)"; - splashBackground = "rgb(49, 51, 56)"; - checkUpdates = false; - staticTitle = true; - disableMinSize = true; - minimizeToTray = false; - tray = false; - appBadge = false; + systemd.user.services."vesktop" = mkIf cfg.autoStart { + Unit = { + Description = "Vesktop (An alternate client for Discord with Vencord built-in)"; + After = [ "graphical-session.target" ]; + PartOf = [ "graphical-session.target" ]; }; - "autostart/vesktop.desktop" = mkIf cfg.autoStart { - source = "${pkgs.vesktop}/share/applications/vesktop.desktop"; + Service = { + Type = "simple"; + Restart = "on-failure"; + ExecStart = "${pkgs.vesktop}/bin/vesktop"; }; + + Install.WantedBy = [ "graphical-session.target" ]; }; }; } diff --git a/home/programs/graphical/bars/eww/default.nix b/home/programs/graphical/bars/eww/default.nix index cb06535..fa511f9 100644 --- a/home/programs/graphical/bars/eww/default.nix +++ b/home/programs/graphical/bars/eww/default.nix @@ -43,7 +43,7 @@ in { Unit = { Description = "Open %I eww (ElKowar's Wacky Widgets) window"; After = [ "eww.service" ]; - PartOf = [ "graphical-session-pre.target" ]; + PartOf = [ "graphical-session.target" ]; }; Service = { 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 2f07c9e..cc2ff7f 100644 --- a/home/programs/terminal/tools/hyfetch.nix +++ b/home/programs/terminal/tools/hyfetch.nix @@ -1,3 +1,31 @@ { - programs.hyfetch.enable = true; + 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; + }; + }; + }; } diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix index 2aeb09d..1fde840 100644 --- a/hosts/voyager/default.nix +++ b/hosts/voyager/default.nix @@ -136,6 +136,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"; + }; }; }