summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <git@lassul.us>2023-01-31 09:54:39 +0100
committerlassulus <git@lassul.us>2023-01-31 09:54:39 +0100
commit35b57b0d6c512d6f35d9534220c2eb20240f2e90 (patch)
tree2900ceaacb1b0ef11080e045d93e4e727d4101cb
parentf6666bc1782c5385493fdc5e38c30bcddeb5bbd7 (diff)
parentcbc84f9bc6c988f5691d407f65e84c5729653463 (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--tv/1systems/ru/config.nix34
-rw-r--r--tv/5pkgs/override/flameshot/default.nix2
2 files changed, 35 insertions, 1 deletions
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";
+}
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
];
})