m/desk-os
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable squashfs compression and lint nix files

Browse Source
This commit is contained in:
Michael Smith 2024-09-12 20:07:51 +02:00
parent a6fb184590
commit 105b6086e4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/installer/default.nix
View File

@ -10,9 +10,11 @@
with lib; let with lib; let
calamares-desk-os = lowPrio ( calamares-desk-os = lowPrio (
pkgs.calamares-nixos.overrideAttrs (previousAttrs: { pkgs.calamares-nixos.overrideAttrs (previousAttrs: {
patches = previousAttrs.patches ++ [ patches =
../../packages/calamares-nixos/0001-Updates-finished-module-for-desk-os.patch previousAttrs.patches
]; ++ [
../../packages/calamares-nixos/0001-Updates-finished-module-for-desk-os.patch
];
}) })
); );
calamares-extensions-desk-os = pkgs.callPackage ../../packages/calamares-extensions {}; calamares-extensions-desk-os = pkgs.callPackage ../../packages/calamares-extensions {};
@ -31,7 +33,7 @@ in {
system.nixos.distroName = "deskOS 1"; system.nixos.distroName = "deskOS 1";
# FIXME(m): Disable squashfs compression during development # FIXME(m): Disable squashfs compression during development
isoImage.squashfsCompression = null; # isoImage.squashfsCompression = null;
boot = { boot = {
consoleLogLevel = 0; consoleLogLevel = 0;

1
packages/calamares-extensions/config/modules/partition.conf
View File

@ -11,7 +11,6 @@ userSwapChoices:
drawNestedPartitions: false drawNestedPartitions: false
alwaysShowPartitionLabels: true alwaysShowPartitionLabels: true
allowManualPartitioning: false allowManualPartitioning: false
# FIXME(m): Consider accidentally erasing an existing system
# Initial selection on the Choice page # Initial selection on the Choice page
# #
# There are four radio buttons (in principle: erase, replace, alongside, manual), # There are four radio buttons (in principle: erase, replace, alongside, manual),