Add nero-umu from unstable.

README.md

@@ -16,7 +16,7 @@ Machines
 To-Do List
 
  [ ]  Finish porting features from nixy's previous setup and get them working on lappy: impermanence.
- [ ]  Set up declarative Discord setup with nixcord and plugins (broken upstream currently).
+ [ ]  Set up declarative Discord setup with nixcord and plugins.
  [ ]  Figure out how to set up sops-nix with user passwords properly.
  [X]  Fully setup private git repository for secrets.
  [X]  Integrate private git repository into nixverse setup.

flake.lock

@@ -381,11 +381,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752832532,
-        "narHash": "sha256-YvQ6sjTxS+cw+w8fhEL41vAC28q4sB0vT77uhzQ1eOA=",
+        "lastModified": 1752890591,
+        "narHash": "sha256-zvJs+RxrYWoPt4w3+e4H9PGOvsKVgqGDMpmZjZStLVw=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "4e113d7f833a78a54a35dfc5514a89e5e7c78d4f",
+        "rev": "e68cf458c6644ad07a8fc9d762b843e192efe966",
         "type": "github"
       },
       "original": {
@@ -549,13 +549,29 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs-unstable-nixos": {
       "locked": {
-        "lastModified": 1752747119,
-        "narHash": "sha256-2Kp9St3Pbsmu+xMsobLcgzzUxPvZR7alVJWyuk2BAPc=",
+        "lastModified": 1752900028,
+        "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fa0ef8a6bb1651aa26c939aeb51b5f499e86b0ec",
+        "rev": "6b4955211758ba47fac850c040a27f23b9b4008f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1752900028,
+        "narHash": "sha256-dPALCtmik9Wr14MGqVXm+OQcv7vhPBXcWNIOThGnB/Q=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "6b4955211758ba47fac850c040a27f23b9b4008f",
         "type": "github"
       },
       "original": {
@@ -572,11 +588,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1751773294,
-        "narHash": "sha256-7SOb5tc8FARZHUBr8HeCO5016lpiG+S1qugQQdXzF/w=",
+        "lastModified": 1752926550,
+        "narHash": "sha256-ueLoy/+iEWji4gSkUa31Me/Qxes4Iq5fCWieU3WhLwQ=",
         "owner": "hgl",
         "repo": "nixverse",
-        "rev": "084a07f43829857fc760e70212c497d2f40eaa3c",
+        "rev": "9052dd42c579657cd89a8c26316424cd77488ace",
         "type": "github"
       },
       "original": {
@@ -622,6 +638,7 @@
         "nixos-hardware-stable-nixos": "nixos-hardware-stable-nixos",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable-nixos": "nixpkgs-stable-nixos",
+        "nixpkgs-unstable-nixos": "nixpkgs-unstable-nixos",
         "nixverse": "nixverse",
         "sops-nix-stable-nixos": "sops-nix-stable-nixos",
         "stylix-stable-nixos": "stylix-stable-nixos",
@@ -669,11 +686,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1752752240,
-        "narHash": "sha256-qSQ6oIJeIb5MX6LRszgqQYB46FOHemKrvrdzf2u+uxM=",
+        "lastModified": 1752962561,
+        "narHash": "sha256-45R7e+u63LcrSuq/zseu6aWdzwmxr06pR89JRJ0XJdM=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "40f40bda4269f6e5490c25975069dc61aede6d52",
+        "rev": "249f2686ea8a3452ec102f3754f97e238e55af18",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,6 +2,7 @@
   inputs = {
     self.submodules = true;
     nixpkgs-stable-nixos.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs-unstable-nixos.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
     nixverse = {
       url = "github:hgl/nixverse";
       inputs.nixpkgs.follows = "nixpkgs-stable-nixos";

nodes/hosts/common/home/jay/programs/hyprland.nix

@@ -88,8 +88,8 @@
         ",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
         ",XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
         ",XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
-        ",XF86MonBrightnessUp, exec, brightnessctl s 5%+"
-        ",XF86MonBrightnessDown, exec, brightnessctl s 5%-"
+        ",XF86MonBrightnessUp, exec, brightnessctl s 10%+"
+        ",XF86MonBrightnessDown, exec, brightnessctl s 10%-"
       ];
 
       bindl = [

nodes/hosts/common/programs/gaming.nix

@@ -11,6 +11,7 @@
     pkgs.protonup-qt
     pkgs.wineWowPackages.stable
     pkgs.winetricks
+    pkgs-unstable.nero-umu
   ];
 }
 

nodes/hosts/nixwork/configuration.nix

@@ -9,10 +9,8 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       inputs.nixos-hardware.nixosModules.framework-16-7040-amd
-      ./programs/brightnessctl.nix
-      ./programs/fwupd.nix
-      ./programs/powertop.nix
       ./programs/sof-firmware.nix
+      # Not working yet.
       ./services/fprintd.nix
       ./services/touchpad.nix
       ./system/bootloader.nix

nodes/hosts/nixwork/home/jay/programs/hyprland.nix

@@ -1,7 +1,7 @@
 { ... }: { 
   wayland.windowManager.hyprland = {
     settings = {
-      "monitor" = "eDP-1, 2560x1600@60, 0x0, 1";
+      "monitor" = "eDP-1, 2880x1800@120, 0x0, 1";
     };
   };
 }

nodes/hosts/nixwork/programs/brightnessctl.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = [
-    pkgs.brightnessctl
-  ];
-}
-

nodes/hosts/nixwork/programs/fwupd.nix

@@ -1,4 +0,0 @@
-{ ... }: {
-  services.fwupd.enable = true;
-}
-

nodes/hosts/nixwork/programs/powertop.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = [
-    pkgs.powertop
-  ];
-}
-

nodes/hosts/nixwork/services/powerprofiles.nix

@@ -1,3 +0,0 @@
-{ ... }: {
-  services.power-profiles-daemon.enable = true;
-}

nodes/hosts/nixwork/services/udevrules.nix

@@ -1,6 +0,0 @@
-{ ... }: {
-  services.udev.extraRules = ''
-    SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0012", ATTR{power/wakeup}="disabled", ATTR{driver/1-1.1.1.4/power/wakeup}="disabled"
-    SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0014", ATTR{power/wakeup}="disabled", ATTR{driver/1-1.1.1.4/power/wakeup}="disabled"
-  '';
-}

nodes/hosts/nixwork/system/bootloader.nix

@@ -7,7 +7,6 @@
     kernelModules = [ "kvm-intel" ];
     extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];
     extraModprobeConfig = '' options bluetooth disable_ertm=1 '';
-    kernelParams = [ "amdgpu.abmlevel=0" ];
 
     initrd = {
     
@@ -49,7 +48,5 @@
 
     };
   };
-
-  hardware.framework.enableKmod = true;
 }
 

nodes/hosts/nixwork/system/networking.nix

@@ -1,4 +1,4 @@
 { ... }: {
-  networking.hostName = "nixwork"; # Define your hostname.
+  networking.hostName = "lappy"; # Define your hostname.
 }