wizardlink/linuxware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: nixfmt

Browse source
This commit is contained in:
Alexandre Cavalheiro 2024-04-04 15:24:35 -03:00
parent ff0f6d4a23
commit 76a755bcdf
Signed by: wizardlink
GPG key ID: A5767B54367CFBDF
10 changed files with 55 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
hardware-configuration.nix
View file

@ -4,45 +4,38 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules =
[ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/65e4c115-aff0-4c0e-8799-7309a25ecab6";
device = "/dev/disk/by-uuid/65e4c115-aff0-4c0e-8799-7309a25ecab6"; fsType = "ext4";
fsType = "ext4"; };
};
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/2EFE-3A26";
device = "/dev/disk/by-uuid/2EFE-3A26"; fsType = "vfat";
fsType = "vfat"; };
};
fileSystems."/mnt/ssd" = fileSystems."/mnt/ssd" = {
{ device = "/dev/disk/by-uuid/f27f2224-d351-46fd-89f5-991de36166ad";
device = "/dev/disk/by-uuid/f27f2224-d351-46fd-89f5-991de36166ad"; fsType = "ext4";
fsType = "ext4"; };
};
fileSystems."/mnt/internal" = fileSystems."/mnt/internal" = {
{ device = "/dev/disk/by-uuid/b8541c0d-9146-4388-b217-431f196957cc";
device = "/dev/disk/by-uuid/b8541c0d-9146-4388-b217-431f196957cc"; fsType = "ext4";
fsType = "ext4"; };
};
fileSystems."/mnt/media" = fileSystems."/mnt/media" = {
{ device = "/dev/disk/by-uuid/52c17b8b-46c1-4870-b86c-c3b9f4bd4434";
device = "/dev/disk/by-uuid/52c17b8b-46c1-4870-b86c-c3b9f4bd4434"; fsType = "ext4";
fsType = "ext4"; };
};
swapDevices = [ ]; swapDevices = [ ];
@ -55,5 +48,6 @@
# networking.interfaces.enp5s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

13
kernel/zenergy.nix
View file

