diff --git a/flake.lock b/flake.lock index c2cfcb66..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": 1623623251, - "narHash": "sha256-Aku5PTg4zk+XaiIOvDuRLzQmybGg3StaEmAl/NZlKdU=", + "lastModified": 1626073055, + "narHash": "sha256-vocByfpVu6m9zvtJugDvmd6/9iT2HJuG4tmDICKd0lI=", "owner": "nix-community", "repo": "home-manager", - "rev": "25bf3d79531ce45fd36866205bf07a24bb3be2b9", + "rev": "775cb20bd4af7781fbf336fb201df02ee3d544bb", "type": "github" }, "original": { @@ -242,11 +211,11 @@ }, "latest": { "locked": { - "lastModified": 1623692755, - "narHash": "sha256-HYH9MeFye68ntgheDerkmC50PpWY5qoHAaobesQDBLw=", + "lastModified": 1626192309, + "narHash": "sha256-uMl42Cn1Zb3qe8Iw0Rz7x62DUEG1JPCtJNU3ZK5gEFQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a7ff3fd40e1791d22363775948619e706e1ec665", + "rev": "4036bb94c78329292ef44c233bb42da40b8bd4d2", "type": "github" }, "original": { @@ -282,11 +251,11 @@ ] }, "locked": { - "lastModified": 1623324658, - "narHash": "sha256-TjWmZPH/xbUi7Xuj2EigB9sTOpqsiFmnv7m6+QgTDrA=", + "lastModified": 1623927034, + "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=", "owner": "nmattia", "repo": "naersk", - "rev": "4f7426c362809e472d03c369d3674317c32b6863", + "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": 1623622151, - "narHash": "sha256-IkBOtKnytI4/CxrB8TgFcUeSmf39sLDHABcwMmhbMQY=", - "owner": "neovim", - "repo": "neovim", - "rev": "2f0e5e7e67faa469f5d12a66ec084ab9c35d8c6b", - "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": 1623658603, - "narHash": "sha256-7R3BNOYXh51up/vo+o4CunTVe/MhHZ/jwGJzJBJZ+4Y=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "54eaff5f5f1080ec8d4320e5259ae404604fe014", - "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": 1623324058, - "narHash": "sha256-Jm9GUTXdjXz56gWDKy++EpFfjrBaxqXlLvTLfgEi8lo=", + "lastModified": 1626046891, + "narHash": "sha256-Zt8saH+hAehXskW0iFAzk+iMillYoFBxvLReYNqGT9E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "432fc2d9a67f92e05438dff5fdc2b39d33f77997", + "rev": "d8f8f31af9d77a48220e4e8a301d1e79774cb7d2", "type": "github" }, "original": { @@ -389,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1623569835, - "narHash": "sha256-Mg+FN1JkEQ91Zff0+ot/ndRgD9BB+uDBLN12AcBYkSA=", + "lastModified": 1625333638, + "narHash": "sha256-M6J9RN60XJyv6nUfDFCwnz5aVjhe8+GJnV8Q9VpdQQQ=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "7305b276c90cfd3ad0a2452101a49c0b52c784c0", + "rev": "41775780a0b6b32b3d32dcc32bb9bc6df809062d", "type": "github" }, "original": { @@ -434,22 +360,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1623324058, - "narHash": "sha256-Jm9GUTXdjXz56gWDKy++EpFfjrBaxqXlLvTLfgEi8lo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "432fc2d9a67f92e05438dff5fdc2b39d33f77997", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1620340338, "narHash": "sha256-Op/4K0+Z9Sp5jtFH0s/zMM4H7VFZxrekcAmjQ6JpQ4w=", @@ -465,17 +375,16 @@ "type": "github" } }, - "nixpkgs_5": { + "nur": { "locked": { - "lastModified": 1623692755, - "narHash": "sha256-HYH9MeFye68ntgheDerkmC50PpWY5qoHAaobesQDBLw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a7ff3fd40e1791d22363775948619e706e1ec665", - "type": "github" + "lastModified": 1626188191, + "narHash": "sha256-63A/IjYpfKb/R+AiWZE6YHsaxkDnYIVSUgPw7QEQnA8=", + "path": "/nix/store/hjc7qr7xsbvx32092bpfsjyi6vk29fg4-source", + "rev": "5caa4740529326001714f4c49a5e9f7b2c40f737", + "type": "path" }, "original": { - "id": "nixpkgs", + "id": "nur", "type": "indirect" } }, @@ -486,7 +395,7 @@ ] }, "locked": { - "narHash": "sha256-Zs7dc0dNNa0Z3//+Gckxj7SKrMqVovY0xZZ1z8xWnEg=", + "narHash": "sha256-G+qmA0vMRMgEd0Wp+jMjbOe5Yz+5/Imh+wn6mTWit1o=", "path": "./pkgs", "type": "path" }, @@ -498,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": { @@ -520,11 +429,10 @@ "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 0f206604..cf917cd5 100644 --- a/flake.nix +++ b/flake.nix @@ -28,10 +28,6 @@ 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"; - # b12f additions # b12f-nix-fonts.url = "git+https://git.b12f.io/b12f/nix-fonts?ref=main"; }; @@ -46,8 +42,7 @@ , nixos-hardware , agenix , nix-dram - , neovim-nightly - # , b12f-nix-fonts + # , b12f-nix-fonts , ... }: digga.lib.mkFlake { inherit self inputs; @@ -62,7 +57,6 @@ pkgs.overlay # for `srcs` agenix.overlay nix-dram.overlay - neovim-nightly.overlay # b12f-nix-fonts.overlay ]; }; diff --git a/modules/terminal-life/nvim/default.nix b/modules/terminal-life/nvim/default.nix index 22b7db77..444bf276 100644 --- a/modules/terminal-life/nvim/default.nix +++ b/modules/terminal-life/nvim/default.nix @@ -52,8 +52,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;