add retiolum

This commit is contained in:
Ingolf Wagner 2023-06-10 18:34:54 +02:00
parent 3361247e7e
commit 2b6b034a22
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
4 changed files with 21 additions and 4 deletions

View file

@ -146,9 +146,9 @@
meta = { meta = {
nixpkgs = import nixpkgs { nixpkgs = import nixpkgs {
system = "x86_64-linux"; system = "x86_64-linux";
config.allowUnfree = true;
overlays = [ overlays = [
(_self: _super: { (_self: _super: {
# we assign the overlay created before to the overlays of nixpkgs.
unstable = import nixpkgs-unstable { unstable = import nixpkgs-unstable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
@ -158,7 +158,6 @@
landingpage = landingpage.packages.${pkgs.system}.plain; landingpage = landingpage.packages.${pkgs.system}.plain;
trilium-server = nixpkgs-unstable.legacyPackages.${pkgs.system}.trilium-server; trilium-server = nixpkgs-unstable.legacyPackages.${pkgs.system}.trilium-server;
kmonad = kmonad.packages.${pkgs.system}.kmonad; kmonad = kmonad.packages.${pkgs.system}.kmonad;
}) })
]; ];
}; };
@ -211,11 +210,13 @@
cream = { name, nodes, pkgs, ... }: { cream = { name, nodes, pkgs, ... }: {
deployment.allowLocalDeployment = true; deployment.allowLocalDeployment = true;
deployment.targetHost = "${name}.private"; deployment.targetHost = "${name}.private";
#deployment.targetHost = "localhost";
deployment.tags = [ "desktop" "online" "private" ]; deployment.tags = [ "desktop" "online" "private" ];
imports = [ imports = [
grocy-scanner.nixosModule grocy-scanner.nixosModule
nixos-hardware.nixosModules.framework-12th-gen-intel nixos-hardware.nixosModules.framework-12th-gen-intel
private_assets.nixosModules.jobrad private_assets.nixosModules.jobrad
retiolum.nixosModules.retiolum
]; ];
home-manager.users.mainUser = { home-manager.users.mainUser = {

View file

@ -9,8 +9,9 @@
./hardware-configuration.nix ./hardware-configuration.nix
./packages.nix ./packages.nix
./syncthing.nix ./syncthing.nix
./tinc.nix
./cups.nix ./cups.nix
./tinc.nix
./tinc_retiolum.nix
#./wifi-access-point.nix #./wifi-access-point.nix
#./wireshark.nix #./wireshark.nix

View file

@ -0,0 +1,15 @@
{ config, ... }:
{
sops.secrets.tinc_retiolum_ed25519_key = { };
sops.secrets.tinc_retiolum_rsa_key = { };
networking.retiolum.port = 720;
networking.retiolum.nodename = "sol";
services.tinc.networks.retiolum = {
ed25519PrivateKeyFile = config.sops.secrets.tinc_retiolum_ed25519_key.path;
rsaPrivateKeyFile = config.sops.secrets.tinc_retiolum_rsa_key.path;
};
}

View file

@ -222,7 +222,7 @@ in
cups cups
xfe # filemanager xfe # filemanager
evince evince
sxiv nsxiv
(library.desktopFile sxiv { (library.desktopFile sxiv {
longName = "Image Viewer"; longName = "Image Viewer";
command = "sxiv"; command = "sxiv";