Fix all deprecation warnings and rename issues

- Reverted mysql back to mysql (mariadb was incorrect)
- Fixed isoImage.isoName -> image.fileName
- Fixed VSCode extensions/userSettings -> profiles.default.*
- Fixed Kitty theme -> themeFile
- Fixed Mako options -> settings structure
- Fixed GPG agent pinentryPackage -> pinentry.package
- Fixed hardware.pulseaudio -> services.pulseaudio
- Fixed hardware.opengl -> hardware.graphics
- Fixed nixos user password conflicts with mkForce
This commit is contained in:
theArctesian
2025-09-29 19:02:15 -07:00
parent 9003518509
commit c79119dfe6
6 changed files with 22 additions and 15 deletions

View File

@@ -275,7 +275,7 @@
programs.vscode = { programs.vscode = {
enable = true; enable = true;
extensions = with pkgs.vscode-extensions; [ profiles.default.extensions = with pkgs.vscode-extensions; [
# Themes # Themes
pkief.material-icon-theme pkief.material-icon-theme
zhuangtongfa.material-theme zhuangtongfa.material-theme
@@ -300,7 +300,7 @@
jnoortheen.nix-ide jnoortheen.nix-ide
]; ];
userSettings = { profiles.default.userSettings = {
"workbench.colorTheme" = lib.mkDefault "One Dark Pro"; "workbench.colorTheme" = lib.mkDefault "One Dark Pro";
"workbench.iconTheme" = "material-icon-theme"; "workbench.iconTheme" = "material-icon-theme";
"editor.fontFamily" = "'JetBrainsMono Nerd Font', monospace"; "editor.fontFamily" = "'JetBrainsMono Nerd Font', monospace";
@@ -364,7 +364,7 @@
programs.gpg.enable = true; programs.gpg.enable = true;
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
pinentryPackage = pkgs.pinentry-gtk2; pinentry.package = pkgs.pinentry-gtk2;
}; };
# XDG directories # XDG directories

16
iso.nix
View File

@@ -29,7 +29,7 @@
# ISO-specific configuration # ISO-specific configuration
isoImage = { isoImage = {
# ISO image settings # ISO image settings
isoName = "omnixy-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso"; image.fileName = "omnixy-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso";
volumeID = "OMNIXY_${lib.toUpper config.system.nixos.label}"; volumeID = "OMNIXY_${lib.toUpper config.system.nixos.label}";
# Boot configuration # Boot configuration
@@ -144,8 +144,14 @@
# Live user configuration is handled by modules/users.nix # Live user configuration is handled by modules/users.nix
# The nixos user will be created automatically since omnixy.user = "nixos" # The nixos user will be created automatically since omnixy.user = "nixos"
# We just need to set an empty password for the live session # Remove any conflicting password settings
users.users.nixos.initialPassword = lib.mkForce ""; # Empty password for live session users.users.nixos = {
initialPassword = lib.mkForce ""; # Empty password for live session
password = lib.mkForce null;
hashedPassword = lib.mkForce null;
hashedPasswordFile = lib.mkForce null;
initialHashedPassword = lib.mkForce null;
};
# Configure the user's environment to auto-start Hyprland # Configure the user's environment to auto-start Hyprland
environment.etc."profile.d/auto-hyprland.sh".text = '' environment.etc."profile.d/auto-hyprland.sh".text = ''
@@ -341,10 +347,10 @@
enable = true; enable = true;
powerOnBoot = true; powerOnBoot = true;
}; };
};
# Pulseaudio (disabled in favor of PipeWire) # Pulseaudio (disabled in favor of PipeWire)
pulseaudio.enable = false; services.pulseaudio.enable = false;
};
# Boot configuration for ISO # Boot configuration for ISO
boot = { boot = {

View File

@@ -224,8 +224,8 @@ in
powerOnBoot = true; powerOnBoot = true;
}; };
# OpenGL support # Graphics support
opengl = { graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-media-driver intel-media-driver

View File

@@ -21,11 +21,11 @@ with lib;
cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# OpenGL/Graphics # Graphics support
opengl = { graphics = {
enable = true; enable = true;
# Common OpenGL packages # Common graphics packages
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-media-driver # Intel VAAPI intel-media-driver # Intel VAAPI
vaapiIntel vaapiIntel

View File

@@ -139,7 +139,7 @@ in
}; };
# VS Code theme # VS Code theme
programs.vscode.userSettings = { programs.vscode.profiles.default.userSettings = {
"workbench.colorTheme" = "Tokyo Night"; "workbench.colorTheme" = "Tokyo Night";
"editor.tokenColorCustomizations" = { "editor.tokenColorCustomizations" = {
"[Tokyo Night]" = { "[Tokyo Night]" = {

1
omarchy Submodule

Submodule omarchy added at f634bfeeb6