Skip to content

Commit da04edf

Browse files
disassemblerdisassembler
committed
nixpkgs/nix update
1 parent d2ad0e7 commit da04edf

File tree

10 files changed

+848
-3441
lines changed

10 files changed

+848
-3441
lines changed

‎flake.lock‎

Lines changed: 757 additions & 3370 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
description = "Disassembler Network";
33
inputs = {
44
flake-utils.url = "github:numtide/flake-utils";
5-
nix.url = "github:NixOS/nix/2.8.0";
6-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
7-
nixpkgs-2111.follows = "cardano-node/haskellNix/nixpkgs-2111";
8-
nixpkgs-2105.follows = "cardano-node/haskellNix/nixpkgs-2105";
9-
cardano-node.url = "github:input-output-hk/cardano-node/1.35.0-rc4";
5+
nix.url = "github:NixOS/nix/2.12.0";
6+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
7+
#nixpkgs-2111.follows = "cardano-node/haskellNix/nixpkgs-2111";
8+
#nixpkgs-2105.follows = "cardano-node/haskellNix/nixpkgs-2105";
9+
cardano-node.url = "github:input-output-hk/cardano-node/1.35.4";
1010
#cardano-node.inputs.nixpkgs.follows = "haskellNix/nixpkgs-2105";
1111
#cardano-addresses.url = "github:input-output-hk/cardano-addresses";
12-
haskellNix.url = "github:input-output-hk/haskell.nix/14f740c7c8f535581c30b1697018e389680e24cb";
12+
#haskellNix.url = "github:input-output-hk/haskell.nix/14f740c7c8f535581c30b1697018e389680e24cb";
1313
#cardano-db-sync.url = "github:input-output-hk/cardano-db-sync";
1414
adawallet.url = "github:input-output-hk/adawallet";
1515
#adawallet.inputs.cardano-addresses.follows = "cardano-addresses";

‎nixos/deploy.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ in
1717
nodes = {
1818
optina = mkNode "optina" "10.40.33.20" true;
1919
portal = mkNode "portal" "10.40.33.1" true;
20-
sarov = mkNode "sarov" "10.40.33.197" true;
20+
sarov = mkNode "sarov" "10.40.33.183" true;
2121
valaam = mkNode "valaam" "10.40.33.21" true;
2222
prod01 = mkNode "prod01" "45.76.4.212" false;
2323
prod03 = mkNode "prod03" "45.63.23.13" false;

‎nixos/optina/configuration.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ in
260260
};
261261
};
262262
matterbridge = {
263-
enable = true;
263+
enable = false;
264264
configPath = "/etc/nixos/matterbridge.toml";
265265
};
266266
minecraft-bedrock-server.enable = true;

‎nixos/optina/minecraft-bedrock.nix‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
{ stdenv, fetchurl, patchelf, openssl, unzip, lib, zlib }:
1+
{ stdenv, fetchurl, patchelf, openssl, unzip, lib, zlib, curl }:
22

