format nix files

home/apps/mpv.nix

@@ -6,5 +6,6 @@
       "script-opts" = "ytdl_hook-ytdl_path=${pkgs.yt-dlp}/bin/yt-dlp";
     };
   };
-  programs.zsh.shellAliases.listen = "${pkgs.mpv}/bin/mpv \"https://music:$(cat /secrets/music-stream-password)@stream.owo.monster/flac\" --cache=yes --cache-pause-initial=yes --cache-pause-wait=5";
+  programs.zsh.shellAliases.listen = ''
+    ${pkgs.mpv}/bin/mpv "https://music:$(cat /secrets/music-stream-password)@stream.owo.monster/flac" --cache=yes --cache-pause-initial=yes --cache-pause-wait=5'';
 }

home/apps/rofi/default.nix

@@ -1,5 +1,5 @@
 { pkgs, ... }: {
-  home.packages = with pkgs; [rofi]; 
+  home.packages = with pkgs; [ rofi ];
   home.file.".local/share/rofi/themes/rofi-nord.rasi".source = ./rofi-nord.rasi;
   home.file.".config/rofi/config.rasi".source = ./config.rasi;
 }

home/dev/all/deploy-rs.nix

@@ -1,3 +1 @@
-{ pkgs, inputs, ... }: {
+{ pkgs, inputs, ... }: { home.packages = with pkgs.deploy-rs; [ deploy-rs ]; }
-  home.packages = with pkgs.deploy-rs; [ deploy-rs ];
-}

home/gui/environments/gnome/default.nix

@@ -1,6 +1 @@
-{tree, ...}: {
+{ tree, ... }: { imports = with tree; [ home.apps.kitty home.apps.rofi ]; }
-    imports = with tree; [
-        home.apps.kitty
-        home.apps.rofi
-    ];
-}

hosts/lappy/hardware.nix

@@ -1,7 +1,7 @@
 { pkgs, ... }:
 let
-  usb_data = import ./hardware/usb_data.nix {};
+  usb_data = import ./hardware/usb_data.nix { };
-  ssd_data = import ./hardware/ssd_data.nix {};
+  ssd_data = import ./hardware/ssd_data.nix { };
 in {
   boot = {
     loader = {
@@ -26,7 +26,6 @@ in {
     ];
     kernelModules = [ "kvm-intel" ];
 
-
     initrd.postDeviceCommands = pkgs.lib.mkBefore ''
       mkdir -m 0755 -p ${usb_data.mountpoint}
 
@@ -51,7 +50,7 @@ in {
         allowDiscards = true;
       };
     };
-};
+  };
 
   fileSystems = {
     "/" = {

hosts/lappy/hardware/ssd_data.nix

@@ -1,4 +1,4 @@
-{}: rec {
+{ }: rec {
   # Mountpoints
   root_mountpoint = "/";
   boot_mountpoint = "/boot";

hosts/lappy/hardware/usb_data.nix

@@ -1,4 +1,4 @@
-{...}: rec {
+{ ... }: rec {
   # Mountpoints
   mountpoint = "/usb";
 
@@ -17,7 +17,6 @@
   unencrypted_path = "/dev/disk/by-label/${unencrypted_label}";
   mapper_path = "/dev/mapper/${mapper_name}";
 
-
   # Paths to some important files
   lappy_encryption_key_path = "${mountpoint}/encryption-keys/lappy.key";
 

hosts/lappy/vm.nix

@@ -1,13 +1,11 @@
-{lib, inputs, ...}: {
+{ lib, inputs, ... }: {
-    imports = [
+  imports = [ "${inputs.nixpkgs}/nixos/modules/virtualisation/qemu-vm.nix" ];
-        "${inputs.nixpkgs}/nixos/modules/virtualisation/qemu-vm.nix"
-    ];
   users.users.root.password = "password";
   users.users.chaos.password = "password";
   home-manager.users.chaos.home.sessionVariables = {
     WLR_RENDERER_ALLOW_SOFTWARE = "1";
   };
-    services.getty.extraArgs = lib.mkForce [];
+  services.getty.extraArgs = lib.mkForce [ ];
   virtualisation.cores = 4;
-    virtualisation.qemu.options = ["-vga" "qxl"];
+  virtualisation.qemu.options = [ "-vga" "qxl" ];
 }

overlay/alsa-lib/default.nix

@@ -1,9 +1,4 @@
-{ lib
+{ lib, stdenv, fetchurl, alsa-topology-conf, alsa-ucm-conf }:
-, stdenv
-, fetchurl
-, alsa-topology-conf
-, alsa-ucm-conf
-}:
 
 stdenv.mkDerivation rec {
   pname = "alsa-lib";

overlay/default.nix

@@ -12,7 +12,6 @@ final: prev: {
   };
   roc-toolkit-patched = final.callPackage ./roc-toolkit-patched { };
   roc-send-pcm = final.callPackage ./roc-send-pcm { };
-  vivaldi = prev.vivaldi.override {
+  vivaldi =
-    alsa-lib = final.callPackage ./alsa-lib {};
+    prev.vivaldi.override { alsa-lib = final.callPackage ./alsa-lib { }; };
-  };
 }

profiles/sound/pulseaudio/pulse-48000.nix

@@ -1,3 +1 @@
-_: {
+_: { hardware.pulseaudio.daemon.config = { default-sample-rate = "48000"; }; }
-  hardware.pulseaudio.daemon.config = { default-sample-rate = "48000"; };
-}

tree.nix

@@ -16,7 +16,8 @@ let
         in result != null && builtins.length result > 0;
       nixFiles = filterAttrs isNixFile dirContents;
       getPath = entry: "${realPath}/${entry}";
-      getPaths = mapAttrs' (n: v: nameValuePair (removeSuffix ".nix" n) (getPath n));
+      getPaths =
+        mapAttrs' (n: v: nameValuePair (removeSuffix ".nix" n) (getPath n));
       nixFilePaths = getPaths nixFiles;
       dirPaths = getPaths directories;
       recursedPaths = mapAttrs (_: fullPath:
@@ -100,8 +101,7 @@ let
           let
             processFunctor = prev:
               prev // {
-                __functor = self:
+                __functor = self: _: {
-                  _: {
                   imports =
                     attrValues (removeAttrs prev leafConfig.functor.excludes)
                     ++ leafConfig.functor.external;