Regenerated
This commit is contained in:
@@ -1,66 +0,0 @@
|
||||
{ pkgs, config, lib, flakeRoot, ... }:
|
||||
|
||||
let
|
||||
grubThemeDir = "/boot/grub/themes/catppuccin-mocha";
|
||||
grubThemeFile = "${grubThemeDir}/theme.txt";
|
||||
plymouthThemeDir = "/usr/share/plymouth/themes/catppuccin";
|
||||
in
|
||||
{
|
||||
boot = {
|
||||
initrd = {
|
||||
verbose = false;
|
||||
kernelModules = [];
|
||||
};
|
||||
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelParams = [ "quiet" "udev.log_level=3" "systemd.show_status=auto" ];
|
||||
consoleLogLevel = 3;
|
||||
|
||||
supportedFilesystems = [ "ntfs" ];
|
||||
|
||||
# Correct GRUB + UEFI configuration
|
||||
loader = {
|
||||
grub = {
|
||||
enable = true;
|
||||
efiSupport = true; # enable UEFI mode
|
||||
devices = [ "nodev" ]; # nodev for UEFI
|
||||
useOSProber = true;
|
||||
theme = grubThemeFile;
|
||||
};
|
||||
|
||||
timeout = 5;
|
||||
};
|
||||
|
||||
# Plymouth splashscreen
|
||||
plymouth = {
|
||||
enable = true;
|
||||
theme = "rings";
|
||||
themePackages = with pkgs; [
|
||||
(adi1090x-plymouth-themes.override {
|
||||
selected_themes = [ "rings" ];
|
||||
})
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
# Activation script: write Catppuccin GRUB theme
|
||||
system.activationScripts.grubTheme = {
|
||||
text = ''
|
||||
mkdir -p ${grubThemeDir}
|
||||
|
||||
cat > ${grubThemeFile} <<EOF
|
||||
# Catppuccin Mocha GRUB theme
|
||||
desktop-color = #1e1e2e
|
||||
normal-color = #cdd6f4
|
||||
selected-item-color = #f5e0dc
|
||||
selected-item-highlight-color = #f5c2e7
|
||||
EOF
|
||||
|
||||
if [ -f "${flakeRoot}/assets/system/theming/boot/background.png" ]; then
|
||||
cp "${flakeRoot}/assets/system/theming/boot/background.png" "${grubThemeDir}/background.png"
|
||||
fi
|
||||
|
||||
echo "GRUB Catppuccin Mocha theme installed."
|
||||
'';
|
||||
};
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
{
|
||||
hostname,
|
||||
pkgs,
|
||||
lib,
|
||||
modulesPath,
|
||||
user,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
# (modulesPath + "/installer/scan/not-detected.nix")
|
||||
#../../hardware/hardware.nix
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"nvme"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"rtsx_usb_sdmmc"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/69433a14-fbaf-401b-af85-cd1bbf02b4e2";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/811D-0676";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0077"
|
||||
"dmask=0077"
|
||||
];
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-uuid/b6c557c2-7682-460b-a5e7-8f6f2f429a3a"; }
|
||||
];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
{ lib, config, pkgs, inputs, ... }:
|
||||
|
||||
let
|
||||
username = config.defaultUser or "henrov";
|
||||
modulesPath = ./generated/modules;
|
||||
|
||||
# Import all modules recursively (DO NOT evaluate them)
|
||||
importedModules = inputs.import-tree modulesPath;
|
||||
|
||||
# Collect Home Manager user attrsets from modules
|
||||
hmUsersList =
|
||||
map (m: m._module.args.hmUsers or {})
|
||||
importedModules.imports;
|
||||
|
||||
in
|
||||
{
|
||||
#################################
|
||||
# Core system config
|
||||
#################################
|
||||
|
||||
networking.hostName = "traveldroid";
|
||||
system.stateVersion = "26.05";
|
||||
|
||||
#################################
|
||||
# Module imports (critical fix)
|
||||
#################################
|
||||
|
||||
imports =
|
||||
[
|
||||
./boot.nix
|
||||
./hardware-configuration.nix
|
||||
]
|
||||
++ importedModules.imports;
|
||||
|
||||
#################################
|
||||
# Home Manager aggregation
|
||||
#################################
|
||||
|
||||
home-manager.users = lib.mkMerge hmUsersList;
|
||||
}
|
||||
Reference in New Issue
Block a user