neovim nightly on macos

This commit is contained in:
Sridhar Ratnakumar 2022-04-08 21:38:16 -04:00
parent 2d0f648a58
commit 41ac8bf6ce
4 changed files with 43 additions and 56 deletions

View file

@ -1,11 +1,9 @@
{ pkgs, ... }: {
nix.binaryCachePublicKeys = [
"cm-idris2-pkgs.cachix.org-1:YB2oJSEsD5oMJjAESxolC2GQtE6B5I6jkWhte2gtXjk="
"srid.cachix.org-1:MTQ6ksbfz3LBMmjyPh0PLmos+1x+CdtJxA/J2W+PQxI="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
nix.binaryCaches = [
"https://cm-idris2-pkgs.cachix.org"
"https://srid.cachix.org"
"nix-community.cachix.org"
];

67
flake.lock generated
View file

@ -184,11 +184,11 @@
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1641205782,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
"lastModified": 1648199409,
"narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
"rev": "64a525ee38886ab9028e6f61790de0832aa3ef03",
"type": "github"
},
"original": {
@ -235,11 +235,11 @@
},
"flake-utils_2": {
"locked": {
"lastModified": 1629481132,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "997f7efcb746a9c140ce1f13c72263189225f482",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
@ -326,15 +326,18 @@
"neovim-flake": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3"
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"dir": "contrib",
"lastModified": 1646615196,
"narHash": "sha256-vwzKriqbRO5tE4JpoRMOJaeEWfkwJtpiAEEAotd+ejE=",
"lastModified": 1649385942,
"narHash": "sha256-VvqlKZUFhWKXANK75u4ZVJnnaF+QpFl2hVWepF6DzGI=",
"owner": "neovim",
"repo": "neovim",
"rev": "5760cf87b6d09165cd08af3e2afa231909e3d2df",
"rev": "2c7dc648ca796786b4847771c1df71dea20a1774",
"type": "github"
},
"original": {
@ -348,14 +351,14 @@
"inputs": {
"flake-compat": "flake-compat_2",
"neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs_4"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1646641035,
"narHash": "sha256-Q7Xmw3AOqm0c5/hMthMiUIgamxU6+vPytEv3LCLPnsM=",
"lastModified": 1649405991,
"narHash": "sha256-pgwFFhnQFN3ZMLKjY5WwLZVFa+FrTpCwio7M27hHYwU=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "0ec20f48636b51400969a8442d9e95725dc326b4",
"rev": "e27e51f624b560436aebf0cb2ba85b3a9a0ab7c5",
"type": "github"
},
"original": {
@ -395,7 +398,7 @@
"flake-utils": "flake-utils_3",
"format-all": "format-all",
"nix-straight": "nix-straight",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_4",
"nose": "nose",
"ob-racket": "ob-racket",
"org": "org",
@ -453,7 +456,7 @@
},
"nixos-shell": {
"inputs": {
"nixpkgs": "nixpkgs_6"
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1646257415,
@ -487,7 +490,7 @@
},
"nixos-vscode-server": {
"inputs": {
"nixpkgs": "nixpkgs_7"
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1621309617,
@ -534,11 +537,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1646497237,
"narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
"lastModified": 1649225869,
"narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
"rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c",
"type": "github"
},
"original": {
@ -549,22 +552,6 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1646497237,
"narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1646331602,
"narHash": "sha256-cRuytTfel52z947yKfJcZU7zbQBgM16qqTf+oJkVwtg=",
@ -579,7 +566,7 @@
"type": "indirect"
}
},
"nixpkgs_6": {
"nixpkgs_5": {
"locked": {
"lastModified": 1628465643,
"narHash": "sha256-QSNw9bDq9uGUniQQtakRuw4m21Jxugm23SXLVgEV4DM=",
@ -594,7 +581,7 @@
"type": "indirect"
}
},
"nixpkgs_7": {
"nixpkgs_6": {
"locked": {
"lastModified": 1621073999,
"narHash": "sha256-Cp99YreSFedcWovxNmO8g8qFYltQQJPRLfuot6Z7iGE=",
@ -610,7 +597,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_7": {
"locked": {
"lastModified": 1649225869,
"narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=",
@ -769,7 +756,7 @@
"nixos-hardware": "nixos-hardware",
"nixos-shell": "nixos-shell",
"nixos-vscode-server": "nixos-vscode-server",
"nixpkgs": "nixpkgs_8"
"nixpkgs": "nixpkgs_7"
}
},
"rotate-text": {

View file

@ -13,14 +13,11 @@
nixos-hardware.url = github:NixOS/nixos-hardware/master;
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
nixos-vscode-server = {
url = "github:iosmanthus/nixos-vscode-server/add-flake";
};
emacs-overlay.url = "github:nix-community/emacs-overlay";
nixos-vscode-server.url = "github:iosmanthus/nixos-vscode-server/add-flake";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
emacs-overlay.url = "github:nix-community/emacs-overlay";
nix-doom-emacs.url = "github:nix-community/nix-doom-emacs";
hercules-ci-agent.url = "github:hercules-ci/hercules-ci-agent/master";
nixos-shell.url = "github:Mic92/nixos-shell";
};
@ -31,7 +28,10 @@
pkgs = import nixpkgs {
inherit system;
config.allowUnfree = true;
overlays = [ (import inputs.emacs-overlay) ];
overlays = [
(import inputs.emacs-overlay)
(import inputs.neovim-nightly-overlay.overlay)
];
};
# Configuration common to all of my systems (servers, desktops, laptops)
commonFeatures = [
@ -90,11 +90,9 @@
nixos-shell.mounts = {
mountHome = false;
mountNixProfile = false;
extraMounts = {
"/Downloads" = {
target = "/home/srid/Downloads";
cache = "none";
};
extraMounts."/Downloads" = {
target = "/home/srid/Downloads";
cache = "none";
};
};
}
@ -105,11 +103,15 @@
darwinConfigurations."air" = mkMacosSystem {
system = "aarch64-darwin";
specialArgs = {
inherit inputs;
system = "aarch64-darwin";
inherit inputs system;
rosettaPkgs = import nixpkgs { system = "x86_64-darwin"; };
};
modules = [
{
nixpkgs.overlays = [
(inputs.neovim-nightly-overlay.overlay)
];
}
./hosts/darwin.nix
./features/nix-direnv.nix
./features/caches/oss.nix

View file

@ -12,7 +12,7 @@
tmux
pass
pandoc
neovim
neovim-nightly
mpv
youtube-dl