Fix package conflicts and add ISO configuration
- Fixed nvtop package reference (nvtopPackages.full -> nvtop) - Fixed display manager conflicts in ISO config - Fixed SSH settings conflicts with lib.mkForce - Fixed home-manager username conflicts for ISO - Added complete ISO build configuration with Wayland-only setup - Added ISO build documentation and scripts
This commit is contained in:
@@ -10,7 +10,7 @@ let
|
||||
omnixy = import ./helpers.nix { inherit config pkgs lib; };
|
||||
|
||||
# Import our custom Plymouth theme package
|
||||
plymouth-themes = pkgs.callPackage ../packages/plymouth-theme.nix {};
|
||||
plymouth-themes = (pkgs.callPackage ../packages/plymouth-theme.nix {}) or pkgs.plymouth;
|
||||
in
|
||||
{
|
||||
config = mkIf (cfg.enable or true) {
|
||||
|
||||
@@ -67,7 +67,7 @@ in
|
||||
ruff
|
||||
|
||||
# Node.js
|
||||
nodejs_20
|
||||
nodejs
|
||||
nodePackages.npm
|
||||
nodePackages.pnpm
|
||||
nodePackages.yarn
|
||||
@@ -247,7 +247,7 @@ in
|
||||
nix-shell -p python3 python3Packages.pip python3Packages.virtualenv
|
||||
;;
|
||||
node)
|
||||
nix-shell -p nodejs_20 nodePackages.npm nodePackages.pnpm
|
||||
nix-shell -p nodejs nodePackages.npm nodePackages.pnpm
|
||||
;;
|
||||
c|cpp)
|
||||
nix-shell -p gcc cmake gnumake gdb
|
||||
@@ -344,7 +344,7 @@ in
|
||||
let pkgs = nixpkgs.legacyPackages.x86_64-linux;
|
||||
in {
|
||||
devShells.x86_64-linux.default = pkgs.mkShell {
|
||||
packages = with pkgs; [ nodejs_20 nodePackages.pnpm ];
|
||||
packages = with pkgs; [ nodejs nodePackages.pnpm ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -163,7 +163,7 @@ in
|
||||
cargo
|
||||
go
|
||||
python3
|
||||
nodejs_20
|
||||
nodejs
|
||||
deno
|
||||
bun
|
||||
|
||||
@@ -180,7 +180,7 @@ in
|
||||
|
||||
# Database clients
|
||||
postgresql
|
||||
mysql80
|
||||
mysql
|
||||
sqlite
|
||||
redis
|
||||
mongodb-tools
|
||||
@@ -222,7 +222,7 @@ in
|
||||
mpv
|
||||
vlc
|
||||
obs-studio
|
||||
kdePackages.kdenlive
|
||||
kdenlive
|
||||
handbrake
|
||||
ffmpeg-full
|
||||
|
||||
@@ -245,7 +245,7 @@ in
|
||||
# PDF
|
||||
zathura
|
||||
evince
|
||||
kdePackages.okular
|
||||
okular
|
||||
mupdf
|
||||
]
|
||||
|
||||
@@ -264,7 +264,7 @@ in
|
||||
signal-desktop
|
||||
element-desktop
|
||||
zoom-us
|
||||
# teams not available on x86_64-linux
|
||||
teams
|
||||
|
||||
# Office
|
||||
libreoffice
|
||||
@@ -305,7 +305,7 @@ in
|
||||
lutris
|
||||
wine
|
||||
winetricks
|
||||
proton-ge-bin
|
||||
protonup-rs
|
||||
mangohud
|
||||
gamemode
|
||||
discord
|
||||
|
||||
Reference in New Issue
Block a user