@ -1,9 +1,7 @@
{ lib, stdenv, fetchFromGitHub, kernel, kmod }: { lib, stdenv, fetchFromGitHub, kernel, kmod }:
let let kernelDirectory = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
kernelDirectory = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; in stdenv.mkDerivation {
in
stdenv.mkDerivation {
pname = "zenergy"; pname = "zenergy";
version = "a3e124477ee8197015481156b90100d49fa3cd84"; version = "a3e124477ee8197015481156b90100d49fa3cd84";
@ -16,9 +14,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" "pic" ]; hardeningDisable = [ "format" "pic" ];
makeFlags = kernel.makeFlags ++ [ makeFlags = kernel.makeFlags ++ [ "KDIR=${kernelDirectory}" ];
"KDIR=${kernelDirectory}"
];
preBuild = '' preBuild = ''
substituteInPlace Makefile --replace-fail "PWD modules_install" "PWD INSTALL_MOD_PATH=$out modules_install" substituteInPlace Makefile --replace-fail "PWD modules_install" "PWD INSTALL_MOD_PATH=$out modules_install"
@ -33,7 +29,8 @@ stdenv.mkDerivation {
outputs = [ "out" ]; outputs = [ "out" ];
meta = with lib; { meta = with lib; {
description = "Based on AMD_ENERGY driver, but with some jiffies added so non-root users can read it safely."; description =
"Based on AMD_ENERGY driver, but with some jiffies added so non-root users can read it safely.";
homepage = "https://github.com/BoukeHaarsma23/zenergy"; homepage = "https://github.com/BoukeHaarsma23/zenergy";
license = licenses.gpl2Only; license = licenses.gpl2Only;
maintainers = with maintainers; [ wizardlink ]; maintainers = with maintainers; [ wizardlink ];

8
programs/fish/default.nix
View file

@ -28,13 +28,9 @@
zoxide init --cmd cd fish | source zoxide init --cmd cd fish | source
''; '';
shellAbbrs = { shellAbbrs = { z = "zoxide"; };
z = "zoxide";
};
shellAliases = { shellAliases = { del = "trash_file"; };
del = "trash_file";
};
functions = { functions = {
fish_prompt.body = '' fish_prompt.body = ''

16
programs/git.nix
View file

@ -47,13 +47,9 @@
gpgsign = true; gpgsign = true;
}; };
tag = { tag = { gpgsign = true; };
gpgsign = true;
};
difftool = { difftool = { prompt = true; };
prompt = true;
};
mergetool = { mergetool = {
# https://www.git-scm.com/docs/git-mergetool#Documentation/git-mergetool.txt---no-prompt # https://www.git-scm.com/docs/git-mergetool#Documentation/git-mergetool.txt---no-prompt
@ -79,13 +75,9 @@
signingkey = "A1D3A2B4E14BD7C0445BB749A5767B54367CFBDF"; signingkey = "A1D3A2B4E14BD7C0445BB749A5767B54367CFBDF";
}; };
pull = { pull = { ff = "only"; };
ff = "only";
};
init = { init = { defaultBranch = "main"; };
defaultBranch = "main";
};
credential = { credential = {
helper = "/usr/libexec/git-core/git-credential-libsecret"; helper = "/usr/libexec/git-core/git-credential-libsecret";

1
programs/mangohud.nix
View file

@ -33,7 +33,6 @@
cpu_stats = true; cpu_stats = true;
cpu_temp = true; cpu_temp = true;
# IO Statistics # IO Statistics
io_read = true; io_read = true;
io_stats = true; io_stats = true;

25
programs/obs-studio.nix
View file

@ -1,17 +1,16 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
programs.obs-studio = programs.obs-studio = {
{ enable = true;
enable = true; plugins = with pkgs.obs-studio-plugins; [
plugins = with pkgs.obs-studio-plugins; [ input-overlay
input-overlay # Currently broken due to onnxruntime failing to build.
# Currently broken due to onnxruntime failing to build. # obs-backgroundremoval
# obs-backgroundremoval obs-pipewire-audio-capture
obs-pipewire-audio-capture obs-vaapi
obs-vaapi obs-vkcapture
obs-vkcapture wlrobs
wlrobs ];
]; };
};
} }

3
services/caddy.nix
View file

@ -1,5 +1,4 @@
{ ... }: { ... }: {
{
services.caddy = { services.caddy = {
enable = true; enable = true;

3
services/jellyfin.nix
View file

@ -10,7 +10,8 @@
jellyfin-web = pkgs.jellyfin-web.overrideAttrs (oldAttrs: { jellyfin-web = pkgs.jellyfin-web.overrideAttrs (oldAttrs: {
patches = [ patches = [
(pkgs.fetchpatch { (pkgs.fetchpatch {
url = "https://github.com/jellyfin/jellyfin-web/compare/v${oldAttrs.version}...ConfusedPolarBear:jellyfin-web:intros.diff"; url =
"https://github.com/jellyfin/jellyfin-web/compare/v${oldAttrs.version}...ConfusedPolarBear:jellyfin-web:intros.diff";
hash = "sha256-qm4N4wMUFc4I53oQJUK1Six0cahVYz3J+FgO2vvSvXM="; hash = "sha256-qm4N4wMUFc4I53oQJUK1Six0cahVYz3J+FgO2vvSvXM=";
}) })
]; ];

12
theming/catppuccin-qt5ct.nix
View file

@ -1,16 +1,10 @@
{ fetchFromGitHub { fetchFromGitHub, flavor ? "Mocha", lib, stdenvNoCC }:
, flavor ? "Mocha"
, lib
, stdenvNoCC
}:
let let
validFlavors = [ "Frappe" "Latte" "Macchiato" "Mocha" ]; validFlavors = [ "Frappe" "Latte" "Macchiato" "Mocha" ];
pname = "catppucin-qt5ct"; pname = "catppucin-qt5ct";
in in lib.checkListOfEnum "${pname}: flavors" validFlavors [ flavor ]
lib.checkListOfEnum "${pname}: flavors" validFlavors [ flavor ]
stdenvNoCC.mkDerivation stdenvNoCC.mkDerivation {
{
inherit pname; inherit pname;
version = "unstable-2023-10-24"; version = "unstable-2023-10-24";

3
theming/sddm.nix
View file

@ -7,8 +7,7 @@ let
url = imgLink; url = imgLink;
sha256 = "sha256-lrQv8VAks86zMzRaF9VEZotp78O9M7/dV8jZNTRb6SY="; sha256 = "sha256-lrQv8VAks86zMzRaF9VEZotp78O9M7/dV8jZNTRb6SY=";
}; };
in in pkgs.stdenv.mkDerivation {
pkgs.stdenv.mkDerivation {
name = "sddm-theme"; name = "sddm-theme";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "MarianArlt"; owner = "MarianArlt";