1
0

Update from updated-inputs-2024-11-25-02-03

This commit is contained in:
Flake Update Bot 2024-11-25 03:04:01 +01:00
commit fd7c98216c
7 changed files with 46 additions and 0 deletions

View File

@ -334,11 +334,32 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nurausstieg": "nurausstieg", "nurausstieg": "nurausstieg",
"scan-to-gpg": "scan-to-gpg",
"solid-xmpp-alarm": "solid-xmpp-alarm", "solid-xmpp-alarm": "solid-xmpp-alarm",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"ssh-to-age": "ssh-to-age" "ssh-to-age": "ssh-to-age"
} }
}, },
"scan-to-gpg": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1732477156,
"narHash": "sha256-Cpw9YtpnZpVz5gcuiJO6rpJjLvS9O/Y8AuRt3/NFz1w=",
"ref": "refs/heads/main",
"rev": "f727e7f9717bebb13f80dfb6d6a92afe5284ffdf",
"revCount": 14,
"type": "git",
"url": "https://git.clerie.de/clerie/scan-to-gpg.git"
},
"original": {
"type": "git",
"url": "https://git.clerie.de/clerie/scan-to-gpg.git"
}
},
"solid-xmpp-alarm": { "solid-xmpp-alarm": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View File

@ -31,6 +31,10 @@
url = "git+https://git.clerie.de/clerie/nurausstieg.git"; url = "git+https://git.clerie.de/clerie/nurausstieg.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
scan-to-gpg = {
url = "git+https://git.clerie.de/clerie/scan-to-gpg.git";
inputs.nixpkgs.follows = "nixpkgs";
};
solid-xmpp-alarm = { solid-xmpp-alarm = {
url = "git+https://git.clerie.de/clerie/solid-xmpp-alarm.git"; url = "git+https://git.clerie.de/clerie/solid-xmpp-alarm.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View File

@ -2,6 +2,7 @@
, fernglas , fernglas
, fieldpoc , fieldpoc
, nixos-exporter , nixos-exporter
, scan-to-gpg
, solid-xmpp-alarm , solid-xmpp-alarm
, sops-nix , sops-nix
, ... , ...
@ -13,6 +14,7 @@
fernglas.nixosModules.default fernglas.nixosModules.default
fieldpoc.nixosModules.default fieldpoc.nixosModules.default
nixos-exporter.nixosModules.default nixos-exporter.nixosModules.default
scan-to-gpg.nixosModules.scan-to-gpg
solid-xmpp-alarm.nixosModules.solid-xmpp-alarm solid-xmpp-alarm.nixosModules.solid-xmpp-alarm
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
]; ];

View File

@ -4,6 +4,7 @@
, chaosevents , chaosevents
, harmonia , harmonia
, nurausstieg , nurausstieg
, scan-to-gpg
, ssh-to-age , ssh-to-age
, ... , ...
}@inputs: }@inputs:
@ -19,6 +20,8 @@ final: prev: {
}; };
inherit (nurausstieg.packages.${final.system}) inherit (nurausstieg.packages.${final.system})
nurausstieg; nurausstieg;
inherit (scan-to-gpg.packages.${final.system})
scan-to-gpg;
inherit (ssh-to-age.packages.${final.system}) inherit (ssh-to-age.packages.${final.system})
ssh-to-age; ssh-to-age;
} }

View File

@ -18,6 +18,7 @@
./net-voip.nix ./net-voip.nix
./ntp.nix ./ntp.nix
./ppp.nix ./ppp.nix
./scan-to-gpg.nix
./wg-clerie.nix ./wg-clerie.nix
]; ];

View File

@ -37,6 +37,10 @@
}; };
}; };
# Enable scan-to-gpg
networking.firewall.interfaces."net-printer".allowedTCPPorts = [ 2121 ];
networking.firewall.interfaces."net-printer".allowedTCPPortRanges = [ { from = 2130; to = 2134; } ];
clerie.firewall.extraForwardFilterCommands = '' clerie.firewall.extraForwardFilterCommands = ''
# Allow access from Heimnetz to printer # Allow access from Heimnetz to printer
ip46tables -A forward-filter -i net-heimnetz -o net-printer -j ACCEPT ip46tables -A forward-filter -i net-heimnetz -o net-printer -j ACCEPT

View File

@ -0,0 +1,11 @@
{ pkgs, ... }:
{
services.scan-to-gpg = {
enable = true;
gpgkey = "${pkgs.clerie-keys}/gpg/clerie@clerie.de.asc";
};
users.users."clerie".extraGroups = [ "scan-to-gpg" ];
}