Compare commits

...

4 commits

4 changed files with 27 additions and 13 deletions

View file

@ -524,11 +524,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1723210907, "lastModified": 1724053136,
"narHash": "sha256-bDREVGFdYVZDhkipgFSJSTxZMzsNl1wg1EM6Li5eWlk=", "narHash": "sha256-INFq3ENfz0dtIFohPkMiIeX9yBcGV/Xzl1sTK/268fg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d6037c7090df9b7fb9f8d421570d25553713e264", "rev": "815d5589d958531af840d7e29424c8525aeff441",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -540,11 +540,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1722813957, "lastModified": 1723637854,
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -588,11 +588,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1722987190, "lastModified": 1723938990,
"narHash": "sha256-68hmex5efCiM2aZlAAEcQgmFI4ZwWt8a80vOeB/5w3A=", "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "21cc704b5e918c5fbf4f9fff22b4ac2681706d90", "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -4,7 +4,7 @@
... ...
}: { }: {
flake = { flake = {
nixosModules = rec { nixosModules = {
overlays = {...}: { overlays = {...}: {
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.deno2nix.overlays.default inputs.deno2nix.overlays.default
@ -20,6 +20,7 @@
paperless-ngx = unstable.paperless-ngx; paperless-ngx = unstable.paperless-ngx;
waybar = master.waybar; waybar = master.waybar;
nix-inspect = unstable.nix-inspect; nix-inspect = unstable.nix-inspect;
nix = unstable.lix;
authelia = authelia-438.authelia; authelia = authelia-438.authelia;
adlist = inputs.adblock-unbound.packages.${prev.system}; adlist = inputs.adblock-unbound.packages.${prev.system};
@ -43,7 +44,7 @@
(import ./element-desktop.nix) (import ./element-desktop.nix)
(import ../pkgs) (import ../pkgs)
(import ./blesh.nix) # (import ./blesh.nix)
(import ./rnix-lsp.nix) (import ./rnix-lsp.nix)
(import ./neovim-plugins.nix) (import ./neovim-plugins.nix)

View file

@ -1,6 +1,10 @@
# This file was generated by nvfetcher, please do not modify it manually. # This file was generated by nvfetcher, please do not modify it manually.
{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
{ {
fetchgit,
fetchurl,
fetchFromGitHub,
dockerTools,
}: {
b12f-io-nvfetcher = { b12f-io-nvfetcher = {
pname = "b12f-io-nvfetcher"; pname = "b12f-io-nvfetcher";
version = "38adb94ce69d8807ea2e36f57abe08091192b31c"; version = "38adb94ce69d8807ea2e36f57abe08091192b31c";

View file

@ -34,46 +34,55 @@ in {
"salt.base.test" = { "salt.base.test" = {
hostname = "10.0.0.2"; hostname = "10.0.0.2";
user = "root"; user = "root";
proxyJump = "gateway.base.test";
}; };
"gateway.base.test" = { "gateway.base.test" = {
hostname = "10.0.0.3"; # hostname = "10.0.0.3";
hostname = "gateway.base.cate-infra-test.de";
user = "root"; user = "root";
}; };
"monitor.base.test" = { "monitor.base.test" = {
hostname = "10.0.0.4"; hostname = "10.0.0.4";
user = "root"; user = "root";
proxyJump = "gateway.base.test";
}; };
"proxy1.prod.test" = { "proxy1.prod.test" = {
hostname = "10.0.0.6"; hostname = "10.0.0.6";
user = "root"; user = "root";
proxyJump = "gateway.base.test";
}; };
"proxy2.prod.test" = { "proxy2.prod.test" = {
hostname = "10.0.0.7"; hostname = "10.0.0.7";
user = "root"; user = "root";
proxyJump = "gateway.base.test";
}; };
"demo1.prod.test" = { "demo1.prod.test" = {
hostname = "10.0.0.5"; hostname = "10.0.0.5";
user = "root"; user = "root";
proxyJump = "gateway.base.test";
}; };
"demo2.prod.test" = { "demo2.prod.test" = {
hostname = "10.0.0.5"; hostname = "10.0.0.5";
user = "root"; user = "root";
proxyJump = "gateway.base.test";
}; };
"proxy1.test.test" = { "proxy1.test.test" = {
hostname = "10.0.0.8"; hostname = "10.0.0.8";
user = "root"; user = "root";
proxyJump = "gateway.base.test";
}; };
"proxy2.test.test" = { "proxy2.test.test" = {
hostname = "10.0.0.9"; hostname = "10.0.0.9";
user = "root"; user = "root";
proxyJump = "gateway.base.test";
}; };
}; };
}; };