diff --git a/flake.lock b/flake.lock index c6b9f8e6..523ab493 100644 --- a/flake.lock +++ b/flake.lock @@ -153,6 +153,22 @@ "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": { "locked": { "lastModified": 1627460592, @@ -209,6 +225,7 @@ "neuron": "neuron", "nixos-hardware": "nixos-hardware", "nixpkgs-nixos-unstable": "nixpkgs-nixos-unstable", + "nixpkgs-scanner-fix": "nixpkgs-scanner-fix", "nixpkgs-stable": "nixpkgs-stable", "nur": "nur" } diff --git a/flake.nix b/flake.nix index 55b52be1..8fae0d69 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { 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 mkServer = pkgs: system: hostname: @@ -42,7 +42,7 @@ }; foureighty = mkWorkstation nixpkgs-stable "x86_64-linux" "foureighty"; 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"; }; }; @@ -61,6 +61,13 @@ ref = "nixos-21.05"; }; + nixpkgs-scanner-fix = { + type = "github"; + owner = "NixOS"; + repo = "nixpkgs"; + ref = "de3a208b73248a1f0478695b22fe51d2c25baa7f"; + }; + nixos-hardware = { type = "github"; owner = "NixOS"; diff --git a/nixos/boxes/brix/print-server.nix b/nixos/boxes/brix/print-server.nix index 1a853b88..af849f4e 100644 --- a/nixos/boxes/brix/print-server.nix +++ b/nixos/boxes/brix/print-server.nix @@ -40,11 +40,11 @@ services.saned = { enable = true; extraConfig = '' - 10.0.0.0/24 - 172.23.153.159 - 172.23.28.139 - 172.23.206.88 - [fd77:8f2a:9a44::1]/60 + 100.69.222.80 + 10.0.24.0/24 + 10.0.0.1/24 + foureighty + hagath ''; }; diff --git a/nixos/common-hardware.nix b/nixos/common-hardware.nix index 672c0fca..4eadc9d9 100644 --- a/nixos/common-hardware.nix +++ b/nixos/common-hardware.nix @@ -46,9 +46,10 @@ hardware.sane = { enable = true; netConf = '' - 10.0.0.232 - brix.local brix + brix.lan + 100.73.65.60 + 10.0.24.232 ''; snapshot = true; extraBackends = with pkgs; [ sane-airscan utsushi ];