teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

move back from neovim-nightly to neovim from unstable (#10)

Browse source 
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 <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
teutat3s 2021-07-13 16:33:15 +00:00 committed by Benjamin Bädorf
parent b55792154d
commit a3961f7c52
5 changed files with 30 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

165
flake.lock
View file

@ -35,11 +35,11 @@
"pre-commit-hooks-nix": "pre-commit-hooks-nix" "pre-commit-hooks-nix": "pre-commit-hooks-nix"
}, },
"locked": { "locked": {
"lastModified": 1620750556, "lastModified": 1626066948,
"narHash": "sha256-J+z8oduu9u1FZ8spSowrgyAmtnBUIUDImqfQCZ58heo=", "narHash": "sha256-rBo4nCPyAHb1e/9ysYGH7tW1FV0N2XNvRcJR+g8gugA=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-agent", "repo": "hercules-ci-agent",
"rev": "f62ce85aed4c4a7fca9e5da2b00340bbcdc92f88", "rev": "7f3265cc42d5f364066c145939ee2812938b991c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -159,22 +159,6 @@
"type": "github" "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": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1620759905, "lastModified": 1620759905,
@ -191,21 +175,6 @@
} }
}, },
"flake-utils_2": { "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": { "locked": {
"lastModified": 1619345332, "lastModified": 1619345332,
"narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=",
@ -227,11 +196,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1623251710, "lastModified": 1626073055,
"narHash": "sha256-eCMquRJXAzzFgNcTO4jQqp8D40N0jSA58+oqhyOrEbU=", "narHash": "sha256-vocByfpVu6m9zvtJugDvmd6/9iT2HJuG4tmDICKd0lI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "42847469b3f65a363dc52b66be09d0ac4edcc55c", "rev": "775cb20bd4af7781fbf336fb201df02ee3d544bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,11 +211,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1623252537, "lastModified": 1626192309,
"narHash": "sha256-/vaWqzMZLWiDHU4owrQLiqUP6ffCgsQjl0vWnBfQIiw=", "narHash": "sha256-uMl42Cn1Zb3qe8Iw0Rz7x62DUEG1JPCtJNU3ZK5gEFQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "135ba31fa74c8f40bee9807e076c7b889c094c7c", "rev": "4036bb94c78329292ef44c233bb42da40b8bd4d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -282,11 +251,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1622810282, "lastModified": 1623927034,
"narHash": "sha256-4wmvM3/xfD0hCdNDIXVzRMfL4yB1J+DjH6Zte2xbAxk=", "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=",
"owner": "nmattia", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"rev": "e8061169e1495871b56be97c5c51d310fae01374", "rev": "e09c320446c5c2516d430803f7b19f5833781337",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,53 +264,10 @@
"type": "github" "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": { "nix-dram": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1620663773, "lastModified": 1620663773,
@ -374,11 +300,11 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1622966049, "lastModified": 1626046891,
"narHash": "sha256-6g+28v94ISkVk9TBSsITVOnB2slK8plieWPIF2jo/l0=", "narHash": "sha256-Zt8saH+hAehXskW0iFAzk+iMillYoFBxvLReYNqGT9E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fbfb79400a08bf754e32b4d4fc3f7d8f8055cf94", "rev": "d8f8f31af9d77a48220e4e8a301d1e79774cb7d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -389,11 +315,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1623143341, "lastModified": 1625333638,
"narHash": "sha256-a8NjpJVvJkb3ehu/KP1OaWwlRexom2D7lQEH5uCO9yA=", "narHash": "sha256-M6J9RN60XJyv6nUfDFCwnz5aVjhe8+GJnV8Q9VpdQQQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "fccbee72df707c3fb074854668deee6e1ff02351", "rev": "41775780a0b6b32b3d32dcc32bb9bc6df809062d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -434,22 +360,6 @@
} }
}, },
"nixpkgs_3": { "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": { "locked": {
"lastModified": 1620340338, "lastModified": 1620340338,
"narHash": "sha256-Op/4K0+Z9Sp5jtFH0s/zMM4H7VFZxrekcAmjQ6JpQ4w=", "narHash": "sha256-Op/4K0+Z9Sp5jtFH0s/zMM4H7VFZxrekcAmjQ6JpQ4w=",
@ -465,28 +375,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": {
"locked": {
"lastModified": 1623252537,
"narHash": "sha256-/vaWqzMZLWiDHU4owrQLiqUP6ffCgsQjl0vWnBfQIiw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "135ba31fa74c8f40bee9807e076c7b889c094c7c",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1623252303, "lastModified": 1626188191,
"narHash": "sha256-98+p5SYxAAahEKILKQl3MJ7ZuCdiLnhHBaVhYdNdM9w=", "narHash": "sha256-63A/IjYpfKb/R+AiWZE6YHsaxkDnYIVSUgPw7QEQnA8=",
"owner": "nix-community", "path": "/nix/store/hjc7qr7xsbvx32092bpfsjyi6vk29fg4-source",
"repo": "NUR", "rev": "5caa4740529326001714f4c49a5e9f7b2c40f737",
"rev": "e976cf31c75a9a49125319b43bfb873773cf0807", "type": "path"
"type": "github"
}, },
"original": { "original": {
"id": "nur", "id": "nur",
@ -500,7 +395,7 @@
] ]
}, },
"locked": { "locked": {
"narHash": "sha256-Zs7dc0dNNa0Z3//+Gckxj7SKrMqVovY0xZZ1z8xWnEg=", "narHash": "sha256-G+qmA0vMRMgEd0Wp+jMjbOe5Yz+5/Imh+wn6mTWit1o=",
"path": "./pkgs", "path": "./pkgs",
"type": "path" "type": "path"
}, },
@ -512,11 +407,11 @@
"pre-commit-hooks-nix": { "pre-commit-hooks-nix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1617783930, "lastModified": 1622650193,
"narHash": "sha256-SigoU2LWM1fMggqfM9H8XEIvjOjBVQ/wj/zrn02J28c=", "narHash": "sha256-qSzUpJDv04ajS9FXoCq6NjVF3qOt9IiGIiGh0P8amyw=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "2d169bb1b23f3b71a894a66ea81f45c788943248", "rev": "0398f0649e0a741660ac5e8216760bae5cc78579",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -534,11 +429,9 @@
"home": "home", "home": "home",
"latest": "latest", "latest": "latest",
"naersk": "naersk_2", "naersk": "naersk_2",
"neovim-nightly": "neovim-nightly",
"nix-dram": "nix-dram", "nix-dram": "nix-dram",
"nixos": "nixos", "nixos": "nixos",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_5",
"nur": "nur", "nur": "nur",
"pkgs": "pkgs" "pkgs": "pkgs"
} }

