From a3961f7c526a2334690e0df6ace645681b60ec7f Mon Sep 17 00:00:00 2001 From: teutat3s Date: Tue, 13 Jul 2021 16:33:15 +0000 Subject: [PATCH] move back from neovim-nightly to neovim from unstable (#10) https://github.com/neovim/neovim/releases/tag/v0.5.0 Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com> Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/10 Co-authored-by: teutat3s Co-committed-by: teutat3s --- flake.lock | 165 +++++-------------------- flake.nix | 6 - modules/terminal-life/nvim/default.nix | 2 - overlays/overrides.nix | 1 + profiles/core/default.nix | 13 -- 5 files changed, 30 insertions(+), 157 deletions(-) diff --git a/flake.lock b/flake.lock index 92c47dc8..049545d4 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1620750556, - "narHash": "sha256-J+z8oduu9u1FZ8spSowrgyAmtnBUIUDImqfQCZ58heo=", + "lastModified": 1626066948, + "narHash": "sha256-rBo4nCPyAHb1e/9ysYGH7tW1FV0N2XNvRcJR+g8gugA=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "f62ce85aed4c4a7fca9e5da2b00340bbcdc92f88", + "rev": "7f3265cc42d5f364066c145939ee2812938b991c", "type": "github" }, "original": { @@ -159,22 +159,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1606424373, - "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1620759905, @@ -191,21 +175,6 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1610051610, - "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "locked": { "lastModified": 1619345332, "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", @@ -227,11 +196,11 @@ ] }, "locked": { - "lastModified": 1623251710, - "narHash": "sha256-eCMquRJXAzzFgNcTO4jQqp8D40N0jSA58+oqhyOrEbU=", + "lastModified": 1626073055, + "narHash": "sha256-vocByfpVu6m9zvtJugDvmd6/9iT2HJuG4tmDICKd0lI=", "owner": "nix-community", "repo": "home-manager", - "rev": "42847469b3f65a363dc52b66be09d0ac4edcc55c", + "rev": "775cb20bd4af7781fbf336fb201df02ee3d544bb", "type": "github" }, "original": { @@ -242,11 +211,11 @@ }, "latest": { "locked": { - "lastModified": 1623252537, - "narHash": "sha256-/vaWqzMZLWiDHU4owrQLiqUP6ffCgsQjl0vWnBfQIiw=", + "lastModified": 1626192309, + "narHash": "sha256-uMl42Cn1Zb3qe8Iw0Rz7x62DUEG1JPCtJNU3ZK5gEFQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "135ba31fa74c8f40bee9807e076c7b889c094c7c", + "rev": "4036bb94c78329292ef44c233bb42da40b8bd4d2", "type": "github" }, "original": { @@ -282,11 +251,11 @@ ] }, "locked": { - "lastModified": 1622810282, - "narHash": "sha256-4wmvM3/xfD0hCdNDIXVzRMfL4yB1J+DjH6Zte2xbAxk=", + "lastModified": 1623927034, + "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=", "owner": "nmattia", "repo": "naersk", - "rev": "e8061169e1495871b56be97c5c51d310fae01374", + "rev": "e09c320446c5c2516d430803f7b19f5833781337", "type": "github" }, "original": { @@ -295,53 +264,10 @@ "type": "github" } }, - "neovim-flake": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "contrib", - "lastModified": 1623084223, - "narHash": "sha256-lhKgG4L5UAt9zb5KH8YvpR/y7E4Dh9Ekb4BkEPHAY+Y=", - "owner": "neovim", - "repo": "neovim", - "rev": "93f15db5d61800a2029aa20684be31c96ebcca5b", - "type": "github" - }, - "original": { - "dir": "contrib", - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, - "neovim-nightly": { - "inputs": { - "flake-compat": "flake-compat_3", - "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1623140234, - "narHash": "sha256-VQRvN/h9RAgSRiJlTSXQrnK6/EBTTi4tBntVYUX4c8s=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "61e380e6859517ad6f21e8650e55ff3f0bcf2a32", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, "nix-dram": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_4" + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1620663773, @@ -374,11 +300,11 @@ }, "nixos": { "locked": { - "lastModified": 1622966049, - "narHash": "sha256-6g+28v94ISkVk9TBSsITVOnB2slK8plieWPIF2jo/l0=", + "lastModified": 1626046891, + "narHash": "sha256-Zt8saH+hAehXskW0iFAzk+iMillYoFBxvLReYNqGT9E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbfb79400a08bf754e32b4d4fc3f7d8f8055cf94", + "rev": "d8f8f31af9d77a48220e4e8a301d1e79774cb7d2", "type": "github" }, "original": { @@ -389,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1623143341, - "narHash": "sha256-a8NjpJVvJkb3ehu/KP1OaWwlRexom2D7lQEH5uCO9yA=", + "lastModified": 1625333638, + "narHash": "sha256-M6J9RN60XJyv6nUfDFCwnz5aVjhe8+GJnV8Q9VpdQQQ=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "fccbee72df707c3fb074854668deee6e1ff02351", + "rev": "41775780a0b6b32b3d32dcc32bb9bc6df809062d", "type": "github" }, "original": { @@ -434,22 +360,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1622966049, - "narHash": "sha256-6g+28v94ISkVk9TBSsITVOnB2slK8plieWPIF2jo/l0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "fbfb79400a08bf754e32b4d4fc3f7d8f8055cf94", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1620340338, "narHash": "sha256-Op/4K0+Z9Sp5jtFH0s/zMM4H7VFZxrekcAmjQ6JpQ4w=", @@ -465,28 +375,13 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1623252537, - "narHash": "sha256-/vaWqzMZLWiDHU4owrQLiqUP6ffCgsQjl0vWnBfQIiw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "135ba31fa74c8f40bee9807e076c7b889c094c7c", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nur": { "locked": { - "lastModified": 1623252303, - "narHash": "sha256-98+p5SYxAAahEKILKQl3MJ7ZuCdiLnhHBaVhYdNdM9w=", - "owner": "nix-community", - "repo": "NUR", - "rev": "e976cf31c75a9a49125319b43bfb873773cf0807", - "type": "github" + "lastModified": 1626188191, + "narHash": "sha256-63A/IjYpfKb/R+AiWZE6YHsaxkDnYIVSUgPw7QEQnA8=", + "path": "/nix/store/hjc7qr7xsbvx32092bpfsjyi6vk29fg4-source", + "rev": "5caa4740529326001714f4c49a5e9f7b2c40f737", + "type": "path" }, "original": { "id": "nur", @@ -500,7 +395,7 @@ ] }, "locked": { - "narHash": "sha256-Zs7dc0dNNa0Z3//+Gckxj7SKrMqVovY0xZZ1z8xWnEg=", + "narHash": "sha256-G+qmA0vMRMgEd0Wp+jMjbOe5Yz+5/Imh+wn6mTWit1o=", "path": "./pkgs", "type": "path" }, @@ -512,11 +407,11 @@ "pre-commit-hooks-nix": { "flake": false, "locked": { - "lastModified": 1617783930, - "narHash": "sha256-SigoU2LWM1fMggqfM9H8XEIvjOjBVQ/wj/zrn02J28c=", + "lastModified": 1622650193, + "narHash": "sha256-qSzUpJDv04ajS9FXoCq6NjVF3qOt9IiGIiGh0P8amyw=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "2d169bb1b23f3b71a894a66ea81f45c788943248", + "rev": "0398f0649e0a741660ac5e8216760bae5cc78579", "type": "github" }, "original": { @@ -534,11 +429,9 @@ "home": "home", "latest": "latest", "naersk": "naersk_2", - "neovim-nightly": "neovim-nightly", "nix-dram": "nix-dram", "nixos": "nixos", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", "nur": "nur", "pkgs": "pkgs" } diff --git a/flake.nix b/flake.nix index 7a6b4b41..973e9074 100644 --- a/flake.nix +++ b/flake.nix @@ -27,10 +27,6 @@ # PubSolarOS additions nix-dram.url = "github:dramforever/nix-dram"; - - # This is a fix so that the neovim-flake dependency of neovim-nightly doesn't shit itself - nixpkgs.url = "nixpkgs"; - neovim-nightly.url = "github:nix-community/neovim-nightly-overlay"; }; outputs = @@ -44,7 +40,6 @@ , nur , agenix , nix-dram - , neovim-nightly , ... } @ inputs: digga.lib.mkFlake { @@ -61,7 +56,6 @@ nur.overlay agenix.overlay nix-dram.overlay - neovim-nightly.overlay ]; }; latest = { }; diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix index c4268a9f..ba0e49ab 100644 --- a/modules/terminal-life/nvim/default.nix +++ b/modules/terminal-life/nvim/default.nix @@ -43,8 +43,6 @@ in { enable = true; - package = pkgs.neovim-nightly; - viAlias = true; vimAlias = true; vimdiffAlias = true; diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 629f44b1..502a0754 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -9,6 +9,7 @@ channels: final: prev: { element-desktop manix rage + neovim-unwrapped nixpkgs-fmt qutebrowser signal-desktop diff --git a/profiles/core/default.nix b/profiles/core/default.nix index b20a6d79..cf2834ba 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -110,19 +110,6 @@ in fallback = true experimental-features = nix-command flakes ''; - - registry.default = { - to = { - type = "github"; - owner = "NixOS"; - repo = "nixpkgs"; - ref = "nixos-unstable"; - }; - from = { - type = "indirect"; - id = "default"; - }; - }; }; system.autoUpgrade.enable = true;