configuration.nix

@@ -1,10 +1,4 @@
-{
+{ config, lib, pkgs, inputs, ... }:
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
 
 with pkgs;
 
@@ -12,11 +6,9 @@ with pkgs;
   # Kernel configuration
   boot = {
     kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+    kernelParams =
+      [ "zfs.zfs_arc_max=8589934592" "zfs.zfs_arc_min=1073741824" ];
     blacklistedKernelModules = [ "btusb" "bluetooth" ];
-    kernelParams = [
-      "zfs.zfs_arc_max=8589934592"
-      "zfs.zfs_arc_min=1073741824"
-    ];
     supportedFilesystems = [ "zfs" ];
     zfs = {
       requestEncryptionCredentials = true;
@@ -46,10 +38,7 @@ with pkgs;
   nix = {
     settings = {
       auto-optimise-store = true;
-      trusted-users = [
+      trusted-users = [ "root" "coolneng" ];
-        "root"
-        "coolneng"
-      ];
     };
     gc = {
       automatic = true;
@@ -87,12 +76,7 @@ with pkgs;
   users.users.coolneng = {
     isNormalUser = true;
     home = "/home/coolneng";
-    extraGroups = [
+    extraGroups = [ "wheel" "video" "audio" "lp" ];
-      "wheel"
-      "video"
-      "audio"
-      "lp"
-    ];
     shell = fish;
   };
 
@@ -113,25 +97,15 @@ with pkgs;
   };
 
   # Use same version of nixpkgs for nix-shell
-  nix.nixPath =
+  nix.nixPath = let path = toString ./.;
-    let
+  in [ "nixpkgs=${inputs.nixpkgs}" "nixos-config=${path}/configuration.nix" ];
-      path = toString ./.;
-    in
-    [
-      "nixpkgs=${inputs.nixpkgs}"
-      "nixos-config=${path}/configuration.nix"
-    ];
 
   # Auto-upgrade the system
   system.autoUpgrade = {
     enable = true;
     dates = "22:30";
     flake = "/home/coolneng/Projects/panacea";
-    flags = [
+    flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ];
-      "--update-input"
-      "nixpkgs"
-      "--commit-lock-file"
-    ];
   };
 
   # Add required dependencies to the auto-upgrade service

modules/audio.nix

@@ -1,25 +1,16 @@
-{
+{ config, lib, pkgs, inputs, ... }:
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
 
 with pkgs;
 
 let
   # HACK Replace youtube-dl with yt-dlp in mopidy-youtube
   mopidy-youtube-yt_dlp = mopidy-youtube.overrideAttrs (old: rec {
-    propagatedBuildInputs = old.propagatedBuildInputs ++ [
+    propagatedBuildInputs = old.propagatedBuildInputs
-      python3.pkgs.yt-dlp
+      ++ [ python3.pkgs.yt-dlp python3.pkgs.ytmusicapi ];
-      python3.pkgs.ytmusicapi
-    ];
   });
   soundcloud_token = builtins.readFile ../secrets/soundcloud_token;
 
-in
+in {
-{
   # Configure pipewire as sound server
   services.pipewire = {
     enable = true;
@@ -30,12 +21,9 @@ in
     pulse.enable = true;
     wireplumber.enable = true;
     # Enable pipewire-pulse's audio via TCP
-    extraConfig.pipewire-pulse.tcp-server = {
+    extraConfig.pipewire-pulse = {
       "pulse.properties" = {
-        "server.address" = [
+        "server.address" = [ "unix:native" "tcp:127.0.0.1:4713" ];
-          "unix:native"
-          "tcp:127.0.0.1:4713"
-        ];
       };
     };
   };

modules/gui.nix

@@ -1,9 +1,4 @@
-{
+{ config, lib, pkgs, ... }:
-  config,
-  lib,
-  pkgs,
-  ...
-}:
 
 with pkgs;
 

modules/software.nix

@@ -1,23 +1,12 @@
-{
+{ config, lib, pkgs, inputs, ... }:
-  config,
-  lib,
-  pkgs,
-  inputs,
-  ...
-}:
 
 with pkgs;
 
 let
-  custom-mpv = (
+  custom-mpv = (mpv-unwrapped.wrapper {
-    mpv-unwrapped.wrapper {
+    mpv = mpv-unwrapped;
-      mpv = mpv-unwrapped;
+    scripts = with mpvScripts; [ sponsorblock-minimal mpv-cheatsheet ];
-      scripts = with mpvScripts; [
+  });
-        sponsorblock-minimal
-        mpv-cheatsheet
-      ];
-    }
-  );
 
   patched-bitwig = bitwig-studio.overrideAttrs (old: rec {
     src = "${inputs.local-bitwig}/bitwig-studio.deb";
@@ -26,8 +15,7 @@ let
     '';
   });
 
-in
+in {
-{
   environment.systemPackages = [
     # Monitoring
     htop
@@ -114,7 +102,7 @@ in
     shellcheck
     shfmt
     ## Nix
-    nixfmt-rfc-style
+    nixfmt
     ## Python
     nodePackages.pyright
     black