format with alejandra

This commit is contained in:
Sean Kovacs 2025-12-24 11:29:41 -05:00
commit 71522c6b5d
Signed by: sckova
GPG key ID: 00F325187C68651A
35 changed files with 578 additions and 589 deletions

View file

@ -1,16 +1,13 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{
config,
lib,
pkgs,
inputs,
...
}:
{
}: {
nix.settings.experimental-features = [
"nix-command"
"flakes"
@ -24,7 +21,7 @@
nix.settings = {
# Increase file descriptor limit for builds
sandbox = "relaxed";
extra-sandbox-paths = [ ];
extra-sandbox-paths = [];
build-users-group = "nixbld";
};
@ -79,7 +76,6 @@
};
boot = {
plymouth = {
enable = true;
};
@ -184,7 +180,7 @@
"networkmanager"
"podman"
];
packages = with pkgs; [ ];
packages = with pkgs; [];
hashedPassword = "$6$bvwRUFaJNMpH8rm3$FGDWFN6tBScJ/2DynAjnlZE8JRfyADN78d6c4GawxpAjyNLNE/AjQzMA09tLRqpKX7WnN5PIUZLAm2bT9/RbG0";
};
@ -227,5 +223,4 @@
# Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "25.05"; # Did you read the comment?
}

View file

@ -6,8 +6,7 @@
catppuccin,
nix-cachyos-kernel,
...
}:
{
}: {
networking.hostName = "alien";
environment.systemPackages = with pkgs; [
@ -16,8 +15,8 @@
];
# enable ddcutil
users.users.sckova.extraGroups = [ "i2c" ];
boot.extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ];
users.users.sckova.extraGroups = ["i2c"];
boot.extraModulePackages = [config.boot.kernelPackages.ddcci-driver];
boot.kernelModules = [
"i2c-dev"
"ddcci_backlight"
@ -35,14 +34,14 @@
catppuccin.accent = "blue";
home-manager.users.sckova = {
imports = [ catppuccin.homeModules.catppuccin ];
imports = [catppuccin.homeModules.catppuccin];
};
boot.loader.systemd-boot.consoleMode = "max";
# boot.kernelPackages = pkgs.linuxPackages;
# let's use the CachyOS kernel instead!
nixpkgs.overlays = [ nix-cachyos-kernel.overlays.default ];
nixpkgs.overlays = [nix-cachyos-kernel.overlays.default];
nix.settings.substituters = [
"https://attic.xuyh0120.win/lantian"
"https://cache.garnix.io"

View file

@ -4,8 +4,7 @@
lib,
catppuccin,
...
}:
{
}: {
networking.hostName = "peach";
boot.binfmt.emulatedSystems = [
@ -13,12 +12,12 @@
"riscv64-linux"
];
boot.kernelParams = [ "apple_dcp.show_notch=1" ];
boot.kernelParams = ["apple_dcp.show_notch=1"];
catppuccin.accent = "peach";
home-manager.users.sckova = {
imports = [ catppuccin.homeModules.catppuccin ];
imports = [catppuccin.homeModules.catppuccin];
};
hardware.asahi = {

View file

@ -4,8 +4,7 @@
lib,
catppuccin,
...
}:
{
}: {
networking.hostName = "vm-aarch64";
boot.binfmt.emulatedSystems = [
@ -16,7 +15,7 @@
catppuccin.accent = "green";
home-manager.users.sckova = {
imports = [ catppuccin.homeModules.catppuccin ];
imports = [catppuccin.homeModules.catppuccin];
};
services.spice-vdagentd.enable = true;

View file

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
programs.bash = {
interactiveShellInit = ''
if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]

View file

@ -4,9 +4,7 @@
pkgs,
lib,
...
}:
let
}: let
tailscaleWaitScript = pkgs.writeShellScript "tailscale-wait-for-ip" ''
echo "Waiting for tailscale0 to get an IP address..."
for i in {1..15}; do
@ -20,8 +18,7 @@ let
echo "Warning: tailscale0 did not get IP address within 15 seconds"
exit 0
'';
in
{
in {
systemd.services.tailscaled = {
serviceConfig = {
ExecStartPost = tailscaleWaitScript;

View file

@ -3,15 +3,13 @@
lib,
pkgs,
...
}:
{
}: {
nixpkgs.overlays = lib.mkIf (config.nixpkgs.hostPlatform.isLinux) [
(final: prev: {
wrapFirefox =
browser: opts:
let
extraPrefs = (opts.extraPrefs or "") + ''
wrapFirefox = browser: opts: let
extraPrefs =
(opts.extraPrefs or "")
+ ''
lockPref("media.gmp-widevinecdm.version", "system-installed");
lockPref("media.gmp-widevinecdm.visible", true);
lockPref("media.gmp-widevinecdm.enabled", true);
@ -19,16 +17,18 @@
lockPref("media.eme.enabled", true);
lockPref("media.eme.encrypted-media-encryption-scheme.enabled", true);
'';
widevineCdmDir = "${final.widevine-cdm}/share/google/chrome/WidevineCdm";
widevineOutDir = "$out/gmp-widevinecdm/system-installed";
in
(prev.wrapFirefox browser (opts // { inherit extraPrefs; })).overrideAttrs (previousAttrs: {
buildCommand = previousAttrs.buildCommand + ''
mkdir -p "${widevineOutDir}"
ln -s "${widevineCdmDir}/_platform_specific/linux_arm64/libwidevinecdm.so" "${widevineOutDir}/libwidevinecdm.so"
ln -s "${widevineCdmDir}/manifest.json" "${widevineOutDir}/manifest.json"
wrapProgram "$oldExe" --set MOZ_GMP_PATH "${widevineOutDir}"
'';
widevineCdmDir = "${final.widevine-cdm}/share/google/chrome/WidevineCdm";
widevineOutDir = "$out/gmp-widevinecdm/system-installed";
in
(prev.wrapFirefox browser (opts // {inherit extraPrefs;})).overrideAttrs (previousAttrs: {
buildCommand =
previousAttrs.buildCommand
+ ''
mkdir -p "${widevineOutDir}"
ln -s "${widevineCdmDir}/_platform_specific/linux_arm64/libwidevinecdm.so" "${widevineOutDir}/libwidevinecdm.so"
ln -s "${widevineCdmDir}/manifest.json" "${widevineOutDir}/manifest.json"
wrapProgram "$oldExe" --set MOZ_GMP_PATH "${widevineOutDir}"
'';
});
})
];