diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index ddc1262..bf3843c 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -168,7 +168,7 @@ in { } ]; }; - systemdIntegration = true; + systemd.enable = true; # fix pinentry-gnome3 extraConfig = '' include /etc/sway/config.d/* diff --git a/nixos/machines/pennyworth/hetznercloud.nix b/nixos/machines/pennyworth/hetznercloud.nix index 4394e97..51cec49 100644 --- a/nixos/machines/pennyworth/hetznercloud.nix +++ b/nixos/machines/pennyworth/hetznercloud.nix @@ -21,7 +21,7 @@ nix.settings.max-jobs = lib.mkDefault 1; #services.nscd.enable = false; - networking.dhcpcd.enable = false; + networking.useDHCP = false; systemd.network.enable = true; systemd.network.networks."40-hetzner" = { DHCP = "ipv4"; diff --git a/nixos/roles/default.nix b/nixos/roles/default.nix index a6d7e04..3a8146c 100644 --- a/nixos/roles/default.nix +++ b/nixos/roles/default.nix @@ -32,7 +32,7 @@ in { openssh.authorizedKeys.keys = config.users.users.yorick.openssh.authorizedKeys.keys; # root password is useful from console, ssh has password logins disabled - passwordFile = config.age.secrets.root-user-pass.path; # TODO: generate own + hashedPasswordFile = config.age.secrets.root-user-pass.path; # TODO: generate own }; services.timesyncd.enable = true; @@ -42,7 +42,7 @@ in { extraGroups = [ "wheel" ]; group = "users"; openssh.authorizedKeys.keys = with (import ../sshkeys.nix); yorick; - passwordFile = config.age.secrets.yorick-user-pass.path; + hashedPasswordFile = config.age.secrets.yorick-user-pass.path; createHome = true; }; diff --git a/nixos/roles/workstation.nix b/nixos/roles/workstation.nix index 5f7726b..f9ac578 100644 --- a/nixos/roles/workstation.nix +++ b/nixos/roles/workstation.nix @@ -73,7 +73,7 @@ fonts = { fontDir.enable = true; enableGhostscriptFonts = true; - fonts = with pkgs; [ + packages = with pkgs; [ corefonts # Micrsoft free fonts inconsolata # monospaced source-code-pro