diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 7ef132d..a4d134b 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -4,45 +4,38 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ (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.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { - device = "/dev/disk/by-uuid/65e4c115-aff0-4c0e-8799-7309a25ecab6"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/65e4c115-aff0-4c0e-8799-7309a25ecab6"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/2EFE-3A26"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/2EFE-3A26"; + fsType = "vfat"; + }; - fileSystems."/mnt/ssd" = - { - device = "/dev/disk/by-uuid/f27f2224-d351-46fd-89f5-991de36166ad"; - fsType = "ext4"; - }; + fileSystems."/mnt/ssd" = { + device = "/dev/disk/by-uuid/f27f2224-d351-46fd-89f5-991de36166ad"; + fsType = "ext4"; + }; - fileSystems."/mnt/internal" = - { - device = "/dev/disk/by-uuid/b8541c0d-9146-4388-b217-431f196957cc"; - fsType = "ext4"; - }; + fileSystems."/mnt/internal" = { + device = "/dev/disk/by-uuid/b8541c0d-9146-4388-b217-431f196957cc"; + fsType = "ext4"; + }; - fileSystems."/mnt/media" = - { - device = "/dev/disk/by-uuid/52c17b8b-46c1-4870-b86c-c3b9f4bd4434"; - fsType = "ext4"; - }; + fileSystems."/mnt/media" = { + device = "/dev/disk/by-uuid/52c17b8b-46c1-4870-b86c-c3b9f4bd4434"; + fsType = "ext4"; + }; swapDevices = [ ]; @@ -55,5 +48,6 @@ # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true; 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; } diff --git a/kernel/zenergy.nix b/kernel/zenergy.nix index d489edd..43865ee 100644 --- a/kernel/zenergy.nix +++ b/kernel/zenergy.nix @@ -1,9 +1,7 @@ { lib, stdenv, fetchFromGitHub, kernel, kmod }: -let - kernelDirectory = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; -in -stdenv.mkDerivation { +let kernelDirectory = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; +in stdenv.mkDerivation { pname = "zenergy"; version = "a3e124477ee8197015481156b90100d49fa3cd84"; @@ -16,9 +14,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" "pic" ]; - makeFlags = kernel.makeFlags ++ [ - "KDIR=${kernelDirectory}" - ]; + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernelDirectory}" ]; preBuild = '' substituteInPlace Makefile --replace-fail "PWD modules_install" "PWD INSTALL_MOD_PATH=$out modules_install" @@ -33,7 +29,8 @@ stdenv.mkDerivation { outputs = [ "out" ]; 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"; license = licenses.gpl2Only; maintainers = with maintainers; [ wizardlink ]; diff --git a/programs/fish/default.nix b/programs/fish/default.nix index 946bf8f..8ca63ad 100644 --- a/programs/fish/default.nix +++ b/programs/fish/default.nix @@ -28,13 +28,9 @@ zoxide init --cmd cd fish | source ''; - shellAbbrs = { - z = "zoxide"; - }; + shellAbbrs = { z = "zoxide"; }; - shellAliases = { - del = "trash_file"; - }; + shellAliases = { del = "trash_file"; }; functions = { fish_prompt.body = '' diff --git a/programs/git.nix b/programs/git.nix index c7d6e42..30f536b 100644 --- a/programs/git.nix +++ b/programs/git.nix @@ -47,13 +47,9 @@ gpgsign = true; }; - tag = { - gpgsign = true; - }; + tag = { gpgsign = true; }; - difftool = { - prompt = true; - }; + difftool = { prompt = true; }; mergetool = { # https://www.git-scm.com/docs/git-mergetool#Documentation/git-mergetool.txt---no-prompt @@ -79,13 +75,9 @@ signingkey = "A1D3A2B4E14BD7C0445BB749A5767B54367CFBDF"; }; - pull = { - ff = "only"; - }; + pull = { ff = "only"; }; - init = { - defaultBranch = "main"; - }; + init = { defaultBranch = "main"; }; credential = { helper = "/usr/libexec/git-core/git-credential-libsecret"; diff --git a/programs/mangohud.nix b/programs/mangohud.nix index ca9c8a1..a98090b 100644 --- a/programs/mangohud.nix +++ b/programs/mangohud.nix @@ -33,7 +33,6 @@ cpu_stats = true; cpu_temp = true; - # IO Statistics io_read = true; io_stats = true; diff --git a/programs/obs-studio.nix b/programs/obs-studio.nix index 4ffc33d..b232ce9 100644 --- a/programs/obs-studio.nix +++ b/programs/obs-studio.nix @@ -1,17 +1,16 @@ { pkgs, ... }: { - programs.obs-studio = - { - enable = true; - plugins = with pkgs.obs-studio-plugins; [ - input-overlay - # Currently broken due to onnxruntime failing to build. - # obs-backgroundremoval - obs-pipewire-audio-capture - obs-vaapi - obs-vkcapture - wlrobs - ]; - }; + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + input-overlay + # Currently broken due to onnxruntime failing to build. + # obs-backgroundremoval + obs-pipewire-audio-capture + obs-vaapi + obs-vkcapture + wlrobs + ]; + }; } diff --git a/services/caddy.nix b/services/caddy.nix index ef9a55c..2d6f8cb 100644 --- a/services/caddy.nix +++ b/services/caddy.nix @@ -1,5 +1,4 @@ -{ ... }: -{ +{ ... }: { services.caddy = { enable = true; diff --git a/services/jellyfin.nix b/services/jellyfin.nix index cb7b5d4..2a694a7 100644 --- a/services/jellyfin.nix +++ b/services/jellyfin.nix @@ -10,7 +10,8 @@ jellyfin-web = pkgs.jellyfin-web.overrideAttrs (oldAttrs: { patches = [ (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="; }) ]; diff --git a/theming/catppuccin-qt5ct.nix b/theming/catppuccin-qt5ct.nix index a207fb2..51dcd1d 100644 --- a/theming/catppuccin-qt5ct.nix +++ b/theming/catppuccin-qt5ct.nix @@ -1,16 +1,10 @@ -{ fetchFromGitHub -, flavor ? "Mocha" -, lib -, stdenvNoCC -}: +{ fetchFromGitHub, flavor ? "Mocha", lib, stdenvNoCC }: let validFlavors = [ "Frappe" "Latte" "Macchiato" "Mocha" ]; pname = "catppucin-qt5ct"; -in -lib.checkListOfEnum "${pname}: flavors" validFlavors [ flavor ] +in lib.checkListOfEnum "${pname}: flavors" validFlavors [ flavor ] - stdenvNoCC.mkDerivation -{ +stdenvNoCC.mkDerivation { inherit pname; version = "unstable-2023-10-24"; diff --git a/theming/sddm.nix b/theming/sddm.nix index ec16288..1c052ed 100644 --- a/theming/sddm.nix +++ b/theming/sddm.nix @@ -7,8 +7,7 @@ let url = imgLink; sha256 = "sha256-lrQv8VAks86zMzRaF9VEZotp78O9M7/dV8jZNTRb6SY="; }; -in -pkgs.stdenv.mkDerivation { +in pkgs.stdenv.mkDerivation { name = "sddm-theme"; src = pkgs.fetchFromGitHub { owner = "MarianArlt";