raf/neovim-flake
1
0
Fork 0
mirror of https://github.com/NotAShelf/neovim-flake.git synced 2025-01-09 17:49:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: raf:38c9d9ca14f241245982b295b2bb590447eb1ec3
Branches Tags
raf:main
raf:gh-pages
raf:flutter-fix
raf:feline
raf:more-option-stuff
raf:gitsigns-setupopts
raf:docs-tips
raf:live-docs-preview
raf:render-markdown-nvim
raf:bump-all-inputs
raf:fix-mdpw-ft
raf:docs-search-bar
raf:minimize-maximal
raf:v0.7
raf:v0.6
raf:abstract-lspconfig
raf:refactor-languages
raf:get-edgy
raf:machine-tests
raf:migrate-legacy-code
raf:poc-formatted-lua
raf:v0.5
raf:feature/nvim-debug
raf:v0.7
raf:v0.6
raf:v0.5
raf:v0.4
raf:v0.3
raf:v0.2
..
compare: raf:54732875b567c2125b373912c087be1183a1936b
Branches Tags
raf:main
raf:gh-pages
raf:flutter-fix
raf:feline
raf:more-option-stuff
raf:gitsigns-setupopts
raf:docs-tips
raf:live-docs-preview
raf:render-markdown-nvim
raf:bump-all-inputs
raf:fix-mdpw-ft
raf:docs-search-bar
raf:minimize-maximal
raf:v0.7
raf:v0.6
raf:abstract-lspconfig
raf:refactor-languages
raf:get-edgy
raf:machine-tests
raf:migrate-legacy-code
raf:poc-formatted-lua
raf:v0.5
raf:feature/nvim-debug
raf:v0.7
raf:v0.6
raf:v0.5
raf:v0.4
raf:v0.3
raf:v0.2

13 commits
38c9d9ca14 ... 54732875b5

Author SHA1 Message Date
Ching Pei Yang
54732875b5
Merge d14c5e57db into ba3173d363 2024-12-30 11:10:40 +00:00
Ching Pei Yang
d14c5e57db
nixos: use attrset for long function args 2024-12-30 12:10:35 +01:00
Ching Pei Yang
6daec44f40
home-manager: use attr for long function args 2024-12-30 12:10:34 +01:00
Ching Pei Yang
835b775fa9
nixos: remove redundant import module 2024-12-30 12:10:34 +01:00
Ching Pei Yang
fb96ccb85b
home-manager: remove redundant import module 2024-12-30 12:10:34 +01:00
Ching Pei Yang
27f3430296
lib: remove anythingConcatLists 2024-12-30 12:10:34 +01:00
Ching Pei Yang
f8780947b7
nixos: use proper submodule type for settings 2024-12-30 12:07:54 +01:00
Ching Pei Yang
e9cc77dff7
module: remove redundant code 
the bulk of the build step is moved to modules/wrapper/build
 2024-12-30 12:07:53 +01:00
Ching Pei Yang
dc5551b050
home-manager: use proper submodule type for settings 2024-12-30 12:07:53 +01:00
Ching Pei Yang
2217565730
wrapper: add built package as option 2024-12-30 12:07:53 +01:00
Ching Pei Yang
4e867c5425
wrapper: rename build dir to environemnt 2024-12-30 12:07:53 +01:00
raf
ba3173d363
Merge pull request #515 from diniamo/update-run 
flake: update run.nvim
 2024-12-30 12:05:52 +03:00
diniamo
c3b51df4a6 flake: update run.nvim 2024-12-30 09:49:33 +01:00
5 changed files with 12 additions and 19 deletions
Show stats Expand all files Collapse all files

6
flake.lock
View file

@ -1729,11 +1729,11 @@
"plugin-run-nvim": { "plugin-run-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1735130195, "lastModified": 1735501787,
"narHash": "sha256-OaOSYyXSNCl9kJJVKhy0L4M06CQFc0NtZ8+AIgKBPik=", "narHash": "sha256-CFOyOARCLQiMOhFPeqz8n2ULyaaRxRZrOk0FCibjuIM=",
"owner": "diniamo", "owner": "diniamo",
"repo": "run.nvim", "repo": "run.nvim",
"rev": "5888f31c5faf4776e598c0665470f5445510c59e", "rev": "9015c9cece816ccf10a185b420f6e345fd990802",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
flake.nix
View file

@ -31,10 +31,7 @@
}; };
homeManagerModules = { homeManagerModules = {
nvf = import ./flake/modules/home-manager.nix { nvf = import ./flake/modules/home-manager.nix {inherit lib self;};
inherit lib inputs;
inherit (self) packages;
};
default = self.homeManagerModules.nvf; default = self.homeManagerModules.nvf;
neovim-flake = neovim-flake =
lib.warn '' lib.warn ''
@ -45,10 +42,7 @@
}; };
nixosModules = { nixosModules = {
nvf = import ./flake/modules/nixos.nix { nvf = import ./flake/modules/nixos.nix {inherit lib self;};
inherit lib inputs;
inherit (self) packages;
};
default = self.nixosModules.nvf; default = self.nixosModules.nvf;
neovim-flake = neovim-flake =
lib.warn '' lib.warn ''

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

@ -1,13 +1,13 @@
# Home Manager module # Home Manager module
{ {
packages, self,
lib, lib,
inputs,
}: { }: {
config, config,
pkgs, pkgs,
... ...
}: let }: let
inherit (self) packages inputs;
inherit (lib) maintainers; inherit (lib) maintainers;
inherit (lib.modules) mkIf mkAliasOptionModule; inherit (lib.modules) mkIf mkAliasOptionModule;
inherit (lib.lists) optional; inherit (lib.lists) optional;
@ -84,7 +84,7 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.nvf.finalPackage = config.programs.nvf.settings.vim.build.finalPackage; programs.nvf.finalPackage = cfg.settings.vim.build.finalPackage;
home = { home = {
sessionVariables = mkIf cfg.defaultEditor {EDITOR = "nvim";}; sessionVariables = mkIf cfg.defaultEditor {EDITOR = "nvim";};

6
flake/modules/nixos.nix
View file

@ -1,13 +1,13 @@
# NixOS module # NixOS module
{ {
packages, self,
lib, lib,
inputs,
}: { }: {
config, config,
pkgs, pkgs,
... ...
}: let }: let
inherit (self) inputs packages;
inherit (lib) maintainers; inherit (lib) maintainers;
inherit (lib.modules) mkIf mkOverride mkAliasOptionModule; inherit (lib.modules) mkIf mkOverride mkAliasOptionModule;
inherit (lib.lists) optional; inherit (lib.lists) optional;
@ -84,7 +84,7 @@ in {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.nvf.finalPackage = config.programs.nvf.settings.vim.build.finalPackage; programs.nvf.finalPackage = cfg.settings.vim.build.finalPackage;
environment = { environment = {
variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim"); variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim");

3
lib/types/custom.nix
View file

@ -1,8 +1,7 @@
{lib}: let {lib}: let
inherit (lib.options) mergeEqualOption; inherit (lib.options) mergeEqualOption;
inherit (lib.strings) isString; inherit (lib.strings) isString stringLength match;
inherit (lib.types) listOf mkOptionType; inherit (lib.types) listOf mkOptionType;
inherit (builtins) stringLength match;
in { in {
mergelessListOf = elemType: let mergelessListOf = elemType: let
super = listOf elemType; super = listOf elemType;