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:
6
home.nix
6
home.nix
@@ -275,7 +275,7 @@
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
profiles.default.extensions = with pkgs.vscode-extensions; [
|
||||
# Themes
|
||||
pkief.material-icon-theme
|
||||
zhuangtongfa.material-theme
|
||||
@@ -300,7 +300,7 @@
|
||||
jnoortheen.nix-ide
|
||||
];
|
||||
|
||||
userSettings = {
|
||||
profiles.default.userSettings = {
|
||||
"workbench.colorTheme" = lib.mkDefault "One Dark Pro";
|
||||
"workbench.iconTheme" = "material-icon-theme";
|
||||
"editor.fontFamily" = "'JetBrainsMono Nerd Font', monospace";
|
||||
@@ -364,7 +364,7 @@
|
||||
programs.gpg.enable = true;
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
pinentryPackage = pkgs.pinentry-gtk2;
|
||||
pinentry.package = pkgs.pinentry-gtk2;
|
||||
};
|
||||
|
||||
# XDG directories
|
||||
|
||||
18
iso.nix
18
iso.nix
@@ -29,7 +29,7 @@
|
||||
# ISO-specific configuration
|
||||
isoImage = {
|
||||
# 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}";
|
||||
|
||||
# Boot configuration
|
||||
@@ -144,8 +144,14 @@
|
||||
|
||||
# Live user configuration is handled by modules/users.nix
|
||||
# The nixos user will be created automatically since omnixy.user = "nixos"
|
||||
# We just need to set an empty password for the live session
|
||||
users.users.nixos.initialPassword = lib.mkForce ""; # Empty password for live session
|
||||
# Remove any conflicting password settings
|
||||
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
|
||||
environment.etc."profile.d/auto-hyprland.sh".text = ''
|
||||
@@ -341,11 +347,11 @@
|
||||
enable = true;
|
||||
powerOnBoot = true;
|
||||
};
|
||||
|
||||
# Pulseaudio (disabled in favor of PipeWire)
|
||||
pulseaudio.enable = false;
|
||||
};
|
||||
|
||||
# Pulseaudio (disabled in favor of PipeWire)
|
||||
services.pulseaudio.enable = false;
|
||||
|
||||
# Boot configuration for ISO
|
||||
boot = {
|
||||
# Support for various filesystems
|
||||
|
||||
@@ -224,8 +224,8 @@ in
|
||||
powerOnBoot = true;
|
||||
};
|
||||
|
||||
# OpenGL support
|
||||
opengl = {
|
||||
# Graphics support
|
||||
graphics = {
|
||||
enable = true;
|
||||
extraPackages = with pkgs; [
|
||||
intel-media-driver
|
||||
|
||||
@@ -21,11 +21,11 @@ with lib;
|
||||
cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
# OpenGL/Graphics
|
||||
opengl = {
|
||||
# Graphics support
|
||||
graphics = {
|
||||
enable = true;
|
||||
|
||||
# Common OpenGL packages
|
||||
# Common graphics packages
|
||||
extraPackages = with pkgs; [
|
||||
intel-media-driver # Intel VAAPI
|
||||
vaapiIntel
|
||||
|
||||
@@ -139,7 +139,7 @@ in
|
||||
};
|
||||
|
||||
# VS Code theme
|
||||
programs.vscode.userSettings = {
|
||||
programs.vscode.profiles.default.userSettings = {
|
||||
"workbench.colorTheme" = "Tokyo Night";
|
||||
"editor.tokenColorCustomizations" = {
|
||||
"[Tokyo Night]" = {
|
||||
|
||||
1
omarchy
Submodule
1
omarchy
Submodule
Submodule omarchy added at f634bfeeb6
Reference in New Issue
Block a user