From 9d615e2828de2f2f0eeb0848d5080dafc16ba705 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 31 Jan 2023 01:10:15 +0100
Subject: [PATCH 1/2] tv flameshot: properly reference patch
---
tv/5pkgs/override/flameshot/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tv/5pkgs/override/flameshot/default.nix b/tv/5pkgs/override/flameshot/default.nix
index 2f7c5236b..10154cc44 100644
--- a/tv/5pkgs/override/flameshot/default.nix
+++ b/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
];
})
From cbc84f9bc6c988f5691d407f65e84c5729653463 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 31 Jan 2023 01:20:19 +0100
Subject: [PATCH 2/2] tv ru: init
---
tv/1systems/ru/config.nix | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 tv/1systems/ru/config.nix
diff --git a/tv/1systems/ru/config.nix b/tv/1systems/ru/config.nix
new file mode 100644
index 000000000..e66cddead
--- /dev/null
+++ b/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";
+}