diff --git a/darwin-common.nix b/darwin-common.nix index 8f2a8369..c1292e4d 100644 --- a/darwin-common.nix +++ b/darwin-common.nix @@ -24,9 +24,9 @@ supportedFeatures = [ "kvm" "big-parallel" ]; sshUser = "ragon"; maxJobs = 8; - hostName = "192.168.65.4"; + hostName = "192.168.65.7"; sshKey = "/Users/ragon/.ssh/id_ed25519"; - publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSU1tU2NqZXVhLzVKQzF2S2VWMGpETUM5cmF2T1JzY0VOWlZ2c2hFSjFYMHUK"; + publicHostKey = "c3NoLWVkMjU1MTkgQUFBQUMzTnphQzFsWkRJMU5URTVBQUFBSUM4aG9teFlQZlk4bS9JQ2c2NVNWNU9Temp3eW1sNmxEMXhGNi9zWUxPQkY="; }]; nix.extraOptions = '' builders-use-substitutes = true diff --git a/flake.lock b/flake.lock index 116d9e6b..5bd3522f 100644 --- a/flake.lock +++ b/flake.lock @@ -130,6 +130,21 @@ "type": "github" } }, + "flake-utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -203,12 +218,32 @@ "type": "github" } }, + "neovim-flake": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "dir": "contrib", + "lastModified": 1681563256, + "narHash": "sha256-efqY64VXxpcBCBouHwl0d0fJ6Aol3gzQB7/eXFO4gI0=", + "owner": "neovim", + "repo": "neovim", + "rev": "eb151a9730f0000ff46e0b3467e29bb9f02ae362", + "type": "github" + }, + "original": { + "dir": "contrib", + "owner": "neovim", + "repo": "neovim", + "rev": "4725ea69feb422a7bc07ceca0af795877d7f4532", + "type": "github" + } + }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat", - "neovim-flake": [ - "nixpkgs-master" - ], + "neovim-flake": "neovim-flake", "nixpkgs": [ "nixpkgs-master" ] @@ -292,6 +327,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1681465517, + "narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "abe7316dd51a313ce528972b104f4f04f56eefc4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1682669017, "narHash": "sha256-Vi+p4y3wnl0/4gcwTdmCO398kKlDaUrNROtf3GOD2NY=", @@ -436,7 +487,7 @@ "miro": "miro", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-master": "nixpkgs-master", "nnn-nvim": "nnn-nvim", diff --git a/flake.nix b/flake.nix index d4a131c3..619f53ec 100644 --- a/flake.nix +++ b/flake.nix @@ -18,8 +18,8 @@ darwin.inputs.nixpkgs.follows = "nixpkgs"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; neovim-nightly-overlay.inputs.nixpkgs.follows = "nixpkgs-master"; - neovim-nightly-overlay.inputs.neovim-flake.url = "github:neovim/neovim?dir=contrib&rev=4725ea69feb422a7bc07ceca0af795877d7f4532"; - neovim-nightly-overlay.inputs.neovim-flake.follows = "nixpkgs-master"; + neovim-nightly-overlay.inputs.neovim-flake.url = "github:neovim/neovim?dir=contrib&rev=eb151a9730f0000ff46e0b3467e29bb9f02ae362"; + neovim-nightly-overlay.inputs.neovim-flake.inputs.nixpkgs.follows = "nixpkgs-master"; # programs xynoblog.url = "github:thexyno/blog";