6
flake.nix
View file

@ -27,10 +27,6 @@
# PubSolarOS additions # PubSolarOS additions
nix-dram.url = "github:dramforever/nix-dram"; 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 = outputs =
@ -44,7 +40,6 @@
, nur , nur
, agenix , agenix
, nix-dram , nix-dram
, neovim-nightly
, ... , ...
} @ inputs: } @ inputs:
digga.lib.mkFlake { digga.lib.mkFlake {
@ -61,7 +56,6 @@
nur.overlay nur.overlay
agenix.overlay agenix.overlay
nix-dram.overlay nix-dram.overlay
neovim-nightly.overlay
]; ];
}; };
latest = { }; latest = { };

2
modules/terminal-life/nvim/default.nix
View file

@ -43,8 +43,6 @@ in
{ {
enable = true; enable = true;
package = pkgs.neovim-nightly;
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
vimdiffAlias = true; vimdiffAlias = true;

1
overlays/overrides.nix
View file

@ -9,6 +9,7 @@ channels: final: prev: {
element-desktop element-desktop
manix manix
rage rage
neovim-unwrapped
nixpkgs-fmt nixpkgs-fmt
qutebrowser qutebrowser
signal-desktop signal-desktop

13
profiles/core/default.nix
View file

@ -110,19 +110,6 @@ in
fallback = true fallback = true
experimental-features = nix-command flakes 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; system.autoUpgrade.enable = true;