update sterni

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 = [

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
     # ------------

nixos/machines/cream/packages.nix

@@ -65,6 +65,7 @@ in
     darktable
 
     blender
+    lightburn
 
     mosquitto
     (pkgs.writers.writeBashBin "mqtt-tail" ''

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 = {

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";

nixos/machines/sterni/qemu.nix

@@ -3,7 +3,6 @@
 {
 
   virtualisation.libvirtd.enable = true;
-  #virtualisation.libvirtd.allowedBridges = ["virbr0"];
   virtualisation.libvirtd.onShutdown = "shutdown";
 
   environment.systemPackages = [

nixos/machines/sterni/syncthing.nix

@@ -20,10 +20,10 @@
         enable = true;
         path = "/home/palo/.password-store";
       };
-      private = {
+      #private = {
-        enable = true;
+      #  enable = true;
-        path = "/home/palo/private";
+      #  path = "/home/palo/private";
-      };
+      #};
       art = {
         enable = true;
         path = "/home/palo/art";
@@ -47,10 +47,10 @@
         enable = true;
         path = "/home/palo/music-library";
       };
-      music-projects = {
+      #music-projects = {
-        enable = true;
+      #  enable = true;
-        path = "/home/palo/music-projects";
+      #  path = "/home/palo/music-projects";
-      };
+      #};
     };
   };
 

nixos/machines/sterni/tinc.nix

@@ -8,8 +8,8 @@
   tinc.secret.ipv4 = "10.123.42.24";
 
   # retiolum
-  networking.retiolum.port = 720;
+  #networking.retiolum.port = 720;
-  sops.secrets.tinc_retiolum_ed25519_key = { };
+  #sops.secrets.tinc_retiolum_ed25519_key = { };
-  services.tinc.networks.retiolum.ed25519PrivateKeyFile = config.sops.secrets.tinc_retiolum_ed25519_key.path;
+  #services.tinc.networks.retiolum.ed25519PrivateKeyFile = config.sops.secrets.tinc_retiolum_ed25519_key.path;
 
 }

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;
+  '';
+
+}