Mic92
/
stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

This commit is contained in:
lassulus 2023-01-31 09:54:39 +01:00
parent f6666bc178 cbc84f9bc6
commit 35b57b0d6c
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tv/1systems/ru/config.nix Normal file
View File

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

2
tv/5pkgs/override/flameshot/default.nix
View File

@ -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
];
})