diff --git a/hosts/deck/boot.nix b/hosts/deck/boot.nix index 299cbc8..25fd2f7 100644 --- a/hosts/deck/boot.nix +++ b/hosts/deck/boot.nix @@ -5,9 +5,19 @@ in { # Configure bootloader with lanzaboot and secureboot boot = { + consoleLogLevel = 0; + initrd.verbose = false; kernelModules = [ "nct6775" ]; loader = { - systemd-boot.enable = true; + systemd-boot = { + enable = true; + configurationLimit = 5; + extraInstallCommands = '' + ${pkgs.coreutils}/bin/echo "timeout 0 + console-mode 1 + default nixos-*" > /boot/loader/loader.conf + ''; + }; efi = { canTouchEfiVariables = true; @@ -15,14 +25,37 @@ in }; }; + plymouth = { + enable = true; + }; + kernelPackages = kernel; kernelParams = [ "quiet" "amdgpu.ppfeaturemask=0xffffffff" + "splash" + "rd.systemd.show_status=false" + "rd.udev.log_level=3" + "udev.log_priority=3" + "loglevel=0" + "vt.global_cursor_default=0" + "rd.shell=0" + # Disable audit messages + "audit=0" + # Disable CPU mitigations messages + "mitigations=off" ]; - - consoleLogLevel = 3; + bootspec.enable = true; }; + + # Further reduce systemd output + systemd = { + services.systemd-udev-settle.enable = false; + extraConfig = '' + ShowStatus=no + DefaultTimeoutStartSec=15s + ''; + }; } diff --git a/hosts/deck/configuration.nix b/hosts/deck/configuration.nix index 0c8f4b0..c223f3c 100644 --- a/hosts/deck/configuration.nix +++ b/hosts/deck/configuration.nix @@ -46,6 +46,10 @@ enable = true; enableQt5Integration = true; }; + + xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ]; + + services.xserver.enable = true; # Enable CUPS to print documents. services.printing.enable = true; @@ -54,6 +58,14 @@ users.users.deck = { isNormalUser = true; extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + openssh.authorizedKeys.keys = [ + # macBook + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCw9zq8DLGByI5v2gAn95hKNyOsm3g61a2buxu2BBMFysQJgmZPCCLUqRJKhSM5Vm/JOgsAmdpRBRZQoHD+6S844CJHb4v4VIbjkyQgYCuM7Rst2IOZ5QybvsA2/D0nwytZ+HXQqDj2AagUYDbz0gyyIHkDQ5YGBMkvkWz/h1Vci6aoBM7VihEDM4KlWoTVuPeASGM8r5IZ2FS83Djbqo4ov6AYvLMrKB9Z7hmFgH6R3LE0gxOkzbGVXtSuvJyrjvgytoT22UhATjjxSQ9D+YJXXkQoB3lUdg8OoIquUPjMZpl4mR8ffvseWPfcvD1XlD5t+TOHFqKpESO547tlOBYhdpew+NSgAXpamCU6oyV8tDCywLQu2ucxHRn78u6WXzWHkDtffdhzmk6TZaPhWqVHuTGjR4higBgGqUfSaKOMszt+FDRZAr3HtuQ2+zJ8bowK9fW5OqilTtK2HtQqroD9ApegDNbqOz6kGy5IycSXvqPURy/M4lxZxbtBPuemcJs= mattjallen@MacBook-Pro.local" + # desktop windows + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDZ2PYPjZddOzR8OJj16G88KcUhCDLkvrEmpUQP0wKHDUuA27HQQ2ORo66asadwGHY3k1VDZ1ei9l9H++SIIeKOaaUr5yZdktvj4POUNtbd9ZhcS7sZU7BSF+NMDM+h3tImh6z0S7mWvRQOUv3ZM+ZER+5xTWJVG1OOJEpb1drxJk6Qz0wbZKSR7TPNFBLLXlVy7hkNYf07RtDyhCCxNB3hJfa8c+oztnWumwDhDQWLqiUXWIU2QH6iRLGl/WYnujtNvVVaV/Hn3JJkS6MM9dnV3cpoIO0+J7+WfsN9rZ0wXt5yY3GhiGXwmcO5eYVli8lHlLWtK7aYSETyry6CBsLbojzOQO5rSqhpwfF2njAAFAQU0UjLc8PahisIuFKCwHH4iyXXOagiv5K1Mc/0Ak+WhhMPee6vV2p7NTyNpXRvouDbWy5cSRH31WgQ9fK5mIGe5v8nGGqtEhUubUkiOgP+H3UbT2V/nTv/TFKdJcKw+WmizvTrxBmaMjWALlkYl+s= mattl@Jallen-PC" + # desktop nixos + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTBMydhOc6SnOdB5WrEd7X07DrboAtagCUgXiOJjLov matt@matt-nixos" + ]; packages = with pkgs; [ firefox tree @@ -64,6 +76,35 @@ programs = { gamemode.enable = lib.mkDefault true; zsh.enable = true; + nix-ld.enable = true; + nix-ld.libraries = with pkgs; [ + bash + glib + gtk3 + SDL2 + libGL + openal + + xorg.libX11 + xorg.libICE + xorg.libSM + xorg.libXcursor + xorg.libXrandr + xorg.libXi + + alsa-lib + libpulseaudio + + zlib + libgdiplus + icu + + fontconfig + freetype + expat + + vulkan-loader + ]; }; services = { @@ -105,6 +146,7 @@ rsync sbctl smartmontools + steam-run udisks2 unzip usbutils diff --git a/hosts/deck/home.nix b/hosts/deck/home.nix index f01c3f0..8eef0d7 100644 --- a/hosts/deck/home.nix +++ b/hosts/deck/home.nix @@ -1,4 +1,4 @@ -{ ... }: +{ pkgs, ... }: let shellAliases = { ll = "ls -alh"; @@ -58,68 +58,22 @@ in programs.command-not-found.enable = true; - # home.packages = with pkgs; [ - # age - # apple-cursor - # bottles - # chromium - # colloid-icon-theme - # colloid-gtk-theme - # unstable.compose2nix - # coolercontrol.coolercontrol-gui - # deadnix - # discord - # fastfetch - # firefox - # freerdp - # gamescope - # gamescope-wsi - # gnome-tweaks - # gnomeExtensions.appindicator - # gnomeExtensions.arcmenu - # gnomeExtensions.dash-to-dock - # gnomeExtensions.dash-to-panel - # gnomeExtensions.tiling-assistant - # google-chrome - # goverlay - # heroic - # home-manager - # jq - # libreoffice-qt6-fresh - # lm_sensors - # lutris - # mangohud - # morph - # nextcloud-client - # nixfmt-rfc-style - # orca-slicer - # papirus-icon-theme - # piper - # pop-gtk-theme - # prismlauncher - # protonup - # protontricks - # protonvpn-gui - # protonvpn-gui - # python3 - # python312Packages.tox - # python312Packages.setuptools - # python312Packages.pytest - # python312Packages.pytest-cov - # python312Packages.pyaml - # qmk - # remmina - # smile - # sops - # spotify - # ssh-to-pgp - # tree - # unigine-heaven - # vesktop - # via - # virt-manager - # vmware-horizon-client - # vorta - # vscode - # ]; + home.packages = with pkgs; [ + age + chromium + dolphin-emu + fastfetch + heroic + lm_sensors + mgba + nextcloud-client + nixfmt-rfc-style + prismlauncher + protonup + ryujinx-greemdev + sops + vesktop + vmware-horizon-client + vscode + ]; }