cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix network scanning

Browse source
This commit is contained in:
Cyryl Płotnicki 2021-07-31 15:55:55 +01:00
parent 93faeef18d
commit 437cfc64bb
4 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
flake.lock
View file

@ -153,6 +153,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-scanner-fix": {
"locked": {
"lastModified": 1626998298,
"narHash": "sha256-JEf6Mp6YpuqXXLW8tY3eN6WIAe7gdsjgfSJYb/75GIE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "de3a208b73248a1f0478695b22fe51d2c25baa7f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "de3a208b73248a1f0478695b22fe51d2c25baa7f",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1627460592, "lastModified": 1627460592,
@ -209,6 +225,7 @@
"neuron": "neuron", "neuron": "neuron",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs-nixos-unstable": "nixpkgs-nixos-unstable", "nixpkgs-nixos-unstable": "nixpkgs-nixos-unstable",
"nixpkgs-scanner-fix": "nixpkgs-scanner-fix",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nur": "nur" "nur": "nur"
} }

11
flake.nix
View file

@ -1,6 +1,6 @@
{ {
description = "NixOS configuration with flakes"; description = "NixOS configuration with flakes";
outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nixos-hardware, nur, agenix, neuron } @ inputs: outputs = { self, flake-utils, home-manager, nixpkgs-nixos-unstable, nixpkgs-stable, nixos-hardware, nur, agenix, neuron, nixpkgs-scanner-fix } @ inputs:
let let
mkServer = pkgs: system: hostname: mkServer = pkgs: system: hostname:
@ -42,7 +42,7 @@
}; };
foureighty = mkWorkstation nixpkgs-stable "x86_64-linux" "foureighty"; foureighty = mkWorkstation nixpkgs-stable "x86_64-linux" "foureighty";
skinnyv = mkWorkstation nixpkgs-stable "x86_64-linux" "skinnyv"; skinnyv = mkWorkstation nixpkgs-stable "x86_64-linux" "skinnyv";
brix = mkServer nixpkgs-stable "x86_64-linux" "brix"; brix = mkServer nixpkgs-scanner-fix "x86_64-linux" "brix";
vultr1 = mkServer nixpkgs-stable "x86_64-linux" "vultr1"; vultr1 = mkServer nixpkgs-stable "x86_64-linux" "vultr1";
}; };
}; };
@ -61,6 +61,13 @@
ref = "nixos-21.05"; ref = "nixos-21.05";
}; };
nixpkgs-scanner-fix = {
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "de3a208b73248a1f0478695b22fe51d2c25baa7f";
};
nixos-hardware = { nixos-hardware = {
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";

10
nixos/boxes/brix/print-server.nix
View file

@ -40,11 +40,11 @@
services.saned = { services.saned = {
enable = true; enable = true;
extraConfig = '' extraConfig = ''
10.0.0.0/24 100.69.222.80
172.23.153.159 10.0.24.0/24
172.23.28.139 10.0.0.1/24
172.23.206.88 foureighty
[fd77:8f2a:9a44::1]/60 hagath
''; '';
}; };

5
nixos/common-hardware.nix
View file

@ -46,9 +46,10 @@
hardware.sane = { hardware.sane = {
enable = true; enable = true;
netConf = '' netConf = ''
10.0.0.232
brix.local
brix brix
brix.lan
100.73.65.60
10.0.24.232
''; '';
snapshot = true; snapshot = true;
extraBackends = with pkgs; [ sane-airscan utsushi ]; extraBackends = with pkgs; [ sane-airscan utsushi ];