Compare commits

..

2 Commits

Author SHA1 Message Date
jay
1c5cae9af4 Add nero-umu from unstable. 2025-07-19 18:25:10 -04:00
jay
d027fbfaac Add unstable. 2025-07-19 18:25:00 -04:00
15 changed files with 40 additions and 51 deletions

View File

@@ -16,7 +16,7 @@ Machines
To-Do List To-Do List
[ ] Finish porting features from nixy's previous setup and get them working on lappy: impermanence. [ ] 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. [ ] Figure out how to set up sops-nix with user passwords properly.
[X] Fully setup private git repository for secrets. [X] Fully setup private git repository for secrets.
[X] Integrate private git repository into nixverse setup. [X] Integrate private git repository into nixverse setup.

43
flake.lock generated
View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -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"
'';
}

View File

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

View File

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

Submodule private updated: c91ae3eb5c...7d635d0d2f