Merge d14c5e57db into ba3173d363

nixos: use attrset for long function args
home-manager: use attr for long function args
2025-01-08 09:09:49 +01:00 · 2024-12-30 11:10:40 +00:00 · 2024-12-30 12:10:35 +01:00 · 2024-12-30 12:10:34 +01:00 · 2024-12-30 12:10:34 +01:00 · 2024-12-30 12:10:34 +01:00
5 changed files with 12 additions and 19 deletions
--- a/flake.lock
+++ b/flake.lock
@ -1729,11 +1729,11 @@
    "plugin-run-nvim": {
      "flake": false,
      "locked": {
-        "lastModified": 1735130195,
-        "narHash": "sha256-OaOSYyXSNCl9kJJVKhy0L4M06CQFc0NtZ8+AIgKBPik=",
+        "lastModified": 1735501787,
+        "narHash": "sha256-CFOyOARCLQiMOhFPeqz8n2ULyaaRxRZrOk0FCibjuIM=",
        "owner": "diniamo",
        "repo": "run.nvim",
-        "rev": "5888f31c5faf4776e598c0665470f5445510c59e",
+        "rev": "9015c9cece816ccf10a185b420f6e345fd990802",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -31,10 +31,7 @@
        };

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

        nixosModules = {
-          nvf = import ./flake/modules/nixos.nix {
-            inherit lib inputs;
-            inherit (self) packages;
-          };
+          nvf = import ./flake/modules/nixos.nix {inherit lib self;};
          default = self.nixosModules.nvf;
          neovim-flake =
            lib.warn ''
--- a/flake/modules/home-manager.nix
+++ b/flake/modules/home-manager.nix
@ -1,13 +1,13 @@
 # Home Manager module
 {
-  packages,
+  self,
  lib,
-  inputs,
 }: {
  config,
  pkgs,
  ...
 }: let
+  inherit (self) packages inputs;
  inherit (lib) maintainers;
  inherit (lib.modules) mkIf mkAliasOptionModule;
  inherit (lib.lists) optional;
@ -84,7 +84,7 @@ in {
  };

  config = mkIf cfg.enable {
-    programs.nvf.finalPackage = config.programs.nvf.settings.vim.build.finalPackage;
+    programs.nvf.finalPackage = cfg.settings.vim.build.finalPackage;

    home = {
      sessionVariables = mkIf cfg.defaultEditor {EDITOR = "nvim";};
--- a/flake/modules/nixos.nix
+++ b/flake/modules/nixos.nix
@ -1,13 +1,13 @@
 # NixOS module
 {
-  packages,
+  self,
  lib,
-  inputs,
 }: {
  config,
  pkgs,
  ...
 }: let
+  inherit (self) inputs packages;
  inherit (lib) maintainers;
  inherit (lib.modules) mkIf mkOverride mkAliasOptionModule;
  inherit (lib.lists) optional;
@ -84,7 +84,7 @@ in {
  };

  config = mkIf cfg.enable {
-    programs.nvf.finalPackage = config.programs.nvf.settings.vim.build.finalPackage;
+    programs.nvf.finalPackage = cfg.settings.vim.build.finalPackage;

    environment = {
      variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "nvim");
--- a/lib/types/custom.nix
+++ b/lib/types/custom.nix
@ -1,8 +1,7 @@
 {lib}: let
  inherit (lib.options) mergeEqualOption;
-  inherit (lib.strings) isString;
+  inherit (lib.strings) isString stringLength match;
  inherit (lib.types) listOf mkOptionType;
-  inherit (builtins) stringLength match;
 in {
  mergelessListOf = elemType: let
    super = listOf elemType;
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