diff options
| -rw-r--r-- | configs/exim-smarthost.nix | 2 | ||||
| -rw-r--r-- | configs/initrd/sshd.nix | 6 | ||||
| -rw-r--r-- | pkgs/simple/dic.nix | 6 | ||||
| -rw-r--r-- | pkgs/simple/garage-k2v-client.nix | 23 | ||||
| -rw-r--r-- | systems/querel/config.nix | 2 | ||||
| -rw-r--r-- | systems/xu/config.nix | 1 |
6 files changed, 20 insertions, 20 deletions
diff --git a/configs/exim-smarthost.nix b/configs/exim-smarthost.nix index d983165..80c284a 100644 --- a/configs/exim-smarthost.nix +++ b/configs/exim-smarthost.nix @@ -19,7 +19,7 @@ internet-aliases = with config.krebs.users; [ { from = "bku-eppler@viljetic.de"; to = tv.mail; } { from = "postmaster@viljetic.de"; to = tv.mail; } # RFC 822 - { from = "mirko@viljetic.de"; to = mv-ni.mail; } + { from = "mirko@viljetic.de"; to = mv.mail; } { from = "tomislav@viljetic.de"; to = tv.mail; } { from = "tv@viljetic.de"; to = tv.mail; } { from = "tv@shackspace.de"; to = tv.mail; } diff --git a/configs/initrd/sshd.nix b/configs/initrd/sshd.nix index eff8480..93c4ec9 100644 --- a/configs/initrd/sshd.nix +++ b/configs/initrd/sshd.nix @@ -14,4 +14,10 @@ boot.initrd.secrets = { "/etc/ssh/ssh_host_rsa_key" = <secrets/initrd/ssh_host_rsa_key>; }; + + boot.initrd.systemd.network.enable = config.boot.initrd.systemd.enable; + boot.initrd.systemd.network.networks."10-dhcp" = { + matchConfig.Name = [ "en*" ]; + DHCP = "yes"; + }; } diff --git a/pkgs/simple/dic.nix b/pkgs/simple/dic.nix index 0875c73..5154d4d 100644 --- a/pkgs/simple/dic.nix +++ b/pkgs/simple/dic.nix @@ -4,9 +4,9 @@ stdenv.mkDerivation { name = "dic"; src = pkgs.fetchgit { - url = https://cgit.ni.krebsco.de/dic; - rev = "refs/tags/v1.1.1"; - sha256 = "1gbj967a5hj53fdkkxijqgwnl9hb8kskz0cmpjq7v65ffz3v6vag"; + url = "https://cgit.krebsco.de/dic"; + rev = "refs/tags/v1.1.2"; + hash = "sha256-pqzXgn+0rQ2EWXpslhibctpxHN+nMr/GMJMr3cmTBpw="; }; phases = [ diff --git a/pkgs/simple/garage-k2v-client.nix b/pkgs/simple/garage-k2v-client.nix index 6c517b8..d6a7ca4 100644 --- a/pkgs/simple/garage-k2v-client.nix +++ b/pkgs/simple/garage-k2v-client.nix @@ -2,22 +2,10 @@ pkgs.rustPlatform.buildRustPackage { pname = "garage-k2v-client"; - version = "0.0.4"; - src = pkgs.fetchgit { - url = "https://git.deuxfleurs.fr/Deuxfleurs/garage.git"; - rev = "v1.0.0"; - hash = "sha256-5W5cXylFCrDup+HOOUVPWBJUSphOp8szgtpvRIv82b8="; - }; - - cargoHash = "sha256-Ggau8m0FVqpS1vMbpwBSkwBx6/2SrBw3ZpYhrjqkhNs="; - - # Copied from nixpkgs@e402c3e's ./pkgs/tools/filesystems/garage/default.nix - postPatch = '' - # Starting in 0.9.x series, Garage is using mold in local development - # and this leaks in this packaging, we remove it to use the default linker. - rm .cargo/config.toml || true - ''; + version = pkgs.garage.version; + src = pkgs.garage.src; + cargoHash = pkgs.garage.cargoHash; preBuild = '' cd src/k2v-client @@ -36,5 +24,8 @@ pkgs.rustPlatform.buildRustPackage { # (but would have to do it after the tests instead.) doCheck = false; - buildFeatures = [ "cli" ]; + buildFeatures = [ + "cli" + "serde/std" + ]; } diff --git a/systems/querel/config.nix b/systems/querel/config.nix index 7d56b9f..839e60f 100644 --- a/systems/querel/config.nix +++ b/systems/querel/config.nix @@ -38,9 +38,11 @@ }; "/boot" = { device = "/dev/sda1"; + fsType = "vfat"; }; }; + hardware.cpu.intel.updateMicrocode = true; hardware.enableRedistributableFirmware = true; i18n.defaultLocale = "de_DE.UTF-8"; diff --git a/systems/xu/config.nix b/systems/xu/config.nix index abf433c..803abb2 100644 --- a/systems/xu/config.nix +++ b/systems/xu/config.nix @@ -129,6 +129,7 @@ }; "/boot" = { device = "/dev/sda1"; + fsType = "vfat"; }; }; |