pederbs/config
pederbs
/
config
2
1
Fork 0
Code Issues Pull Requests Releases Activity

fixup

This commit is contained in:
Peder Bergebakken Sundt 2024-10-19 18:53:16 +02:00
parent 3af0c8a43f
commit 5e8b411730
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base.nix
View File

@ -3,6 +3,7 @@
{ {
imports = let ifExists = p: if builtins.pathExists p then p else {}; in [ imports = let ifExists = p: if builtins.pathExists p then p else {}; in [
./cachix.nix # update with `cachix use --mode nixos -d . FOOBAR` ./cachix.nix # update with `cachix use --mode nixos -d . FOOBAR`
./secrets
./profiles/locale-no.nix ./profiles/locale-no.nix
./profiles/upgrade-diff.nix ./profiles/upgrade-diff.nix
./profiles/lix.nix ./profiles/lix.nix

3
flake.nix
View File

@ -157,7 +157,6 @@
imports = let ifExists = p: if builtins.pathExists p then p else {}; in [ imports = let ifExists = p: if builtins.pathExists p then p else {}; in [
./base.nix ./base.nix
"${self}/hosts/nixos/${hostname}/configuration.nix" "${self}/hosts/nixos/${hostname}/configuration.nix"
./secrets
inputs.home-manager.nixosModule inputs.home-manager.nixosModule
#inputs.nix-index-database.nixosModules.nix-index # TODO: fix? #inputs.nix-index-database.nixosModules.nix-index # TODO: fix?
] ++ modules ++ extra-modules; ] ++ modules ++ extra-modules;
@ -293,7 +292,7 @@
nixosReports = mkHosts (mkReport []); nixosReports = mkHosts (mkReport []);
overlays = { 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: { pbsds = lib.makeScope pkgs.newScope (pbsds: {
# TODO: get faketty to work, ${expect}/bin/unbuffer is bad # TODO: get faketty to work, ${expect}/bin/unbuffer is bad
nixos-rebuild-nom = pkgs.writeScriptBin "nixos-rebuild" '' nixos-rebuild-nom = pkgs.writeScriptBin "nixos-rebuild" ''

4
hosts/nixos/nord/configuration.nix
View File

@ -5,8 +5,8 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.loader.efi.efiSysMountPoint = "/boot/efi"; boot.loader.efi.efiSysMountPoint = "/boot/efi";
services.xserver.displayManager.autoLogin.enable = true; services.displayManager.autoLogin.enable = true;
services.xserver.displayManager.autoLogin.user = "pbsds"; services.displayManager.autoLogin.user = "pbsds";
# tmp: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229 # tmp: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229
systemd.services."getty@tty1".enable = false; systemd.services."getty@tty1".enable = false;
systemd.services."autovt@tty1".enable = false; systemd.services."autovt@tty1".enable = false;

4
hosts/nixos/sopp/configuration.nix
View File

@ -7,8 +7,8 @@
boot.kernel.sysctl."vm.swappiness" = lib.mkDefault 10; # 0-100, commonly 60 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 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.displayManager.autoLogin.enable = true;
services.xserver.displayManager.autoLogin.user = "pbsds"; services.displayManager.autoLogin.user = "pbsds";
# tmp: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229 # tmp: https://github.com/NixOS/nixpkgs/issues/103746#issuecomment-945091229
systemd.services."getty@tty1".enable = false; systemd.services."getty@tty1".enable = false;
systemd.services."autovt@tty1".enable = false; systemd.services."autovt@tty1".enable = false;