punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Let MarleyVim use its own nixpkgs version

Browse source
This commit is contained in:
punkfairie 2025-01-14 18:19:26 -08:00
parent 542fd0bca9
commit fab00092df
No known key found for this signature in database
GPG key ID: B3C5488E9A1A7CA6
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
flake.lock
View file

@ -578,9 +578,7 @@
"neotab-nvim": "neotab-nvim", "neotab-nvim": "neotab-nvim",
"neovim-nightly": "neovim-nightly", "neovim-nightly": "neovim-nightly",
"nerdy-nvim": "nerdy-nvim", "nerdy-nvim": "nerdy-nvim",
"nixpkgs": [ "nixpkgs": "nixpkgs_2",
"nixpkgs"
],
"nvim-emmet": "nvim-emmet" "nvim-emmet": "nvim-emmet"
}, },
"locked": { "locked": {
@ -738,6 +736,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1736798957,
"narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736523798, "lastModified": 1736523798,
"narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=", "narHash": "sha256-Xb8mke6UCYjge9kPR9o4P1nVrhk7QBbKv3xQ9cj7h2s=",
@ -753,7 +767,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1710272261, "lastModified": 1710272261,
"narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
@ -830,7 +844,7 @@
"lix": "lix", "lix": "lix",
"marleyvim": "marleyvim", "marleyvim": "marleyvim",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"nur": "nur", "nur": "nur",
"rofi-themes": "rofi-themes", "rofi-themes": "rofi-themes",
"rose-pine": "rose-pine", "rose-pine": "rose-pine",
@ -876,7 +890,7 @@
"rose-pine-hyprcursor": { "rose-pine-hyprcursor": {
"inputs": { "inputs": {
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {

5
flake.nix
View file

@ -78,10 +78,7 @@
rose-pine.url = "git+https://codewith.babesonthe.net/punkfairie/rose-pine-nix"; rose-pine.url = "git+https://codewith.babesonthe.net/punkfairie/rose-pine-nix";
marleyvim = { marleyvim.url = "git+https://codewith.babesonthe.net/punkfairie/marleyvim";
url = "git+https://codewith.babesonthe.net/punkfairie/marleyvim";
inputs.nixpkgs.follows = "nixpkgs";
};
wezterm = { wezterm = {
url = "github:wez/wezterm?dir=nix"; url = "github:wez/wezterm?dir=nix";