daniel/dotfiles
1
0
Fork 0
Code Activity Actions

all: Move neovim to existing custom overlay

Browse source
This commit is contained in:
Daniel Kempkens 2023-05-10 23:37:11 +02:00
parent da781aa75e
commit 350810f916
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
10 changed files with 27 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View file

@ -20,7 +20,6 @@ jobs:
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: nix build '.#nixosConfigurations.attic.pkgs.attic-server' - run: nix build '.#nixosConfigurations.attic.pkgs.attic-server'
- run: nix build '.#nixosConfigurations.attic.pkgs.attic-client' - run: nix build '.#nixosConfigurations.attic.pkgs.attic-client'
- run: nix build '.#nixosConfigurations.attic.pkgs.neovim-nightly'
build-arm64-linux: build-arm64-linux:
runs-on: buildjet-2vcpu-ubuntu-2204-arm runs-on: buildjet-2vcpu-ubuntu-2204-arm
@ -34,4 +33,3 @@ jobs:
name: nifoc name: nifoc
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- run: nix build '.#nixosConfigurations.adsb-antenna.pkgs.attic-client' - run: nix build '.#nixosConfigurations.adsb-antenna.pkgs.attic-client'
- run: nix build '.#nixosConfigurations.adsb-antenna.pkgs.neovim-nightly'

27
flake.lock
View file

