diff --git a/hosts/adrastea/default.nix b/hosts/adrastea/default.nix index 2cb9e3d..b1f2133 100644 --- a/hosts/adrastea/default.nix +++ b/hosts/adrastea/default.nix @@ -13,7 +13,6 @@ ../../modules/linux/greeter ../../modules/linux/core ../../modules/linux/desktop-portal - ../../modules/linux/desktop-portal ../../modules/linux/audio-prod ../../modules/linux/wine ../../modules/linux/stylix diff --git a/hosts/demeter/configuration.nix b/hosts/demeter/configuration.nix index f5359d0..fc54c8d 100755 --- a/hosts/demeter/configuration.nix +++ b/hosts/demeter/configuration.nix @@ -28,6 +28,26 @@ }; }; + boot = { + plymouth = { + enable = true; + font = "${config.stylix.fonts.monospace.package}/share/fonts/truetype/NerdFonts/CaskaydiaCoveNerdFontMono-Regular.ttf"; + }; + + # Enable "Silent Boot" + consoleLogLevel = 3; + initrd.verbose = false; + kernelParams = [ + "quiet" + "splash" + "boot.shell_on_fail" + "rd.systemd.show_status=false" + "rd.udev.log_level=3" + "udev.log_priority=3" + ]; + initrd.systemd.enable = true; + }; + boot.lanzaboote = { enable = true; pkiBundle = "/etc/secureboot"; @@ -70,6 +90,8 @@ NetworkManager-wait-online.enable = false; }; + hardware.enableAllFirmware = true; + # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. services.xserver.enable = false; diff --git a/hosts/demeter/default.nix b/hosts/demeter/default.nix index ee6312d..4c6c95f 100644 --- a/hosts/demeter/default.nix +++ b/hosts/demeter/default.nix @@ -1,45 +1,49 @@ { inputs, - system, - osConfig, ... }: { - imports = with inputs; [ - ./configuration.nix - ../../modules/linux/gaming - ../../modules/linux/audio - ../../modules/linux/networking - ../../modules/linux/fonts - ../../modules/linux/greeter - ../../modules/linux/core - ../../modules/linux/hamachi - ../../modules/linux/desktop-portal - ../../modules/linux/audio-prod - ../../modules/linux/wine - ../../overlays - - lanzaboote.nixosModules.lanzaboote - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.backupFileExtension = "backup"; - home-manager.extraSpecialArgs = { - inherit inputs; - inherit osConfig; - }; - home-manager.users.youwen = { - imports = [ - ../../users/youwen/linux/desktop - ../../users/youwen/linux/packages/x86_64 - ../../users/youwen/linux/programs - ../../users/youwen/common/neofetch - ../../users/youwen/common - ../../users/youwen/linux/spicetify - ./home-manager-extras - ]; - }; - } - ]; + imports = + [ + ./configuration.nix + ../../modules/linux/gaming + ../../modules/linux/audio + ../../modules/linux/networking + ../../modules/linux/fonts + ../../modules/linux/greeter + ../../modules/linux/core + ../../modules/linux/hamachi + ../../modules/linux/desktop-portal + ../../modules/linux/audio-prod + ../../modules/linux/stylix + ../../modules/linux/wine + ../../overlays + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.backupFileExtension = "backup"; + home-manager.extraSpecialArgs = { + inherit inputs; + }; + home-manager.users.youwen = { + imports = + [ + ../../users/youwen/linux/laptop + ../../users/youwen/linux/packages/x86_64 + ../../users/youwen/linux/programs + ../../users/youwen/common/fastfetch + ../../users/youwen/common + ../../users/youwen/linux/spicetify + ./home-manager-extras + ] + ++ (with inputs; [ + nix-index-database.hmModules.nix-index + ]); + }; + } + ] + ++ (with inputs; [ + lanzaboote.nixosModules.lanzaboote + home-manager.nixosModules.home-manager + ]); } diff --git a/hosts/demeter/home-manager-extras/default.nix b/hosts/demeter/home-manager-extras/default.nix index 9502e2c..57c880a 100644 --- a/hosts/demeter/home-manager-extras/default.nix +++ b/hosts/demeter/home-manager-extras/default.nix @@ -5,7 +5,8 @@ }: { wayland.windowManager.hyprland.settings.monitor = [ - "DP-1,2560x1440@165,1920x0,auto" + # "DP-1,2560x1440@165,1920x0,auto" + "DP-1,2560x1440@144,1920x0,auto" "HDMI-A-1,1920x1080@60,0x0,1" ]; }