fix: lixyvim -> marleyos

This commit is contained in:
punkfairie 2024-11-22 17:05:34 -08:00
parent a9c2d08a15
commit 2f6a961d28
Signed by: punkfairie
GPG key ID: 8CEDBFDF5C0D613D
4 changed files with 29 additions and 35 deletions

View file

@ -23,7 +23,7 @@
"devshell": { "devshell": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"lixyvim", "marleyvim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -91,7 +91,7 @@
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"lixyvim", "marleyvim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -238,18 +238,18 @@
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
"lixyvim", "marleyvim",
"nixvim", "nixvim",
"flake-compat" "flake-compat"
], ],
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"lixyvim", "marleyvim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": [ "nixpkgs-stable": [
"lixyvim", "marleyvim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -271,7 +271,7 @@
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"lixyvim", "marleyvim",
"nixvim", "nixvim",
"git-hooks", "git-hooks",
"nixpkgs" "nixpkgs"
@ -314,7 +314,7 @@
"home-manager_2": { "home-manager_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"lixyvim", "marleyvim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -336,13 +336,13 @@
"ixx": { "ixx": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"lixyvim", "marleyvim",
"nixvim", "nixvim",
"nuschtosSearch", "nuschtosSearch",
"flake-utils" "flake-utils"
], ],
"nixpkgs": [ "nixpkgs": [
"lixyvim", "marleyvim",
"nixvim", "nixvim",
"nuschtosSearch", "nuschtosSearch",
"nixpkgs" "nixpkgs"
@ -398,7 +398,7 @@
"url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz"
} }
}, },
"lixyvim": { "marleyvim": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -410,23 +410,23 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732251671, "lastModified": 1732323855,
"narHash": "sha256-zgZYnql4I3hESyY20TqsYOpxznmLdzUlzJkvN8NXtW4=", "narHash": "sha256-L/CaBm5H+LsMtB4xNyAHJLzynbQrOyTjyG6FnXkGmg8=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "4cbe791f22310a1d1970b1aabd430394409477fc", "rev": "b0a4ab2dc463a5e68eaf7ed94e7c4af834c7b22b",
"revCount": 3, "revCount": 1,
"type": "git", "type": "git",
"url": "https://codewith.babesonthe.net/punkfairie/lixyvim" "url": "https://codewith.babesonthe.net/punkfairie/marleyvim"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "https://codewith.babesonthe.net/punkfairie/lixyvim" "url": "https://codewith.babesonthe.net/punkfairie/marleyvim"
} }
}, },
"nix-darwin": { "nix-darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"lixyvim", "marleyvim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -470,18 +470,18 @@
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": [ "nixpkgs": [
"lixyvim", "marleyvim",
"unstable" "unstable"
], ],
"nuschtosSearch": "nuschtosSearch", "nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1732143099, "lastModified": 1732315025,
"narHash": "sha256-lh2Qi8gd1SwJVGo7gJjoFvS/djS5Nimaw25j792PJjM=", "narHash": "sha256-vPAMWd5/akE3U3B8uXzi05X/9fUd71sZaOnfBrX4AR0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "2f71c4250bef7a52fe21bd00d1e58c119f62008c", "rev": "c1271fa10a54a3b35db6040dd6e779f349af52bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -495,7 +495,7 @@
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"ixx": "ixx", "ixx": "ixx",
"nixpkgs": [ "nixpkgs": [
"lixyvim", "marleyvim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]
@ -535,7 +535,7 @@
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
"lix": "lix", "lix": "lix",
"lixyvim": "lixyvim", "marleyvim": "marleyvim",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"rofi-themes": "rofi-themes", "rofi-themes": "rofi-themes",
"rose-pine": "rose-pine", "rose-pine": "rose-pine",
@ -597,7 +597,7 @@
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils-plus": "flake-utils-plus", "flake-utils-plus": "flake-utils-plus",
"nixpkgs": [ "nixpkgs": [
"lixyvim", "marleyvim",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -700,7 +700,7 @@
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"lixyvim", "marleyvim",
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
] ]

View file

@ -18,6 +18,7 @@
overlays = with inputs; [ overlays = with inputs; [
lix.overlays.default lix.overlays.default
marleyvim.overlays.default
]; ];
systems.modules.darwin = with inputs; [ systems.modules.darwin = with inputs; [
@ -63,8 +64,8 @@
rose-pine.url = "git+https://codewith.babesonthe.net/punkfairie/rose-pine-nix"; rose-pine.url = "git+https://codewith.babesonthe.net/punkfairie/rose-pine-nix";
lixyvim = { marleyvim = {
url = "git+https://codewith.babesonthe.net/punkfairie/lixyvim"; url = "git+https://codewith.babesonthe.net/punkfairie/marleyvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.unstable.follows = "unstable"; inputs.unstable.follows = "unstable";
}; };

View file

@ -14,7 +14,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
lixyvim marleyos.neovim
]; ];
}; };
} }

View file

@ -1,7 +0,0 @@
{
inputs,
...
}:
final: prev: {
lixyvim = inputs.lixyvim.packages.${prev.system}.default;
}