code: nixpkgs-fmt to format code

This commit is contained in:
2024-03-11 16:19:31 +01:00
parent 8ecb892244
commit 04ad6ac1cd
46 changed files with 544 additions and 524 deletions
+6 -6
View File
@@ -6,8 +6,8 @@
./games
];
/*
users.users.nixos-rebuild = {
/*
users.users.nixos-rebuild = {
#isSystemUser = true;
isNormalUser = true;
group = "nixos-rebuild";
@@ -15,9 +15,9 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPEDY+H8Hc/RSLE064AAh8IojvqxPd8BE5gec2aOfYMh materus@podkos.pl"
];
home = "/tmp/nixos-rebuild";
};
users.groups.nixos-rebuild = { };
security.sudo.extraRules = [
};
users.groups.nixos-rebuild = { };
security.sudo.extraRules = [
{
users = [ "nixos-rebuild" ];
commands = let path = "/run/current-system/sw/bin/"; in
@@ -56,7 +56,7 @@
}
];
];
*/
}
+7 -7
View File
@@ -10,14 +10,14 @@ in
fonts.fonts = packages.list.fonts ++ packages.list.moreFonts;
fonts.enableDefaultFonts = lib.mkForce true;
fonts.fontconfig.enable = lib.mkForce true;
fonts.fontconfig.cache32Bit = lib.mkForce true;
fonts.fontconfig.defaultFonts.sansSerif = [ "Noto Sans" "DejaVu Sans" "WenQuanYi Zen Hei" "Noto Color Emoji" ];
fonts.fontconfig.defaultFonts.serif = [ "Noto Serif" "DejaVu Serif" "WenQuanYi Zen Hei" "Noto Color Emoji" ];
fonts.fontconfig.defaultFonts.emoji = [ "Noto Color Emoji" "OpenMoji Color" ];
fonts.fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font Mono" "Noto Sans Mono" "WenQuanYi Zen Hei Mono" ];
fonts.fontconfig.enable = lib.mkForce true;
fonts.fontconfig.cache32Bit = lib.mkForce true;
fonts.fontconfig.defaultFonts.sansSerif = [ "Noto Sans" "DejaVu Sans" "WenQuanYi Zen Hei" "Noto Color Emoji" ];
fonts.fontconfig.defaultFonts.serif = [ "Noto Serif" "DejaVu Serif" "WenQuanYi Zen Hei" "Noto Color Emoji" ];
fonts.fontconfig.defaultFonts.emoji = [ "Noto Color Emoji" "OpenMoji Color" ];
fonts.fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font Mono" "Noto Sans Mono" "WenQuanYi Zen Hei Mono" ];
fonts.fontDir.enable = lib.mkForce true;
};
+1 -1
View File
@@ -1,5 +1,5 @@
{ config, pkgs, ... }:
{
{
imports = [
./steam.nix
];
+16 -16
View File
@@ -1,24 +1,24 @@
{ config, pkgs, lib, materusArg, inputs, ... }:
let
optHip = pkgs.stdenv.mkDerivation rec {
pname = "optHip";
version = pkgs.rocmPackages.clr.version;
pname = "optHip";
version = pkgs.rocmPackages.clr.version;
dontFixup = true;
dontBuild = true;
dontPatchELF = true;
dontUnpack = true;
sourceRoot = ".";
dontFixup = true;
dontBuild = true;
dontPatchELF = true;
dontUnpack = true;
sourceRoot = ".";
buildInputs = [
pkgs.rocmPackages.clr
];
buildInputs = [
pkgs.rocmPackages.clr
];
installPhase = ''
mkdir -p $out/opt/rocm
ln -s ${pkgs.rocmPackages.clr} $out/opt/rocm/hip
'';
installPhase = ''
mkdir -p $out/opt/rocm
ln -s ${pkgs.rocmPackages.clr} $out/opt/rocm/hip
'';
};
steamPkg = pkgs.steam.override {
@@ -83,7 +83,7 @@ let
pkgs.fontconfig
pkgs.libxcrypt
pkgs.gnutls
pkgs.samba
pkgs.samba
pkgs.tdb
pkgs.jemalloc
pkgs.gperftools
@@ -109,7 +109,7 @@ in
description = "Package used by steam";
};
options.materus.profile.steam.extraPkgs = lib.mkOption {
default = [];
default = [ ];
description = "Extra packages for steam";
};
+1 -1
View File
@@ -16,7 +16,7 @@ in
"https://cache.nixos.org/"
"https://nixerus.cachix.org/"
];
trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixerus.cachix.org-1:2x7sIG7y1vAoxc8BNRJwsfapZsiX4hIl4aTi9V5ZDdE="];
trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixerus.cachix.org-1:2x7sIG7y1vAoxc8BNRJwsfapZsiX4hIl4aTi9V5ZDdE=" ];
};
};
}