From 0c756f7749583d1f6c536ef4c9b337c6ec225902 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Mon, 14 Aug 2023 03:08:56 +0200 Subject: [PATCH] update sterni --- flake.nix | 9 +++++++++ nixos/machines/chungus/media-youtube.nix | 15 +++++++++++++++ nixos/machines/cream/packages.nix | 1 + nixos/machines/sterni/configuration.nix | 23 +++++++++++++---------- nixos/machines/sterni/packages.nix | 9 +++------ nixos/machines/sterni/qemu.nix | 1 - nixos/machines/sterni/syncthing.nix | 16 ++++++++-------- nixos/machines/sterni/tinc.nix | 6 +++--- nixos/machines/sterni/trilium.nix | 19 +++++++++++++++++++ 9 files changed, 71 insertions(+), 28 deletions(-) create mode 100644 nixos/machines/sterni/trilium.nix diff --git a/flake.nix b/flake.nix index a67a97e..3776d89 100644 --- a/flake.nix +++ b/flake.nix @@ -281,6 +281,15 @@ nixosConfigurations = { + sterni = nixosConfigurationSetup { + name = "sterni"; + modules = [ + nixos-hardware.nixosModules.lenovo-thinkpad-x220 + #retiolum.nixosModules.retiolum + #private_assets.nixosModules.jobrad + homeManagerModules + ]; + }; cream = nixosConfigurationSetup { name = "cream"; modules = [ diff --git a/nixos/machines/chungus/media-youtube.nix b/nixos/machines/chungus/media-youtube.nix index 2670c1a..96fca21 100644 --- a/nixos/machines/chungus/media-youtube.nix +++ b/nixos/machines/chungus/media-youtube.nix @@ -110,6 +110,21 @@ let target = "/media/youtube/channels/Jules"; output = "%(channel)s S%(upload_date>%Y)sE%(upload_date>%m%d)s %(title)s.%(ext)s"; }; + UrknallWeltallLeben = { + url = "https://youtube.com/@UrknallWeltallLeben"; + target = "/media/youtube/channels/Urknall Weltall Leben"; + output = "%(channel)s S%(upload_date>%Y)sE%(upload_date>%m%d)s %(title)s.%(ext)s"; + }; + ColdMirrorProdukte = { + url = "https://www.youtube.com/watch?list=PLDvBqWb1UAGckU8CEJ8kDsk3ii8bbHT-s"; + target = "/media/youtube/channels/ColdMirror ProduktBeschreibungen"; + output = "%(channel)s S%(upload_date>%Y)sE%(upload_date>%m%d)s %(title)s.%(ext)s"; + }; + ColdMirror5Minuten = { + url = "https://www.youtube.com/watch?list=PLDvBqWb1UAGeEt9n6vFH_zdGw65Obf3sH"; + target = "/media/youtube/channels/ColdMirror 5 Minuten Harry Potter"; + output = "%(channel)s S%(upload_date>%Y)sE%(upload_date>%m%d)s %(title)s.%(ext)s"; + }; # My Playlists # ------------ diff --git a/nixos/machines/cream/packages.nix b/nixos/machines/cream/packages.nix index caeae97..0cb6ff2 100644 --- a/nixos/machines/cream/packages.nix +++ b/nixos/machines/cream/packages.nix @@ -65,6 +65,7 @@ in darktable blender + lightburn mosquitto (pkgs.writers.writeBashBin "mqtt-tail" '' diff --git a/nixos/machines/sterni/configuration.nix b/nixos/machines/sterni/configuration.nix index e8848d6..df3a488 100644 --- a/nixos/machines/sterni/configuration.nix +++ b/nixos/machines/sterni/configuration.nix @@ -10,23 +10,32 @@ ./packages.nix ./syncthing.nix ./tinc.nix + ./trilium.nix #./wifi-access-point.nix #./wireshark.nix - ./scanner.nix - ./qemu.nix + #./qemu.nix ./wireguard.nix ]; components.gui.enable = true; + components.terminal.enable = true; + components.network.enable = true; + components.network.wifi.enable = true; + components.mainUser.enable = true; + users.users.mainUser.extraGroups = [ "adbusers" "video" ]; + + # todo + programs.custom.steam.enable = false; + programs.custom.video.enable = false; + services.printing.enable = false; services.nginx.enable = true; - #sops.defaultSopsFile = ../../secrets/sterni.yaml; networking.hostName = "sterni"; - system.custom.wifi.interfaces = [ "wlp3s0" ]; + services.flatpak.enable = true; security.wrappers = { pmount = { @@ -43,11 +52,6 @@ }; }; - programs.custom.steam.enable = true; - programs.custom.video.enable = false; - - services.printing.enable = true; - home-manager.users.mainUser.home.stateVersion = "22.11"; # fonts @@ -83,7 +87,6 @@ # enable this to use sidequest programs.adb.enable = true; - users.users.mainUser.extraGroups = [ "adbusers" "video" ]; # for congress and streaming hardware.opengl = { diff --git a/nixos/machines/sterni/packages.nix b/nixos/machines/sterni/packages.nix index 5c0c0d6..2fe2d8f 100644 --- a/nixos/machines/sterni/packages.nix +++ b/nixos/machines/sterni/packages.nix @@ -43,6 +43,9 @@ in valentina + signal-desktop + fluffychat + sweethome3d.application pkgs.polygon-art.polygon-art @@ -81,12 +84,6 @@ in jetbrains.pycharm-professional jetbrains.datagrip - # matrix clients - # -------------- - #element-desktop - #fractal - legacy.mirage-im - tor-browser-bundle-bin #(tor-browser-bundle-bin.overrideAttrs (old: rec { # version = "11.0.1"; diff --git a/nixos/machines/sterni/qemu.nix b/nixos/machines/sterni/qemu.nix index f14ad8d..91597bc 100644 --- a/nixos/machines/sterni/qemu.nix +++ b/nixos/machines/sterni/qemu.nix @@ -3,7 +3,6 @@ { virtualisation.libvirtd.enable = true; - #virtualisation.libvirtd.allowedBridges = ["virbr0"]; virtualisation.libvirtd.onShutdown = "shutdown"; environment.systemPackages = [ diff --git a/nixos/machines/sterni/syncthing.nix b/nixos/machines/sterni/syncthing.nix index e9bcf2a..ee92d8c 100644 --- a/nixos/machines/sterni/syncthing.nix +++ b/nixos/machines/sterni/syncthing.nix @@ -20,10 +20,10 @@ enable = true; path = "/home/palo/.password-store"; }; - private = { - enable = true; - path = "/home/palo/private"; - }; + #private = { + # enable = true; + # path = "/home/palo/private"; + #}; art = { enable = true; path = "/home/palo/art"; @@ -47,10 +47,10 @@ enable = true; path = "/home/palo/music-library"; }; - music-projects = { - enable = true; - path = "/home/palo/music-projects"; - }; + #music-projects = { + # enable = true; + # path = "/home/palo/music-projects"; + #}; }; }; diff --git a/nixos/machines/sterni/tinc.nix b/nixos/machines/sterni/tinc.nix index d552c21..9dd0446 100644 --- a/nixos/machines/sterni/tinc.nix +++ b/nixos/machines/sterni/tinc.nix @@ -8,8 +8,8 @@ tinc.secret.ipv4 = "10.123.42.24"; # retiolum - networking.retiolum.port = 720; - sops.secrets.tinc_retiolum_ed25519_key = { }; - services.tinc.networks.retiolum.ed25519PrivateKeyFile = config.sops.secrets.tinc_retiolum_ed25519_key.path; + #networking.retiolum.port = 720; + #sops.secrets.tinc_retiolum_ed25519_key = { }; + #services.tinc.networks.retiolum.ed25519PrivateKeyFile = config.sops.secrets.tinc_retiolum_ed25519_key.path; } diff --git a/nixos/machines/sterni/trilium.nix b/nixos/machines/sterni/trilium.nix new file mode 100644 index 0000000..db99e2d --- /dev/null +++ b/nixos/machines/sterni/trilium.nix @@ -0,0 +1,19 @@ +{ config, pkgs, ... }: +{ + + services.trilium-server = { + enable = true; + instanceName = config.networking.hostName; + host = "10.23.42.27"; + nginx = { + enable = true; + hostName = "trilium.${config.networking.hostName}.private"; + }; + }; + + services.nginx.virtualHosts."${config.services.trilium-server.nginx.hostName}".extraConfig = '' + allow ${config.tinc.private.subnet}; + deny all; + ''; + +}