raf/neovim-flake
1
0
Fork 0
mirror of https://github.com/NotAShelf/neovim-flake.git synced 2024-11-09 14:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: raf:a20f84edfb97b58ddd33b6b9cdc88c98cd49fda8
Branches Tags
raf:main
raf:v0.7
raf:update-all-inputs
raf:gh-pages
raf:typos-and-friends
raf:feature/lzn
raf:spell-cleanup
raf:abstract-lspconfig
raf:refactor-languages
raf:visual-setupOpts
raf:update-inputs
raf:get-edgy
raf:undofile-opts
raf:get-based
raf:new-codeactions
raf:breadcrubs-lualine
raf:helper-scripts
raf:ts-error-translator
raf:bufferline-setupopts
raf:clean-up-plugins
raf:machine-tests
raf:minor-lang-refactor
raf:migrate-legacy-code
raf:treesitter
raf:sanitize-runtimepath
raf:v0.6
raf:plugin/chatgpt
raf:poc-formatted-lua
raf:plugins/fugitive
raf:v0.5
raf:restructure-tree
raf:dev/chadtree
raf:dev/misc
raf:feature/otter.nvim
raf:feature/nvim-debug
raf:v0.6
raf:v0.5
raf:v0.4
raf:v0.3
raf:v0.2
...
compare: raf:a777941eeda378c8654b171bb234e85eb31ffe3c
Branches Tags
raf:v0.7
raf:update-all-inputs
raf:gh-pages
raf:main
raf:typos-and-friends
raf:feature/lzn
raf:spell-cleanup
raf:abstract-lspconfig
raf:refactor-languages
raf:visual-setupOpts
raf:update-inputs
raf:get-edgy
raf:undofile-opts
raf:get-based
raf:new-codeactions
raf:breadcrubs-lualine
raf:helper-scripts
raf:ts-error-translator
raf:bufferline-setupopts
raf:clean-up-plugins
raf:machine-tests
raf:minor-lang-refactor
raf:migrate-legacy-code
raf:treesitter
raf:sanitize-runtimepath
raf:v0.6
raf:plugin/chatgpt
raf:poc-formatted-lua
raf:plugins/fugitive
raf:v0.5
raf:restructure-tree
raf:dev/chadtree
raf:dev/misc
raf:feature/otter.nvim
raf:feature/nvim-debug
raf:v0.6
raf:v0.5
raf:v0.4
raf:v0.3
raf:v0.2

2 commits
a20f84edfb ... a777941eed

Author SHA1 Message Date
raf
a777941eed
Merge pull request #280 from NotAShelf/rename-module-opts 
flake/modules: alias `programs.nvf` to `programs.neovim-flake`
 2024-05-06 06:54:59 +00:00
NotAShelf
ab2685579a
flake/modules: alias programs.nvf to programs.neovim-flake 
I will deprecate it in a future date, but for now it is fine.
 2024-05-05 02:51:03 +03:00
2 changed files with 26 additions and 18 deletions
Show stats Expand all files Collapse all files

22
flake/modules/home-manager.nix
View file

@ -6,12 +6,12 @@ packages: inputs: {
...
}: let
inherit (lib) maintainers;
inherit (lib.modules) mkIf;
inherit (lib.modules) mkIf mkAliasOptionModule;
inherit (lib.lists) optional;
inherit (lib.options) mkOption mkEnableOption literalExpression;
inherit (lib.types) attrsOf anything bool;
cfg = config.programs.neovim-flake;
cfg = config.programs.nvf;
inherit (import ../../configuration.nix inputs) neovimConfiguration;
neovimConfigured = neovimConfiguration {
@ -19,22 +19,26 @@ packages: inputs: {
modules = [cfg.settings];
};
in {
imports = [
(mkAliasOptionModule ["programs" "neovim-flake"] ["programs" "nvf"])
];
meta.maintainers = with maintainers; [NotAShelf];
options.programs.neovim-flake = {
enable = mkEnableOption "neovim-flake, the extensible neovim configuration wrapper";
options.programs.nvf = {
enable = mkEnableOption "nvf, the extensible neovim configuration wrapper";
enableManpages = mkOption {
type = bool;
default = false;
description = "Whether to enable manpages for neovim-flake.";
description = "Whether to enable manpages for nvf.";
};
defaultEditor = mkOption {
type = bool;
default = false;
description = ''
Whether to set `neovim-flake` as the default editor.
Whether to set `nvf` as the default editor.
This will set the `EDITOR` environment variable as `nvim`
if set to true.
@ -46,14 +50,14 @@ in {
visible = false;
readOnly = true;
description = ''
The built neovim-flake package, wrapped with the user's configuration.
The built nvf package, wrapped with the user's configuration.
'';
};
settings = mkOption {
type = attrsOf anything;
default = {};
description = "Attribute set of neovim-flake preferences.";
description = "Attribute set of nvf preferences.";
example = literalExpression ''
{
vim.viAlias = false;
@ -75,7 +79,7 @@ in {
};
config = mkIf cfg.enable {
programs.neovim-flake.finalPackage = neovimConfigured.neovim;
programs.nvf.finalPackage = neovimConfigured.neovim;
home = {
sessionVariables = mkIf cfg.defaultEditor {EDITOR = "nvim";};

22
flake/modules/nixos.nix
View file

@ -6,12 +6,12 @@ packages: inputs: {
...
}: let
inherit (lib) maintainers;
inherit (lib.modules) mkIf mkOverride;
inherit (lib.modules) mkIf mkOverride mkAliasOptionModule;
inherit (lib.lists) optional;
inherit (lib.options) mkOption mkEnableOption literalExpression;
inherit (lib.types) attrsOf anything bool;
cfg = config.programs.neovim-flake;
cfg = config.programs.nvf;
inherit (import ../../configuration.nix inputs) neovimConfiguration;
neovimConfigured = neovimConfiguration {
@ -19,22 +19,26 @@ packages: inputs: {
modules = [cfg.settings];
};
in {
imports = [
(mkAliasOptionModule ["programs" "neovim-flake"] ["programs" "nvf"])
];
meta.maintainers = with maintainers; [NotAShelf];
options.programs.neovim-flake = {
enable = mkEnableOption "neovim-flake, the extensible neovim configuration wrapper";
options.programs.nvf = {
enable = mkEnableOption "nvf, the extensible neovim configuration wrapper";
enableManpages = mkOption {
type = bool;
default = false;
description = "Whether to enable manpages for neovim-flake.";
description = "Whether to enable manpages for nvf.";
};
defaultEditor = mkOption {
type = bool;
default = false;
description = ''
Whether to set `neovim-flake` as the default editor.
Whether to set `nvf` as the default editor.
This will set the `EDITOR` environment variable as `nvim`
if set to true.
@ -46,14 +50,14 @@ in {
visible = false;
readOnly = true;
description = ''
The built neovim-flake package, wrapped with the user's configuration.
The built nvf package, wrapped with the user's configuration.
'';
};
settings = mkOption {
type = attrsOf anything;
default = {};
description = "Attribute set of neovim-flake preferences.";
description = "Attribute set of nvf preferences.";
example = literalExpression ''
{
vim.viAlias = false;
@ -75,7 +79,7 @@ in {
};
config = mkIf cfg.enable {
programs.neovim-flake.finalPackage = neovimConfigured.neovim;
programs.nvf.finalPackage = neovimConfigured.neovim;
environment = {
variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim");