diff --git a/home/programs/graphical/apps/vesktop/default.nix b/home/programs/graphical/apps/vesktop/default.nix index 8ef56eb..ead6064 100644 --- a/home/programs/graphical/apps/vesktop/default.nix +++ b/home/programs/graphical/apps/vesktop/default.nix @@ -11,20 +11,24 @@ in { config = mkIf cfg.enable { home.packages = with pkgs; [ vesktop ]; - 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" ]; + 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; }; - Service = { - Type = "simple"; - Restart = "on-failure"; - ExecStart = "${pkgs.vesktop}/bin/vesktop"; + "autostart/vesktop.desktop" = mkIf cfg.autoStart { + source = "${pkgs.vesktop}/share/applications/vesktop.desktop"; }; - - Install.WantedBy = [ "graphical-session.target" ]; }; }; } diff --git a/home/programs/graphical/bars/eww/default.nix b/home/programs/graphical/bars/eww/default.nix index fa511f9..cb06535 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.target" ]; + PartOf = [ "graphical-session-pre.target" ]; }; Service = { diff --git a/home/programs/terminal/tools/fastfetch.nix b/home/programs/terminal/tools/fastfetch.nix deleted file mode 100644 index ae82717..0000000 --- a/home/programs/terminal/tools/fastfetch.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - 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 cc2ff7f..2f07c9e 100644 --- a/home/programs/terminal/tools/hyfetch.nix +++ b/home/programs/terminal/tools/hyfetch.nix @@ -1,31 +1,3 @@ { - 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; - }; - }; - }; + programs.hyfetch.enable = true; } diff --git a/hosts/voyager/default.nix b/hosts/voyager/default.nix index 1fde840..2aeb09d 100644 --- a/hosts/voyager/default.nix +++ b/hosts/voyager/default.nix @@ -136,10 +136,6 @@ 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 422399e..f271c18 100644 --- a/options/home/programs/default.nix +++ b/options/home/programs/default.nix @@ -32,10 +32,5 @@ 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"; - }; }; }