1
0
Fork 0

Compare commits

..

No commits in common. "0547ce6fce48d9b2ea5b1213df8d2b22065f8213" and "5392f70be1e1b8767c63781ec1a23396db928465" have entirely different histories.

3 changed files with 53 additions and 53 deletions

View file

@ -109,11 +109,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695795547, "lastModified": 1695380190,
"narHash": "sha256-/ZxvDCpNqCSJ3qYJK82CUSbHzQHP2OmheL/0tiGzs7k=", "narHash": "sha256-v1TwBU/mKroZZPWYXujAfOHfIaQw44swa50Jgdkr7OE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "78fba3983dab3593afdc7fcd579dad8a3b1c6326", "rev": "98a6ab9b52f8b06db9c3116b1761bbeaf9484408",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -300,11 +300,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695738267, "lastModified": 1695550077,
"narHash": "sha256-LTNAbTQ96xSj17xBfsFrFS9i56U2BMLpD0BduhrsVkU=", "narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0f4e5b4999fd6a42ece5da8a3a2439a50e48e486", "rev": "a88df2fb101778bfd98a17556b3a2618c6c66091",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1695782894, "lastModified": 1695544147,
"narHash": "sha256-U1H7h/cf0V3RKHzcRPsEU3sC/fcFymI91DsnQgQFpfw=", "narHash": "sha256-Pd05aLI+sK8w3mh6bUlKimRK7NprkkQKzOOs5jRG8BI=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "dfa8b582a64aa22d3c57261bfcdc970b26cb58f3", "rev": "9637b7dae417f336ca72cfcb201cb37247d794a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -346,11 +346,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695795049, "lastModified": 1695554778,
"narHash": "sha256-w0se+68uoK28pya5ThvBA9UvE09VX2CT62ERWdAJuao=", "narHash": "sha256-J3peBxSA7I2qrV+vXyfBF0l4k7+0tSN8MuJVO5ykdCU=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "a9687a0c1aa325bf7a8bd904a3a489cd7e9e9b9c", "rev": "f7c50f4fb46d644d6a85cdb181d29451024108b5",
"revCount": 503, "revCount": 500,
"type": "git", "type": "git",
"url": "https://git.kempkens.io/daniel/nix-overlay" "url": "https://git.kempkens.io/daniel/nix-overlay"
}, },
@ -366,11 +366,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695686713, "lastModified": 1695424346,
"narHash": "sha256-rJATx5B/nwlBpt7CJUf85LV27qWPbul5UVV8fu6ABPg=", "narHash": "sha256-jkjKhxaBpS7p//l90uz9lNdVK5imVe9eo+XH6zbfrJU=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "e236a1e598a9a59265897948ac9874c364b9555f", "rev": "c286b23c7fd7f0622bc4af898c91f58b8d304ff1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -397,11 +397,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1695644571, "lastModified": 1695360818,
"narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -506,11 +506,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1695576016, "lastModified": 1694364351,
"narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=", "narHash": "sha256-oadhSCqopYXxURwIA6/Anpe5IAG11q2LhvTJNP5zE6o=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "cb770e93516a1609652fa8e945a0f310e98f10c0", "rev": "4f883a76282bc28eb952570afc3d8a1bf6f481d7",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -30,12 +30,12 @@ in
}; };
nvim-web-devicons = buildVimPluginFrom2Nix { nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons"; pname = "nvim-web-devicons";
version = "2023-09-25"; version = "2023-09-24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kyazdani42"; owner = "kyazdani42";
repo = "nvim-web-devicons"; repo = "nvim-web-devicons";
rev = "45d0237c427baba8cd05e0ab26d30e2ee58c2c82"; rev = "480a756df82a0c231622c9bf2173bb6634713716";
sha256 = "0cbp2xv6gnjd1plc8psj0qgwxfrfqw7qg8jn1cgr1la563jjlnlk"; sha256 = "05b1gflnk4252x8m5w9v3dmahg3sncdx3z1lhgw0z7425ascxnyw";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -63,12 +63,12 @@ in
}; };
yanky-nvim = buildVimPluginFrom2Nix { yanky-nvim = buildVimPluginFrom2Nix {
pname = "yanky.nvim"; pname = "yanky.nvim";
version = "2023-09-27"; version = "2023-09-22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gbprod"; owner = "gbprod";
repo = "yanky.nvim"; repo = "yanky.nvim";
rev = "d6fb4a1575fb692f4594b0f7791a5462bc46eddd"; rev = "51dfc7721cfa4bb5b1baf5f365b8a39394d89eb2";
sha256 = "0yhscqjg52kcp45hgigclrb4k3357sh6w86kxvasz69l28dazskw"; sha256 = "1dl9rylwpbcxh7d3h5sal8viqipiiyy4prdkgdip5hy08sh9y6mv";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -118,12 +118,12 @@ in
}; };
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-09-27"; version = "2023-09-24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "d6c9c85e14e15bc59478a0d5d810e88dad0ac53f"; rev = "0960322686bfa38afd4f1e0b9660473cf77e24b6";
sha256 = "0lppql5gs9327w2y4ms5kfcammrj6226f6m6rr3ylm18kahcxb3c"; sha256 = "0gzj6k34h0847sf382dfc0q2cjs7qd2v2192rniijiy4hy1scv6m";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -140,12 +140,12 @@ in
}; };
rainbow-delimiters-nvim = buildVimPluginFrom2Nix { rainbow-delimiters-nvim = buildVimPluginFrom2Nix {
pname = "rainbow-delimiters.nvim"; pname = "rainbow-delimiters.nvim";
version = "2023-09-26"; version = "2023-09-20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "HiPhish"; owner = "HiPhish";
repo = "rainbow-delimiters.nvim"; repo = "rainbow-delimiters.nvim";
rev = "6b9fc617ad52f25372d1855e049cae3af348bc09"; rev = "e9843e7ae870ec9a72b6816836dfcff8570f3381";
sha256 = "1wp8c9jjsgb517vq3yqjgaa2f62x64ccd82jrjiz735n7f8f3kgc"; sha256 = "0cdhwznyjw7ldqn88qfw85v3p36vv5j49ii617cqr0rl8hfkb4q1";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -162,12 +162,12 @@ in
}; };
telescope-nvim = buildVimPluginFrom2Nix { telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope.nvim"; pname = "telescope.nvim";
version = "2023-09-27"; version = "2023-09-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope.nvim"; repo = "telescope.nvim";
rev = "84d53dfdbefbdf84e861a288abc71ef8ccafd04e"; rev = "ed9574dd6dde143d009b2528ea6d79bd34bbe6c8";
sha256 = "1v3avmwxhlz0a8jqd8pixlrpj8fw1mnaa3j0nszpg83pnij07nb4"; sha256 = "0w7hbzcw5bckgyp0hacg1v6aw064mixhl97mycix47gxa86iqbjb";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -242,12 +242,12 @@ in
}; };
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2023-09-26"; version = "2023-09-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "bfdf2e91e7297a54bcc09d3e092a12bff69a1cf4"; rev = "ede4114e1fd41acb121c70a27e1b026ac68c42d6";
sha256 = "1y5j5578gdhgggh3xrlg3zvgi4jif41nl6x8w7y4zkkvjrkggqgn"; sha256 = "0cgl3aw0caydzz796wg1ims1qcypnag792riaq92w5by5p15ni1m";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -286,12 +286,12 @@ in
}; };
vim-illuminate = buildVimPluginFrom2Nix { vim-illuminate = buildVimPluginFrom2Nix {
pname = "vim-illuminate"; pname = "vim-illuminate";
version = "2023-09-26"; version = "2023-09-20";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RRethy"; owner = "RRethy";
repo = "vim-illuminate"; repo = "vim-illuminate";
rev = "1b5d70332a51a1de05f281069851865a2bb1e6d7"; rev = "6acf7d4a18255a3ddc43770866c8e148fe85af7b";
sha256 = "0dbbak53d5hi8jkp0wxcb3x6kysdi7ry2w1k9n0lj64qkmp5afnb"; sha256 = "1vgr5cjvkv7jxiwap7fzlhmpmhs8xmlswbzvi747zsbsgwvrk5yf";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -319,12 +319,12 @@ in
}; };
LuaSnip = buildVimPluginFrom2Nix { LuaSnip = buildVimPluginFrom2Nix {
pname = "LuaSnip"; pname = "LuaSnip";
version = "2023-09-25"; version = "2023-09-24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "L3MON4D3"; owner = "L3MON4D3";
repo = "LuaSnip"; repo = "LuaSnip";
rev = "480b032f6708573334f4437d3f83307d143f1a72"; rev = "1fd22fa96c11573248f9fdd09f25e724c7bb3dd4";
sha256 = "0ckysmd0612ssia9d5bvdz2p91zcfs6ak3q14aps4cn9acbzkfp6"; sha256 = "1lxw6l6rw07p50phmynnwid60gwz6pgq7p3z9j2yyp8alchxx7z5";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -550,12 +550,12 @@ in
}; };
toggleterm-nvim = buildVimPluginFrom2Nix { toggleterm-nvim = buildVimPluginFrom2Nix {
pname = "toggleterm.nvim"; pname = "toggleterm.nvim";
version = "2023-09-25"; version = "2023-09-11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "akinsho"; owner = "akinsho";
repo = "toggleterm.nvim"; repo = "toggleterm.nvim";
rev = "61e8ad370d4da5d84c77e31671027bc094ac06ca"; rev = "0427b908ebefcb3701c7f2cfbdafa37d11afe71a";
sha256 = "0cwqlaqvbnw4ncm717v052mzb943jcynrfpx38c8aspzjqybdcpj"; sha256 = "1wxrwl530kxm8k8ymgk3w77av770ndr1hhzfk315jgl2p5hqmqm0";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -605,12 +605,12 @@ in
}; };
noice-nvim = buildVimPluginFrom2Nix { noice-nvim = buildVimPluginFrom2Nix {
pname = "noice.nvim"; pname = "noice.nvim";
version = "2023-09-25"; version = "2023-08-30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "folke"; owner = "folke";
repo = "noice.nvim"; repo = "noice.nvim";
rev = "396f9146529130904e07c45e90ecdbfa607534f3"; rev = "74c2902146b080035beb19944baf6f014a954720";
sha256 = "0n7z491mg9wlr9vhpzanly9ywykbjavv04qk1f5msj5i5r613jh9"; sha256 = "10sjrxvnhrx1bi77lcdn5qz9kww4qcanajqzp2v8d3jlm5p2cc2c";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

View file

@ -25,7 +25,7 @@
upstreams.dns = { upstreams.dns = {
servers = { servers = {
"${secret.nginx.upstream.dns.primary.hostname}:${builtins.toString secret.nginx.upstream.dns.primary.upstreamPort}" = { "${secret.nginx.upstream.dns.primary.hostname}:${builtins.toString secret.nginx.upstream.dns.primary.upstreamPort}" = {
fail_timeout = "2s"; fail_timeout = "5s";
}; };
"${secret.nginx.upstream.dns.secondary.hostname}:${builtins.toString secret.nginx.upstream.dns.secondary.upstreamPort}" = { "${secret.nginx.upstream.dns.secondary.hostname}:${builtins.toString secret.nginx.upstream.dns.secondary.upstreamPort}" = {