neovim module changes

This commit is contained in:
jacekpoz 2024-02-14 15:43:51 +01:00
parent 87af62f88b
commit 80c7c536bd
No known key found for this signature in database
GPG key ID: 94E812A8B12AAE3C
2 changed files with 5 additions and 4 deletions

View file

@ -142,8 +142,6 @@
environment = { environment = {
sessionVariables = { sessionVariables = {
EDITOR = "${pkgs.neovim}/bin/nvim";
GTK_IM_MODULE = "fcitx"; GTK_IM_MODULE = "fcitx";
QT_IM_MODULE = "fcitx"; QT_IM_MODULE = "fcitx";
XMODIFIERS = "@im=fcitx"; XMODIFIERS = "@im=fcitx";
@ -373,7 +371,7 @@
userName = "jacekpoz"; userName = "jacekpoz";
userEmail = "jacekpoz@cock.li"; userEmail = "jacekpoz@cock.li";
signingKey = "0EEE6B0C9A8CC06820E59C3894E812A8B12AAE3C"; signingKey = "0EEE6B0C9A8CC06820E59C3894E812A8B12AAE3C";
editor = "${pkgs.neovim-nightly}/bin/nvim"; editor = config.environment.sessionVariables.EDITOR;
defaultBranch = "master"; defaultBranch = "master";
}; };
starship.enable = true; starship.enable = true;

View file

@ -12,12 +12,15 @@ in {
options.myOptions.programs.neovim.enable = mkEnableOption "enable neovim"; options.myOptions.programs.neovim.enable = mkEnableOption "enable neovim";
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.sessionVariables = {
EDITOR = "${pkgs.neovim}/bin/nvim";
};
home-manager.users.${config'.username} = { home-manager.users.${config'.username} = {
imports = [ inputs.nixvim.homeManagerModules.nixvim ]; imports = [ inputs.nixvim.homeManagerModules.nixvim ];
programs.nixvim = { programs.nixvim = {
enable = true; enable = true;
defaultEditor = true;
package = pkgs.neovim-nightly; package = pkgs.neovim-nightly;
enableMan = true; enableMan = true;
colorscheme = "catppuccin"; colorscheme = "catppuccin";