william/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

About as far as I got reenabling sound on io

Browse source
This commit is contained in:
William 2024-03-17 11:45:35 -03:00
parent a7f4a85008
commit 8abc1d834c
4 changed files with 59 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.nix
View file

@ -179,17 +179,5 @@
}; };
nixosModules.qbittorrent = import ./modules/qbittorrent.nix; nixosModules.qbittorrent = import ./modules/qbittorrent.nix;
packages.x86_64-linux = {
install-iso = nixos-generators.nixosGenerate {
system = "x86_64-linux";
modules = [{
users.users.nixos.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKcwF1yuWEfYGScNocEbs0AmGxyTIzGc4/IhpU587SJE"
];
}];
format = "install-iso";
};
};
}; };
} }

1
hosts/common/boot.nix
View file

@ -8,7 +8,6 @@
systemd-boot = { systemd-boot = {
enable = true; enable = true;
editor = false; editor = false;
sortKey = "a_nixos";
netbootxyz.enable = true; netbootxyz.enable = true;
}; };
}; };

5
hosts/desktops/common/boot.nix
View file

@ -8,7 +8,10 @@
theme = "colorful_sliced"; theme = "colorful_sliced";
}; };
initrd.systemd.enable = true; initrd.systemd.enable = true;
loader.efi.efiSysMountPoint = "/boot/efi"; loader = {
efi.efiSysMountPoint = "/boot/efi";
systemd-boot.sortKey = "a_nixos";
};
kernelPackages = pkgs.linuxPackages_xanmod_latest; kernelPackages = pkgs.linuxPackages_xanmod_latest;
extraModprobeConfig = '' extraModprobeConfig = ''
options bluetooth disable_ertm=1 options bluetooth disable_ertm=1

81
hosts/desktops/io.nix
View file

@ -27,10 +27,34 @@
}; };
environment = { environment = {
systemPackages = with pkgs; [ alsa-ucm-conf maliit-keyboard ]; systemPackages = with pkgs; [ maliit-keyboard ];
sessionVariables = { sessionVariables.ALSA_CONFIG_UCM2 = let
ALSA_CONFIG_UCM2 = "${pkgs.alsa-ucm-conf}/share/alsa/ucm2"; cml-ucm-conf = pkgs.alsa-ucm-conf.overrideAttrs {
}; wttsrc = pkgs.fetchurl {
url =
"https://github.com/WeirdTreeThing/chromebook-ucm-conf/archive/2b2f3a7c993fd38a24aa81394e29ee530b890658.tar.gz";
hash = "sha256-WeLkxWB174Hwb11xnIxsvRm5NpM528IVEYH4K32pLwg=";
};
unpackPhase = ''
runHook preUnpack
tar xf "$src"
tar xf "$wttsrc"
runHook postUnpack
'';
installPhase = ''
runHook preInstall
mkdir -p $out/share/alsa
cp -r alsa-ucm*/{ucm,ucm2} $out/share/alsa
cp -r chromebook-ucm*/common $out/share/alsa/ucm2/common
cp -r chromebook-ucm*/codecs $out/share/alsa/ucm2/codecs
cp -r chromebook-ucm*/platforms $out/share/alsa/ucm2/platforms
cp -r chromebook-ucm*/sof-rt5682 $out/share/alsa/ucm2/conf.d/sof-rt5682
cp -r chromebook-ucm*/sof-cs42l42 $out/share/alsa/ucm2/conf.d/sof-cs42l42
cp -r chromebook-ucm*/cml/* $out/share/alsa/ucm2/conf.d
runHook postInstall
'';
};
in "${cml-ucm-conf}/share/alsa/ucm2";
}; };
services.keyd = { services.keyd = {
enable = true; enable = true;
@ -79,26 +103,31 @@
}; };
}; };
# nixpkgs.overlays = with pkgs; # nixpkgs.overlays = [
# [ # (self: super: {
# (final: prev: { # alsa-ucm-conf = super.alsa-ucm-conf.override {
# alsa-ucm-conf = prev.alsa-ucm-conf.overrideAttrs (old: { # src2 = pkgs.fetchurl {
# wttsrc = (fetchFromGitHub { # url =
# owner = "WeirdTreeThing"; # "https://github.com/WeirdTreeThing/chromebook-ucm-conf/archive/792a6d5ef0d70ac1f0b4861f3d29da4fe9acaed1.tar.gz";
# repo = "chromebook-ucm-conf"; # hash = "";
# rev = "484f5c581ac45c4ee6cfaf62bdecedfa44353424"; # };
# hash = "sha256-Jal+VfxrPSAPg9ZR+e3QCy4jgSWT4sSShxICKTGJvAI="; # unpackPhase = ''
# }); # runHook preUnpack
# tar xf "$src"
# installPhase = '' # tar xf "$src2"
# runHook preInstall # runHook postUnpack
# mkdir -p $out/share/alsa # '';
# cp -r ucm ucm2 $out/share/alsa # installPhase = ''
# mkdir -p $out/share/alsa/ucm2/conf.d # runHook preInstall
# cp -r $wttsrc/{hdmi,dmic}-common $wttsrc/tgl/* $out/share/alsa/ucm2/conf.d # mkdir -p $out/share/alsa
# runHook postInstall # cp -r alsa-ucm*/ucm alsa-ucm*/ucm2 $out/share/alsa
# ''; # cp -r chromebook-ucm*/hdmi-common \
# }); # chromebook-ucm*/dmic-common \
# }) # chromebook-ucm*/cml/* \
# ]; # $out/share/alsa/ucm2/conf.d
# runHook postInstall
# '';
# };
# })
# ];
} }