33
let
4-
version = "1.18.32.02";
5-
sha256 = "sha256-rp7lEqloNcYl6YnXKK06+UDU9xgWtEcZDeCNzsoxPe8=";
6-
rpath = lib.makeLibraryPath [ zlib openssl stdenv.cc.cc ];
4+
version = "1.19.51.01";
5+
sha256 = "sha256-DffMcl579TXwdkmYw8emBmvhI+G5wdBVNDdXQ13DJ+Y=";
6+
rpath = lib.makeLibraryPath [ zlib openssl stdenv.cc.cc curl ];
77
in
88
stdenv.mkDerivation rec {
99
name = "${pname}-${version}";

‎nixos/portal/configuration.nix‎

Lines changed: 60 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,9 @@ in
350350
};
351351
dnsmasq = {
352352
enable = true;
353+
extraConfig = ''
354+
address=/hivebedrock.network/10.40.33.20
355+
'';
353356
};
354357
tftpd = {
355358
enable = true;
@@ -524,63 +527,63 @@ in
524527
];
525528
};
526529
};
527-
openvpn = {
528-
servers = {
529-
wedlake = {
530-
config = ''
531-
dev tun
532-
proto udp
533-
port 1194
534-
tun-ipv6
535-
ca /var/lib/openvpn/ca.crt
536-
cert /var/lib/openvpn/crate.wedlake.lan.crt
537-
key /var/lib/openvpn/crate.wedlake.lan.key
538-
dh /var/lib/openvpn/dh2048.pem
539-
server 10.40.12.0 255.255.255.0
540-
server-ipv6 2601:98a:4101:bff3::/64
541-
push "route 10.40.33.0 255.255.255.0"
542-
push "route-ipv6 2000::/3"
543-
push "dhcp-option DNS 10.40.12.1"
544-
duplicate-cn
545-
keepalive 10 120
546-
tls-auth /var/lib/openvpn/ta.key 0
547-
comp-lzo
548-
user openvpn
549-
group root
550-
persist-key
551-
persist-tun
552-
status openvpn-status.log
553-
verb 3
554-
'';
555-
};
556-
guest = {
557-
config = ''
558-
dev ovpn-guest
559-
dev-type tun
560-
proto udp
561-
port 1195
562-
tun-ipv6
563-
ca /var/lib/openvpn/ca.crt
564-
cert /var/lib/openvpn/crate.wedlake.lan.crt
565-
key /var/lib/openvpn/crate.wedlake.lan.key
566-
dh /var/lib/openvpn/dh2048.pem
567-
server 10.40.13.0 255.255.255.0
568-
push "redirect-gateway def1"
569-
push "dhcp-option DNS 8.8.8.8"
570-
duplicate-cn
571-
keepalive 10 120
572-
tls-auth /var/lib/openvpn/ta-guest.key 0
573-
comp-lzo
574-
user openvpn
575-
group root
576-
persist-key
577-
persist-tun
578-
status openvpn-status.log
579-
verb 3
580-
'';
581-
};
582-
};
583-
};
530+
#openvpn = {
531+
# servers = {
532+
# wedlake = {
533+
# config = ''
534+
# dev tun
535+
# proto udp
536+
# port 1194
537+
# tun-ipv6
538+
# ca /var/lib/openvpn/ca.crt
539+
# cert /var/lib/openvpn/crate.wedlake.lan.crt
540+
# key /var/lib/openvpn/crate.wedlake.lan.key
541+
# dh /var/lib/openvpn/dh2048.pem
542+
# server 10.40.12.0 255.255.255.0
543+
# server-ipv6 2601:98a:4101:bff3::/64
544+
# push "route 10.40.33.0 255.255.255.0"
545+
# push "route-ipv6 2000::/3"
546+
# push "dhcp-option DNS 10.40.12.1"
547+
# duplicate-cn
548+
# keepalive 10 120
549+
# tls-auth /var/lib/openvpn/ta.key 0
550+
# comp-lzo
551+
# user openvpn
552+
# group root
553+
# persist-key
554+
# persist-tun
555+
# status openvpn-status.log
556+
# verb 3
557+
# '';
558+
# };
559+
# guest = {
560+
# config = ''
561+
# dev ovpn-guest
562+
# dev-type tun
563+
# proto udp
564+
# port 1195
565+
# tun-ipv6
566+
# ca /var/lib/openvpn/ca.crt
567+
# cert /var/lib/openvpn/crate.wedlake.lan.crt
568+
# key /var/lib/openvpn/crate.wedlake.lan.key
569+
# dh /var/lib/openvpn/dh2048.pem
570+
# server 10.40.13.0 255.255.255.0
571+
# push "redirect-gateway def1"
572+
# push "dhcp-option DNS 8.8.8.8"
573+
# duplicate-cn
574+
# keepalive 10 120
575+
# tls-auth /var/lib/openvpn/ta-guest.key 0
576+
# comp-lzo
577+
# user openvpn
578+
# group root
579+
# persist-key
580+
# persist-tun
581+
# status openvpn-status.log
582+
# verb 3
583+
# '';
584+
# };
585+
# };
586+
#};
584587
};
585588
users.extraUsers.sam = {
586589
isNormalUser = true;

‎nixos/prod03/modules/network.nix‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ in
5050
nameservers = [ "127.0.0.1" "8.8.8.8" ];
5151
useDHCP = false;
5252
interfaces.ens3.useDHCP = true;
53-
interfaces.ens7.useDHCP = true;
5453

5554
#wireguard.interfaces = {
5655
# wg0 = {

‎nixos/pskov/configuration.nix‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ in
4545
boot.cleanTmpDir = true;
4646
boot.zfs.devNodes = "/dev";
4747

48+
boot.extraModprobeConfig = ''
49+
options kvm_intel nested=1
50+
options kvm_intel emulate_invalid_guest_state=0
51+
options kvm ignore_msrs=1
52+
'';
4853

4954
# Splash screen to make boot look nice
5055
boot.plymouth.enable = false;
@@ -268,6 +273,7 @@ in
268273
keybase
269274
keybase-gui
270275
slack
276+
signal-desktop
271277
neomutt
272278
notmuch
273279
taskwarrior
@@ -598,7 +604,7 @@ in
598604
""
599605
"${config.virtualisation.podman.package}/bin/podman --storage-driver zfs $LOGGING system service"
600606
];
601-
virtualisation.libvirtd.enable = false;
607+
virtualisation.libvirtd.enable = true;
602608
security.sudo.wheelNeedsPassword = true;
603609

604610
# Custom dotfiles for sam user

‎outputs.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
pkgs = nixpkgs.legacyPackages."${system}";
1111
in
1212
{
13+
minecraft = pkgs.callPackage ./nixos/optina/minecraft-bedrock.nix {};
1314
devShell = pkgs.callPackage ./shell.nix {
1415
inherit (sops-nix.packages."${pkgs.system}") sops-import-keys-hook ssh-to-pgp sops-init-gpg-key;
1516
inherit (deploy.packages."${pkgs.system}") deploy-rs;

‎shell.nix‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,22 @@
77
, nixpkgs-fmt
88
, knot-dns
99
, lefthook
10+
, qemu
11+
, iproute2
1012
, python3
13+
, libguestfs-with-appliance
1114
}:
1215

1316
mkShell {
1417
sopsPGPKeyDirs = [ "./nixos/secrets/keys" ];
18+
# for OSX-KVM
19+
buildInputs = [
20+
qemu
21+
python3
22+
iproute2
23+
# If you want to regenerate the OpenCore image you'll need the below:
24+
#libguestfs-with-appliance
25+
];
1526
nativeBuildInputs = [
1627
python3.pkgs.invoke
1728
ssh-to-pgp

0 commit comments

Comments
 (0)