diff --git a/flake.lock b/flake.lock index 0a6529c..be4744b 100644 --- a/flake.lock +++ b/flake.lock @@ -23,7 +23,7 @@ "devshell": { "inputs": { "nixpkgs": [ - "lixyvim", + "marleyvim", "nixvim", "nixpkgs" ] @@ -91,7 +91,7 @@ "flake-parts": { "inputs": { "nixpkgs-lib": [ - "lixyvim", + "marleyvim", "nixvim", "nixpkgs" ] @@ -238,18 +238,18 @@ "git-hooks": { "inputs": { "flake-compat": [ - "lixyvim", + "marleyvim", "nixvim", "flake-compat" ], "gitignore": "gitignore", "nixpkgs": [ - "lixyvim", + "marleyvim", "nixvim", "nixpkgs" ], "nixpkgs-stable": [ - "lixyvim", + "marleyvim", "nixvim", "nixpkgs" ] @@ -271,7 +271,7 @@ "gitignore": { "inputs": { "nixpkgs": [ - "lixyvim", + "marleyvim", "nixvim", "git-hooks", "nixpkgs" @@ -314,7 +314,7 @@ "home-manager_2": { "inputs": { "nixpkgs": [ - "lixyvim", + "marleyvim", "nixvim", "nixpkgs" ] @@ -336,13 +336,13 @@ "ixx": { "inputs": { "flake-utils": [ - "lixyvim", + "marleyvim", "nixvim", "nuschtosSearch", "flake-utils" ], "nixpkgs": [ - "lixyvim", + "marleyvim", "nixvim", "nuschtosSearch", "nixpkgs" @@ -398,7 +398,7 @@ "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" } }, - "lixyvim": { + "marleyvim": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -410,23 +410,23 @@ ] }, "locked": { - "lastModified": 1732251671, - "narHash": "sha256-zgZYnql4I3hESyY20TqsYOpxznmLdzUlzJkvN8NXtW4=", + "lastModified": 1732323855, + "narHash": "sha256-L/CaBm5H+LsMtB4xNyAHJLzynbQrOyTjyG6FnXkGmg8=", "ref": "refs/heads/main", - "rev": "4cbe791f22310a1d1970b1aabd430394409477fc", - "revCount": 3, + "rev": "b0a4ab2dc463a5e68eaf7ed94e7c4af834c7b22b", + "revCount": 1, "type": "git", - "url": "https://codewith.babesonthe.net/punkfairie/lixyvim" + "url": "https://codewith.babesonthe.net/punkfairie/marleyvim" }, "original": { "type": "git", - "url": "https://codewith.babesonthe.net/punkfairie/lixyvim" + "url": "https://codewith.babesonthe.net/punkfairie/marleyvim" } }, "nix-darwin": { "inputs": { "nixpkgs": [ - "lixyvim", + "marleyvim", "nixvim", "nixpkgs" ] @@ -470,18 +470,18 @@ "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": [ - "lixyvim", + "marleyvim", "unstable" ], "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1732143099, - "narHash": "sha256-lh2Qi8gd1SwJVGo7gJjoFvS/djS5Nimaw25j792PJjM=", + "lastModified": 1732315025, + "narHash": "sha256-vPAMWd5/akE3U3B8uXzi05X/9fUd71sZaOnfBrX4AR0=", "owner": "nix-community", "repo": "nixvim", - "rev": "2f71c4250bef7a52fe21bd00d1e58c119f62008c", + "rev": "c1271fa10a54a3b35db6040dd6e779f349af52bf", "type": "github" }, "original": { @@ -495,7 +495,7 @@ "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ - "lixyvim", + "marleyvim", "nixvim", "nixpkgs" ] @@ -535,7 +535,7 @@ "darwin": "darwin", "home-manager": "home-manager", "lix": "lix", - "lixyvim": "lixyvim", + "marleyvim": "marleyvim", "nixpkgs": "nixpkgs", "rofi-themes": "rofi-themes", "rose-pine": "rose-pine", @@ -597,7 +597,7 @@ "flake-compat": "flake-compat_2", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ - "lixyvim", + "marleyvim", "nixpkgs" ] }, @@ -700,7 +700,7 @@ "treefmt-nix": { "inputs": { "nixpkgs": [ - "lixyvim", + "marleyvim", "nixvim", "nixpkgs" ] diff --git a/flake.nix b/flake.nix index 82e597e..9fc4d0f 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,7 @@ overlays = with inputs; [ lix.overlays.default + marleyvim.overlays.default ]; systems.modules.darwin = with inputs; [ @@ -63,8 +64,8 @@ rose-pine.url = "git+https://codewith.babesonthe.net/punkfairie/rose-pine-nix"; - lixyvim = { - url = "git+https://codewith.babesonthe.net/punkfairie/lixyvim"; + marleyvim = { + url = "git+https://codewith.babesonthe.net/punkfairie/marleyvim"; inputs.nixpkgs.follows = "nixpkgs"; inputs.unstable.follows = "unstable"; }; diff --git a/modules/home/programs/neovim/default.nix b/modules/home/programs/neovim/default.nix index 0c859b1..ed7e457 100644 --- a/modules/home/programs/neovim/default.nix +++ b/modules/home/programs/neovim/default.nix @@ -14,7 +14,7 @@ in config = mkIf cfg.enable { home.packages = with pkgs; [ - lixyvim + marleyos.neovim ]; }; } diff --git a/overlays/lixyvim/default.nix b/overlays/lixyvim/default.nix deleted file mode 100644 index 868ebaf..0000000 --- a/overlays/lixyvim/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - inputs, - ... -}: -final: prev: { - lixyvim = inputs.lixyvim.packages.${prev.system}.default; -}