Merge remote-tracking branch 'ni/master'

lass/1systems/mors/config.nix

@@ -51,34 +51,6 @@ with import <stockholm/lib>;
         { predicate = "-p udp --dport 27950:27965"; target = "ACCEPT"; }
       ];
     }
-    {
-      services.syncthing.declarative = {
-        devices.schasch.addresses = [ "schasch.r:22000" ];
-        folders = {
-          the_playlist = {
-            path = "/home/lass/tmp/the_playlist";
-            devices = [ "mors" "phone" "prism" "xerxes" ];
-          };
-          free_music = {
-            id = "mu9mn-zgvsw";
-            path = "/home/lass/tmp/free_music";
-            devices = [ "mors" "schasch" ];
-          };
-        };
-      };
-      krebs.permown = {
-        "/home/lass/tmp/free_music" = {
-          owner = "lass";
-          group = "syncthing";
-          umask = "0007";
-        };
-        "/home/lass/tmp/the_playlist" = {
-          owner = "lass";
-          group = "syncthing";
-          umask = "0007";
-        };
-      };
-    }
     {
       services.nginx = {
         enable = true;

tv/1systems/ru/config.nix

@@ -0,0 +1,34 @@
+with import ./lib;
+{ config, ... }: {
+  imports = [
+    ../..
+    ../../2configs/hw/winmax2.nix
+    ../../2configs/retiolum.nix
+    ../../2configs/wiregrill.nix
+  ];
+
+  boot.initrd.luks.devices.main.device = "/dev/nvme0n1p2";
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.systemd-boot.enable = true;
+
+  fileSystems."/" = {
+    device = "main/root";
+    fsType = "zfs";
+  };
+  fileSystems."/boot" = {
+    device = "/dev/nvme0n1p1";
+    fsType = "vfat";
+  };
+  fileSystems."/home" = {
+    device = "main/home";
+    fsType = "zfs";
+  };
+  fileSystems."/bku" = {
+    device = "main/bku";
+    fsType = "zfs";
+  };
+
+  krebs.build.host = config.krebs.hosts.ru;
+
+  system.stateVersion = "22.11";
+}

tv/5pkgs/override/flameshot/default.nix

@@ -10,6 +10,6 @@ super.flameshot.overrideAttrs (old: rec {
     sha256 = "sha256-rZUiaS32C77tFJmEkw/9MGbVTVscb6LOCyWaWO5FyR4=";
   };
   patches = old.patches or [] ++ [
-    ./flameshot/flameshot_imgur_0.10.2.patch
+    ./flameshot_imgur_0.10.2.patch
   ];
 })