noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-03-14 21:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix neovim colors

Browse Source
This commit is contained in:
Noah Masur 2025-03-09 16:31:29 +00:00
parent e90c6b1724
commit f59ac536a2
3 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/applications/editors/neovim/nmasur/neovim/config/colors.nix
View File

@ -8,20 +8,20 @@
# Sets Neovim colors based on Nix colorscheme # Sets Neovim colors based on Nix colorscheme
# options.colors = lib.mkOption { options.colors = lib.mkOption {
# type = lib.types.attrsOf lib.types.str; type = lib.types.attrsOf lib.types.str;
# description = "Attrset of base16 colorscheme key value pairs."; description = "Attrset of base16 colorscheme key value pairs.";
# }; };
# config = lib.mkIf config.colors { config = {
# plugins = [ pkgs.vimPlugins.base16-nvim ]; plugins = [ pkgs.vimPlugins.base16-nvim ];
# setup.base16-colorscheme = config.colors; setup.base16-colorscheme = config.colors;
#
# # Telescope isn't working, shut off for now # Telescope isn't working, shut off for now
# lua = '' lua = ''
# require('base16-colorscheme').with_config { require('base16-colorscheme').with_config {
# telescope = false, telescope = false,
# } }
# ''; '';
# }; };
} }

18
pkgs/applications/editors/neovim/nmasur/neovim/package.nix
View File

@ -28,10 +28,10 @@
{ {
pkgs, pkgs,
# colors ? null, colors ? (import ../../../../../../colorscheme/gruvbox).dark,
# terraform ? false, terraform ? false,
# github ? false, github ? false,
# kubernetes ? false, kubernetes ? false,
... ...
}: }:
@ -40,15 +40,15 @@
pkgs.neovimBuilder { pkgs.neovimBuilder {
package = pkgs.neovim-unwrapped; package = pkgs.neovim-unwrapped;
inherit inherit
# colors colors
# terraform terraform
# github github
# kubernetes kubernetes
; ;
imports = [ imports = [
./config/align.nix ./config/align.nix
./config/bufferline.nix ./config/bufferline.nix
# ./config/colors.nix ./config/colors.nix
./config/completion.nix ./config/completion.nix
./config/gitsigns.nix ./config/gitsigns.nix
./config/lsp.nix ./config/lsp.nix

19
platforms/home-manager/modules/nmasur/presets/programs/neovim.nix
View File

@ -28,13 +28,14 @@ in
home.packages = [ cfg.package ]; home.packages = [ cfg.package ];
#nmasur.presets.programs.neovim.package = lib.mkDefault pkgs.nmasur-neovim.override { nmasur.presets.programs.neovim.package = lib.mkDefault (
# colors = cfg.colors; pkgs.nmasur.neovim.override {
# github = cfg.github.enable; colors = cfg.colors;
# terraform = cfg.terraform.enable; github = cfg.github.enable;
# kubernetes = cfg.kubernetes.enable; terraform = cfg.terraform.enable;
#}; kubernetes = cfg.kubernetes.enable;
nmasur.presets.programs.neovim.package = pkgs.nmasur.neovim; }
);
# Use Neovim as the editor for git commit messages # Use Neovim as the editor for git commit messages
programs.git.extraConfig.core.editor = "${lib.getExe cfg.package}"; programs.git.extraConfig.core.editor = "${lib.getExe cfg.package}";
@ -61,7 +62,9 @@ in
# Create a desktop option for launching Neovim from a file manager # Create a desktop option for launching Neovim from a file manager
# (Requires launching the terminal and then executing Neovim) # (Requires launching the terminal and then executing Neovim)
xdg.desktopEntries.nvim = lib.mkIf (pkgs.stdenv.isLinux && config.nmasur.presets.services.i3.enable) { xdg.desktopEntries.nvim =
lib.mkIf (pkgs.stdenv.isLinux && config.nmasur.presets.services.i3.enable)
{
name = "Neovim wrapper"; name = "Neovim wrapper";
exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} nvim %F"; # TODO: change to generic exec = "${lib.getExe config.nmasur.presets.services.i3.terminal} nvim %F"; # TODO: change to generic
mimeType = [ mimeType = [