flake.nix

@@ -79,7 +79,7 @@
             smolboi = inputs.nixpkgs.lib.nixosSystem {
               specialArgs = {
                 inherit inputs;
-                pkgs-unstable = inputs.nixunstable.legacyPackages.x86_64-linux;
+                pkgs-unstable = inputs.nixunstable;
               };
               modules = [
                 ./systems/smolboi/configuration.nix
@@ -94,9 +94,6 @@
                 inputs.nixos-hardware.nixosModules.gigabyte-b550
                 inputs.home-manager.nixosModules.home-manager
                 {
-                  home-manager.extraSpecialArgs = {
-                    pkgs-unstable = inputs.nixunstable.legacyPackages.x86_64-linux;
-                  };
                   home-manager.useGlobalPkgs = true;
                   home-manager.users.cdombroski = import ./systems/smolboi/home.nix;
                 }
@@ -105,7 +102,7 @@
             zeus = inputs.nixpkgs.lib.nixosSystem {
               specialArgs = {
                 inherit inputs;
-                pkgs-unstable = inputs.nixunstable.legacyPackages.x86_64-linux;
+                pkgs-unstable = inputs.nixunstable;
               };
               modules = [
                 ./systems/zeus/configuration.nix
@@ -120,7 +117,7 @@
             orangepihole = inputs.nixpkgs.lib.nixosSystem {
               specialArgs = {
                 inherit inputs;
-                pkgs-unstable = inputs.nixunstable.legacyPackages.aarch64-linux;
+                pkgs-unstable = inputs.nixunstable;
               };
               modules = [
                 ./systems/orangepihole/configuration.nix

modules/zwave-js-ui.nix

@@ -44,10 +44,7 @@ in
         RuntimeDirectory = "zwave-js-ui";
         StateDirectory = "zwave-js-ui";
         RootDirectory = "/run/zwave-js-ui";
-        BindReadOnlyPaths = [
-          "/etc"
-          "/nix/store"
-        ];
+        BindReadOnlyPaths = [ "/etc" "/nix/store" ];
         BindPaths = [ "/var/lib/zwave-js-ui" ];
         DeviceAllow = [ cfg.serialPort ];
         DynamicUser = true;

systems/smolboi/home.nix

@@ -1,8 +1,7 @@
 {
-  config,
-  lib,
   pkgs,
-  pkgs-unstable,
+  lib,
+  config,
   ...
 }:
 
@@ -23,34 +22,34 @@
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages = [
-    pkgs.element-desktop
-    pkgs.discord
-    pkgs.openrgb-with-all-plugins
-    pkgs.keepassxc
-    pkgs.heroic
-    pkgs.r2modman
-    pkgs.mangohud
-    pkgs.hack-font
-    pkgs.htop
-    pkgs.jellyfin-media-player
-    pkgs.konversation
-    pkgs.nixd
-    pkgs.yakuake
-    pkgs.mgba
-    pkgs.vlc
-    pkgs-unstable.jetbrains.idea-community
-    pkgs.dolphin-emu-primehack
-    pkgs.steamtinkerlaunch
-    pkgs.mangohud
-    pkgs.lutris
-    pkgs.knossosnet
-    pkgs.lilypond
-    pkgs.musescore
-    pkgs.protontricks
-    pkgs.protonup-qt
-    (pkgs.retroarch.override {
-      cores = with pkgs.libretro; [
+  home.packages = with pkgs; [
+    element-desktop
+    discord
+    openrgb-with-all-plugins
+    keepassxc
+    heroic
+    r2modman
+    mangohud
+    hack-font
+    htop
+    jellyfin-media-player
+    konversation
+    nixd
+    yakuake
+    mgba
+    vlc
+    jetbrains.idea-community
+    dolphin-emu-primehack
+    steamtinkerlaunch
+    mangohud
+    lutris
+    knossosnet
+    lilypond
+    musescore
+    protontricks
+    protonup-qt
+    (retroarch.override {
+      cores = with libretro; [
         beetle-psx-hw
         pcsx2
         mesen