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

@@ -21,10 +21,10 @@ in
       description = ''
        Serial port for the Z-Wave controller.
 
-        Used for permissions only; must be additionally set in the application
+       Used for permissions only; must be additionally set in the application
-      '';
+     '';
-      example = "/dev/ttyUSB0";
+     example = "/dev/ttyUSB0";
-    };
+   };
   };
   config = mkIf cfg.enable {
     assertions = [
@@ -44,10 +44,7 @@ in
         RuntimeDirectory = "zwave-js-ui";
         StateDirectory = "zwave-js-ui";
         RootDirectory = "/run/zwave-js-ui";
-        BindReadOnlyPaths = [
+        BindReadOnlyPaths = [ "/etc" "/nix/store" ];
-          "/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 = [
+  home.packages = with pkgs; [
-    pkgs.element-desktop
+    element-desktop
-    pkgs.discord
+    discord
-    pkgs.openrgb-with-all-plugins
+    openrgb-with-all-plugins
-    pkgs.keepassxc
+    keepassxc
-    pkgs.heroic
+    heroic
-    pkgs.r2modman
+    r2modman
-    pkgs.mangohud
+    mangohud
-    pkgs.hack-font
+    hack-font
-    pkgs.htop
+    htop
-    pkgs.jellyfin-media-player
+    jellyfin-media-player
-    pkgs.konversation
+    konversation
-    pkgs.nixd
+    nixd
-    pkgs.yakuake
+    yakuake
-    pkgs.mgba
+    mgba
-    pkgs.vlc
+    vlc
-    pkgs-unstable.jetbrains.idea-community
+    jetbrains.idea-community
-    pkgs.dolphin-emu-primehack
+    dolphin-emu-primehack
-    pkgs.steamtinkerlaunch
+    steamtinkerlaunch
-    pkgs.mangohud
+    mangohud
-    pkgs.lutris
+    lutris
-    pkgs.knossosnet
+    knossosnet
-    pkgs.lilypond
+    lilypond
-    pkgs.musescore
+    musescore
-    pkgs.protontricks
+    protontricks
-    pkgs.protonup-qt
+    protonup-qt
-    (pkgs.retroarch.override {
+    (retroarch.override {
-      cores = with pkgs.libretro; [
+      cores = with libretro; [
         beetle-psx-hw
         pcsx2
         mesen