From ec382aca584ad03faa48a0407c30096a64100d83 Mon Sep 17 00:00:00 2001 From: Dragyx <66752602+Dragyx@users.noreply.github.com> Date: Sat, 13 Apr 2024 15:12:46 +0200 Subject: [PATCH] Actually add vesktop package if vesktop is enabled --- modules/cli/neovim.nix | 35 +++++++++++++++++++++++++++++++++++ modules/gui/vesktop.nix | 1 + 2 files changed, 36 insertions(+) create mode 100644 modules/cli/neovim.nix diff --git a/modules/cli/neovim.nix b/modules/cli/neovim.nix new file mode 100644 index 0000000..011697a --- /dev/null +++ b/modules/cli/neovim.nix @@ -0,0 +1,35 @@ +{ config, lib, pkgs, ... }: + +let + lazyvim-config = pkgs.fetchFromGitHub { + owner = "Dragyx"; + repo = "lazyvim-config"; + rev = "d799724f48199d81ca6c8abb5951860fbf8fa0df"; + hash = "sha256-NF92CweRFQ1qZS8NXoTUEljazRGXgXS2AuDt5IWmwBc="; + }; + cfg = config.modules.neovim-old; + username = config.modules.other.system.username; +in +{ + options.modules.cli.neovim-old = lib.mkEnableOption "neovim-old"; + + config = lib.mkIf cfg.enable { + home-manager.users.${username} = { + home.packages = with pkgs; [ lazygit ripgrep fd gcc xclip rust-analyzer ]; + programs.neovim = { + enable = true; + viAlias = true; + vimAlias = true; + defaultEditor = true; + }; + + xdg.configFile."nvim" = { + enable = true; + source = lazyvim-config; + recursive = true; + }; + }; + + + } +} diff --git a/modules/gui/vesktop.nix b/modules/gui/vesktop.nix index 044ec77..a209062 100644 --- a/modules/gui/vesktop.nix +++ b/modules/gui/vesktop.nix @@ -13,6 +13,7 @@ in { config = mkIf cfg.enable { home-manager.users.${username} = { + home.packages = with pkgs; [ vesktop ]; xdg.configFile."vesktop/settings.json".text = builtins.toJSON { discordBranch = "ptb"; firstLaunch = false;