fablab-nea/nix-gscheits
1
0
Fork 0
Code Issues 7 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Fix deprecations

Browse source
This commit is contained in:
Jakob Lechner 2023-07-13 22:56:35 +00:00
parent 3cefc7f9dd
commit 27460d3682
No known key found for this signature in database
GPG key ID: 996082EFB5906C10
5 changed files with 38 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -39,7 +39,7 @@
let let
pkgs = import nixpkgs { pkgs = import nixpkgs {
inherit system; inherit system;
overlays = [ self.overlay ]; overlays = [ self.overlays.default ];
}; };
inherit (pkgs) lib; inherit (pkgs) lib;
in in
@ -55,7 +55,7 @@
}; };
}; };
devShell = pkgs.mkShell { devShells.default = pkgs.mkShell {
name = "fablab-nixos-config"; name = "fablab-nixos-config";
buildInputs = (with pkgs; [ buildInputs = (with pkgs; [
@ -112,7 +112,7 @@
fablab; fablab;
}); });
}) // { }) // {
overlay = import ./pkgs; overlays.default = import ./pkgs;
nixosConfigurations = nixpkgs.lib.mapAttrs nixosConfigurations = nixpkgs.lib.mapAttrs
(hostname: { system (hostname: { system

1
machines/party/hardware-configuration.nix
View file

@ -21,7 +21,6 @@
loader.grub = { loader.grub = {
enable = true; enable = true;
version = 2;
device = "/dev/sda"; device = "/dev/sda";
}; };
}; };

57
machines/raven/services/dnsmasq.nix
View file

@ -20,40 +20,37 @@ in
{ {
services.dnsmasq = { services.dnsmasq = {
enable = true; enable = true;
settings = {
extraConfig = '' server = [
bind-dynamic "142.250.185.78" # dns.as250.net
listen-address=192.168.93.1 "2001:470:20::2" # ordns.he.net
listen-address=192.168.94.1 "74.82.42.42" # ordns.he.net
interface=lo ];
bind-dynamic = true;
expand-hosts listen-address = [
domain=lab.fablab-nea.de "192.168.93.1"
dhcp-range=192.168.93.20,192.168.93.254,4h "192.168.94.1"
dhcp-range=192.168.94.20,192.168.94.254,4h ];
interface = "lo";
dhcp-boot=lpxelinux.0,raven,192.168.94.1 expand-hosts = true;
domain = "lab.fablab-nea.de";
cache-size=10000 dhcp-range = [
dns-forward-max=1000 "192.168.93.20,192.168.93.254,4h"
"192.168.94.20,192.168.94.254,4h"
auth-zone=lab.fablab-nea.de,192.168.94.0/24 ];
auth-server=lab.fablab-nea.de,78.47.224.251 dhcp-boot = "lpxelinux.0,raven,192.168.94.1";
cache-size = 10000;
no-hosts dns-forward-max = 1000;
addn-hosts=${pkgs.writeText "hosts.dnsmasq" '' auth-zone = "lab.fablab-nea.de,192.168.94.0/24";
auth-server = "lab.fablab-nea.de,78.47.224.251";
no-hosts = true;
addn-hosts = "${pkgs.writeText "hosts.dnsmasq" ''
192.168.94.1 raven labsync unifi 192.168.94.1 raven labsync unifi
192.168.94.2 switch 192.168.94.2 switch
192.168.94.3 schneiderscheune-weinturm-ap 192.168.94.3 schneiderscheune-weinturm-ap
192.168.94.4 schneiderscheune-weinturm-sta 192.168.94.4 schneiderscheune-weinturm-sta
''} ''}";
''; };
servers = [
"142.250.185.78" # dns.as250.net
"2001:470:20::2" # ordns.he.net
"74.82.42.42" # ordns.he.net
];
}; };
systemd.services."dnsmasq-events" = { systemd.services."dnsmasq-events" = {

2
modules/base.nix
View file

@ -1,3 +1,3 @@
{ {
boot.cleanTmpDir = true; boot.tmp.cleanOnBoot = true;
} }

12
modules/nix.nix
View file

@ -34,11 +34,13 @@ in
"nixpkgs-overlays=${overlaysCompat}" "nixpkgs-overlays=${overlaysCompat}"
]; ];
# sudoers are trusted nix users settings = {
trustedUsers = [ "@wheel" ]; # sudoers are trusted nix users
trusted-users = [ "@wheel" ];
# On-the-fly optimisation of nix store # On-the-fly optimisation of nix store
autoOptimiseStore = true; auto-optimise-store = true;
};
# less noticeable nix builds # less noticeable nix builds
daemonCPUSchedPolicy = "idle"; daemonCPUSchedPolicy = "idle";
@ -47,7 +49,7 @@ in
}; };
nixpkgs.overlays = with inputs; [ nixpkgs.overlays = with inputs; [
self.overlay self.overlays.default
(final: prev: { (final: prev: {
unstable = import nixpkgs-unstable { unstable = import nixpkgs-unstable {