@ -84,11 +84,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682773107, "lastModified": 1683753978,
"narHash": "sha256-+h94XeJnG3uk5imJlBi/1lVmcfCbxHpwZp5u7n3Krwg=", "narHash": "sha256-v3/MZqcg4hY6qY6s7ZxP6UXYah69fxWXfJrEXMkC1wQ=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "379d42fad6bc5c28f79d5f7ff2fa5f1c90cb7bf8", "rev": "25e28feddab8923376b9ed2620f817d9d282cd6c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -167,16 +167,17 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nifoc-overlay",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1683648894, "lastModified": 1683738879,
"narHash": "sha256-jVKbohNE4kUn0exw0hBKkFXT/k7Bk2z5IhYVsPz/geY=", "narHash": "sha256-V53XRMc6YUYoHFdQ0OgE3HE5qbnwvXWJT9tEi6lT75w=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "36baaf7c1aa0bbc9c80f4512bb1384839c8851ff", "rev": "ac1aee99bc76c0036aa0ccf7b9eda48fcf46ac11",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -188,16 +189,17 @@
}, },
"nifoc-overlay": { "nifoc-overlay": {
"inputs": { "inputs": {
"neovim-flake": "neovim-flake",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1683620480, "lastModified": 1683754238,
"narHash": "sha256-qqfDPWgcjg4fa+gn5kfCAeNIOipYbbucEUZH0ojEcCI=", "narHash": "sha256-utLzZGTbf4f5qk5m+k240JOKWEbP+XZxBrWhxf2NSYY=",
"owner": "nifoc", "owner": "nifoc",
"repo": "nix-overlay", "repo": "nix-overlay",
"rev": "f228a26a36b47fdb10c4c3f3813e417966a48e39", "rev": "7e5b7accfb8b23a8e63f7f38559676e9384024a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -208,11 +210,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1683594133, "lastModified": 1683686518,
"narHash": "sha256-iUhLhEAgOCnexSGDsYT2ouydis09uDoNzM7UC685XGE=", "narHash": "sha256-ieG0J4GCUqOE9Wo8cNSsa1Ev9QKMLrHANOlu22v17bo=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8d447c5626cfefb9b129d5b30103344377fe09bc", "rev": "12ba1a5f90b16acdca741ac82d8204b3ec8c2aaf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -244,7 +246,6 @@
"attic": "attic", "attic": "attic",
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
"neovim-flake": "neovim-flake",
"nifoc-overlay": "nifoc-overlay", "nifoc-overlay": "nifoc-overlay",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }

5
flake.nix
View file

@ -23,11 +23,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
neovim-flake = {
url = "github:neovim/neovim?dir=contrib";
inputs.nixpkgs.follows = "nixpkgs";
};
nifoc-overlay = { nifoc-overlay = {
url = "github:nifoc/nix-overlay"; url = "github:nifoc/nix-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

6
home/programs/nvim/default.nix
View file

@ -7,11 +7,7 @@ in
{ {
programs.neovim = { programs.neovim = {
enable = true; enable = true;
package = pkgs.neovim-nightly.overrideAttrs (oa: { package = pkgs.neovim-nightly;
nativeBuildInputs = oa.nativeBuildInputs ++ optionals isDarwin [
pkgs.liblpeg-darwin
];
});
defaultEditor = true; defaultEditor = true;

24
home/programs/nvim/plugins.nix
View file

@ -107,12 +107,12 @@ in
}; };
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-05-09"; version = "2023-05-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "6e8ad92031ff3b07db8980ab4a5491d1c40398ea"; rev = "73c7af9cdbce9330eeb9771639c86269f6d7cf9d";
sha256 = "1adjxg359j101d43k700nr3p43id2rb4yqqplfd4a897gxq60znj"; sha256 = "0pxxyv54v6dbcx6glp3qwhns5sznyxr631hxpc3qfxpljcdb3qcw";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -220,12 +220,12 @@ in
}; };
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2023-05-09"; version = "2023-05-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "8356319af6e8012a5797b647e946b377d1ba3d9c"; rev = "84717430fb6f51c9e9cc8d63da10cceafc91500c";
sha256 = "026n4pkgasfa9r7rnsdrcp0x9fc48qzxri1wkyqlk3hrzv8d2iyw"; sha256 = "02f91bxkm28f1h9wpi9s9h0lp5kxxm3032fg59513m3l3h2xqy39";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -539,12 +539,12 @@ in
}; };
gitsigns-nvim = buildVimPluginFrom2Nix { gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns.nvim"; pname = "gitsigns.nvim";
version = "2023-04-28"; version = "2023-05-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "e5edefd9976039f5352e0c900f35206770b33a2d"; rev = "814158f6c4b1724c039fcefe79b0be72c9131c2d";
sha256 = "1g3wh3zwa9ympdfglgxnnfwnv958dyl0l8jqi2an4kgabl6f5471"; sha256 = "1sa50871l86fx1hyrhb07i03r1sjlw76zp30csf846n24vnnnjrq";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -572,12 +572,12 @@ in
}; };
noice-nvim = buildVimPluginFrom2Nix { noice-nvim = buildVimPluginFrom2Nix {
pname = "noice.nvim"; pname = "noice.nvim";
version = "2023-05-07"; version = "2023-05-10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "noice.nvim"; repo = "noice.nvim";
rev = "13c3b39e43fbd0f50dac608fdbda230dec69f1d1"; rev = "c2a745a26ae562f1faecbf6177ac53377d2658d5";
sha256 = "1cjqij8lv002y77wrhi66xiflmh7brdcnvc1imcv69g3ywva75xd"; sha256 = "01y0nh8cdjrwcagcpw99sw55yvylyia4jphpprbyswrggg4r83fw";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

2
system/flakes/Styx.nix
View file

@ -6,7 +6,6 @@ let
overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; }; overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; };
overlay-agenix = inputs.agenix.overlays.default; overlay-agenix = inputs.agenix.overlays.default;
overlay-attic = inputs.attic.overlays.default; overlay-attic = inputs.attic.overlays.default;
overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
overlay-nifoc = inputs.nifoc-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = { nixpkgsConfig = {
@ -14,7 +13,6 @@ let
overlay-x86 overlay-x86
overlay-agenix overlay-agenix
overlay-attic overlay-attic
overlay-neovim
overlay-nifoc overlay-nifoc
]; ];

2
system/flakes/adsb-antenna.nix
View file

@ -4,13 +4,11 @@ let
default-system = "aarch64-linux"; default-system = "aarch64-linux";
overlay-attic = inputs.attic.overlays.default; overlay-attic = inputs.attic.overlays.default;
overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
overlay-nifoc = inputs.nifoc-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = { nixpkgsConfig = {
overlays = [ overlays = [
overlay-attic overlay-attic
overlay-neovim
overlay-nifoc overlay-nifoc
]; ];

2
system/flakes/attic.nix
View file

@ -3,12 +3,10 @@
let let
default-system = "x86_64-linux"; default-system = "x86_64-linux";
overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
overlay-nifoc = inputs.nifoc-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = { nixpkgsConfig = {
overlays = [ overlays = [
overlay-neovim
overlay-nifoc overlay-nifoc
]; ];

2
system/flakes/mediaserver.nix
View file

@ -4,13 +4,11 @@ let
default-system = "x86_64-linux"; default-system = "x86_64-linux";
overlay-attic = inputs.attic.overlays.default; overlay-attic = inputs.attic.overlays.default;
overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
overlay-nifoc = inputs.nifoc-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = { nixpkgsConfig = {
overlays = [ overlays = [
overlay-attic overlay-attic
overlay-neovim
overlay-nifoc overlay-nifoc
]; ];

2
system/flakes/sail.nix
View file

@ -4,13 +4,11 @@ let
default-system = "x86_64-linux"; default-system = "x86_64-linux";
overlay-attic = inputs.attic.overlays.default; overlay-attic = inputs.attic.overlays.default;
overlay-neovim = _: _: { neovim-nightly = inputs.neovim-flake.packages.${default-system}.neovim; };
overlay-nifoc = inputs.nifoc-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = { nixpkgsConfig = {
overlays = [ overlays = [
overlay-attic overlay-attic
overlay-neovim
overlay-nifoc overlay-nifoc
]; ];