mirror of
https://github.com/youwen5/nixos.git
synced 2024-11-28 11:43:51 -08:00
feat(demeter): migrate new configurations
This commit is contained in:
parent
477994706a
commit
3623b797f3
4 changed files with 67 additions and 41 deletions
|
@ -13,7 +13,6 @@
|
||||||
../../modules/linux/greeter
|
../../modules/linux/greeter
|
||||||
../../modules/linux/core
|
../../modules/linux/core
|
||||||
../../modules/linux/desktop-portal
|
../../modules/linux/desktop-portal
|
||||||
../../modules/linux/desktop-portal
|
|
||||||
../../modules/linux/audio-prod
|
../../modules/linux/audio-prod
|
||||||
../../modules/linux/wine
|
../../modules/linux/wine
|
||||||
../../modules/linux/stylix
|
../../modules/linux/stylix
|
||||||
|
|
|
@ -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 = {
|
boot.lanzaboote = {
|
||||||
enable = true;
|
enable = true;
|
||||||
pkiBundle = "/etc/secureboot";
|
pkiBundle = "/etc/secureboot";
|
||||||
|
@ -70,6 +90,8 @@
|
||||||
NetworkManager-wait-online.enable = false;
|
NetworkManager-wait-online.enable = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
hardware.enableAllFirmware = true;
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
# You can disable this if you're only using the Wayland session.
|
# You can disable this if you're only using the Wayland session.
|
||||||
services.xserver.enable = false;
|
services.xserver.enable = false;
|
||||||
|
|
|
@ -1,45 +1,49 @@
|
||||||
{
|
{
|
||||||
inputs,
|
inputs,
|
||||||
system,
|
|
||||||
osConfig,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = with inputs; [
|
imports =
|
||||||
./configuration.nix
|
[
|
||||||
../../modules/linux/gaming
|
./configuration.nix
|
||||||
../../modules/linux/audio
|
../../modules/linux/gaming
|
||||||
../../modules/linux/networking
|
../../modules/linux/audio
|
||||||
../../modules/linux/fonts
|
../../modules/linux/networking
|
||||||
../../modules/linux/greeter
|
../../modules/linux/fonts
|
||||||
../../modules/linux/core
|
../../modules/linux/greeter
|
||||||
../../modules/linux/hamachi
|
../../modules/linux/core
|
||||||
../../modules/linux/desktop-portal
|
../../modules/linux/hamachi
|
||||||
../../modules/linux/audio-prod
|
../../modules/linux/desktop-portal
|
||||||
../../modules/linux/wine
|
../../modules/linux/audio-prod
|
||||||
../../overlays
|
../../modules/linux/stylix
|
||||||
|
../../modules/linux/wine
|
||||||
lanzaboote.nixosModules.lanzaboote
|
../../overlays
|
||||||
home-manager.nixosModules.home-manager
|
{
|
||||||
{
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.backupFileExtension = "backup";
|
||||||
home-manager.backupFileExtension = "backup";
|
home-manager.extraSpecialArgs = {
|
||||||
home-manager.extraSpecialArgs = {
|
inherit inputs;
|
||||||
inherit inputs;
|
};
|
||||||
inherit osConfig;
|
home-manager.users.youwen = {
|
||||||
};
|
imports =
|
||||||
home-manager.users.youwen = {
|
[
|
||||||
imports = [
|
../../users/youwen/linux/laptop
|
||||||
../../users/youwen/linux/desktop
|
../../users/youwen/linux/packages/x86_64
|
||||||
../../users/youwen/linux/packages/x86_64
|
../../users/youwen/linux/programs
|
||||||
../../users/youwen/linux/programs
|
../../users/youwen/common/fastfetch
|
||||||
../../users/youwen/common/neofetch
|
../../users/youwen/common
|
||||||
../../users/youwen/common
|
../../users/youwen/linux/spicetify
|
||||||
../../users/youwen/linux/spicetify
|
./home-manager-extras
|
||||||
./home-manager-extras
|
]
|
||||||
];
|
++ (with inputs; [
|
||||||
};
|
nix-index-database.hmModules.nix-index
|
||||||
}
|
]);
|
||||||
];
|
};
|
||||||
|
}
|
||||||
|
]
|
||||||
|
++ (with inputs; [
|
||||||
|
lanzaboote.nixosModules.lanzaboote
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
|
]);
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
wayland.windowManager.hyprland.settings.monitor = [
|
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"
|
"HDMI-A-1,1920x1080@60,0x0,1"
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue