From 5e8b411730007de8cbf9ad1edbb103edbb8484a0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 19 Oct 2024 18:53:16 +0200 Subject: [PATCH] fixup --- base.nix | 1 + flake.nix | 3 +-- hosts/nixos/nord/configuration.nix | 4 ++-- hosts/nixos/sopp/configuration.nix | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base.nix b/base.nix index ffb909d..a1aa0a7 100644 --- a/base.nix +++ b/base.nix @@ -3,6 +3,7 @@ { imports = let ifExists = p: if builtins.pathExists p then p else {}; in [ ./cachix.nix # update with `cachix use --mode nixos -d . FOOBAR` + ./secrets ./profiles/locale-no.nix ./profiles/upgrade-diff.nix ./profiles/lix.nix diff --git a/flake.nix b/flake.nix index 10acb4e..ede9a61 100644 --- a/flake.nix +++ b/flake.nix @@ -157,7 +157,6 @@ imports = let ifExists = p: if builtins.pathExists p then p else {}; in [ ./base.nix "${self}/hosts/nixos/${hostname}/configuration.nix" - ./secrets inputs.home-manager.nixosModule #inputs.nix-index-database.nixosModules.nix-index # TODO: fix? ] ++ modules ++ extra-modules; @@ -293,7 +292,7 @@ nixosReports = mkHosts (mkReport []); overlays = { - pbsdspkgs = pkgs: prev: let inherit (pkgs) lib; in { + pbsdspkgs = final: prev: let pkgs = final; inherit (pkgs) lib; in { pbsds = lib.makeScope pkgs.newScope (pbsds: { # TODO: get faketty to work, ${expect}/bin/unbuffer is bad nixos-rebuild-nom = pkgs.writeScriptBin "nixos-rebuild" '' diff --git a/hosts/nixos/nord/configuration.nix b/hosts/nixos/nord/configuration.nix index 6c453b9..b8167cf 100644 --- a/hosts/nixos/nord/configuration.nix +++ b/hosts/nixos/nord/configuration.nix @@ -5,8 +5,8 @@ boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.efiSysMountPoint = "/boot/efi"; - services.xserver.displayManager.autoLogin.enable = true; - services.xserver.displayManager.autoLogin.user = "pbsds"; + services.displayManager.autoLogin.enable = true; + services.displayManager.autoLogin.user = "pbsds"; # tmp: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229 systemd.services."getty@tty1".enable = false; systemd.services."autovt@tty1".enable = false; diff --git a/hosts/nixos/sopp/configuration.nix b/hosts/nixos/sopp/configuration.nix index b995621..cee6e9a 100644 --- a/hosts/nixos/sopp/configuration.nix +++ b/hosts/nixos/sopp/configuration.nix @@ -7,8 +7,8 @@ boot.kernel.sysctl."vm.swappiness" = lib.mkDefault 10; # 0-100, commonly 60 boot.kernelModules = [ "xhci_pci" ]; # add driver to stage-1 to make the usb dock not prevent boot - https://github.com/NixOS/nixpkgs/issues/171625#issuecomment-2068283656 - services.xserver.displayManager.autoLogin.enable = true; - services.xserver.displayManager.autoLogin.user = "pbsds"; + services.displayManager.autoLogin.enable = true; + services.displayManager.autoLogin.user = "pbsds"; # tmp: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229 systemd.services."getty@tty1".enable = false; systemd.services."autovt@tty1".enable = false;