bump
This commit is contained in:
Tao Tien
parent
28456e0a79
commit
43583623b9
2 changed files with 119 additions and 120 deletions
42
flake.lock
generated
42
flake.lock
generated
|
|
@ -209,11 +209,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751239699,
|
"lastModified": 1751411489,
|
||||||
"narHash": "sha256-zA1uUdAq3c26fHm26xMWMuF5COhI18EzaH7az/P2OWM=",
|
"narHash": "sha256-x+AJyQ5+4EPDU3NnQ1OPP/KuoG0C6UrbgptEW6PSLQ8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "f6deff178cc4d6049d30785dbfc831e6c6e3a219",
|
"rev": "e96a8a325cf23538a7f58b9335b4c4c0b393bacf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -290,11 +290,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751195306,
|
"lastModified": 1751281697,
|
||||||
"narHash": "sha256-rcrO38Qo9gDDWkEF8ZePf1mPw+MM42DgiK66eDH8i+U=",
|
"narHash": "sha256-abHhTXGEGYhCKOc9vQbqHFG7dxwJ6AudIy1h4MUsjm0=",
|
||||||
"owner": "lilyinstarlight",
|
"owner": "lilyinstarlight",
|
||||||
"repo": "nixos-cosmic",
|
"repo": "nixos-cosmic",
|
||||||
"rev": "0968e4f05337f6f2043b394b452ae0d38a4d5923",
|
"rev": "78b86e37713a1111d9e37c62b242d60be3013bd1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -320,11 +320,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1750837715,
|
"lastModified": 1751393906,
|
||||||
"narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=",
|
"narHash": "sha256-I1x6K61ZcdFlqc07weRBy3erCAB0lVkX10i0c9eXjDI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "98236410ea0fe204d0447149537a924fb71a6d4f",
|
"rev": "f49bb3b4107a0917ee144337bb02d311033ee1ba",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -384,11 +384,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1750877742,
|
"lastModified": 1751048012,
|
||||||
"narHash": "sha256-OrCy70x59VaBHxPZnm6A1wvQSdJvTz4i8Ngx40UeApI=",
|
"narHash": "sha256-MYbotu4UjWpTsq01wglhN5xDRfZYLFtNk7SBY0BcjkU=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "f25c1bd2a6b33a4b1aa7aff56a94e0daab3773f0",
|
"rev": "a684c58d46ebbede49f280b653b9e56100aa3877",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -428,11 +428,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751011381,
|
"lastModified": 1751271578,
|
||||||
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=",
|
"narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7",
|
"rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -464,11 +464,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751165203,
|
"lastModified": 1751251399,
|
||||||
"narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=",
|
"narHash": "sha256-y+viCuy/eKKpkX1K2gDvXIJI/yzvy6zA3HObapz9XZ0=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3",
|
"rev": "b22d5ee8c60ed1291521f2dde48784edd6bf695b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -500,11 +500,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751224527,
|
"lastModified": 1751383329,
|
||||||
"narHash": "sha256-Mihe18dBS7y13//qPn2LVnSMZdZXI1vvnpKpRCmJcfw=",
|
"narHash": "sha256-52dUY8jEkuXEIZINYb+AVsrmw6FxMhBAG3K9J/2qiSo=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "ee2ecf872fe6b7aa14ec90796ba610eeafdd17da",
|
"rev": "f29a4fece3b76c3e4579d67e2cf0cb8037f6a351",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
# let
|
# let
|
||||||
# boostless = pkgs.pipewire.overrideAttrs (old: {
|
# boostless = pkgs.pipewire.overrideAttrs (old: {
|
||||||
|
|
@ -13,110 +13,109 @@
|
||||||
# });
|
# });
|
||||||
# in
|
# in
|
||||||
{
|
{
|
||||||
environment.etc."alsa-card-profile/analog-input-internal-mic.conf".source = ../extras/analog-input-internal-mic.conf;
|
environment.etc."alsa-card-profile/analog-input-internal-mic.conf".source = ../extras/analog-input-internal-mic.conf;
|
||||||
|
|
||||||
hardware.graphics.extraPackages = with pkgs; [
|
hardware.graphics.extraPackages = with pkgs; [
|
||||||
amdvlk
|
amdvlk
|
||||||
];
|
];
|
||||||
hardware.graphics.extraPackages32 = with pkgs; [
|
hardware.graphics.extraPackages32 = with pkgs; [
|
||||||
driversi686Linux.amdvlk
|
driversi686Linux.amdvlk
|
||||||
];
|
];
|
||||||
services.xserver.videoDrivers = [
|
services.xserver.videoDrivers = [
|
||||||
"amdgpu"
|
"amdgpu"
|
||||||
];
|
];
|
||||||
|
|
||||||
# services.pipewire.wireplumber.extraConfig = {
|
# services.pipewire.wireplumber.extraConfig = {
|
||||||
# "wireplumber.settings" = {
|
# "wireplumber.settings" = {
|
||||||
# "device.routes.default-source-volume" = 0.42;
|
# "device.routes.default-source-volume" = 0.42;
|
||||||
# };
|
# };
|
||||||
# };
|
# };
|
||||||
|
|
||||||
services.rsyslogd = {
|
services.rsyslogd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
module(load="imudp")
|
module(load="imudp")
|
||||||
input(type="imudp" port="514")
|
input(type="imudp" port="514")
|
||||||
|
|
||||||
THENAS.* -/var/log/THENAS
|
THENAS.* -/var/log/THENAS
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# nixpkgs.overlays = [
|
|
||||||
# (final: prev: {
|
|
||||||
# libinput = prev.libinput.overrideAttrs (old: {
|
|
||||||
# patches =
|
|
||||||
# (old.patches or [])
|
|
||||||
# ++ [
|
|
||||||
# ../extras/libinput-delay.patch
|
|
||||||
# ];
|
|
||||||
# });
|
|
||||||
# })
|
|
||||||
# ];
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
fw-ectool
|
|
||||||
framework-tool
|
|
||||||
nvtopPackages.amd
|
|
||||||
lact
|
|
||||||
];
|
|
||||||
|
|
||||||
systemd.services.lactd.wantedBy = ["multi-user.target"];
|
|
||||||
|
|
||||||
services.fwupd.enable = true;
|
|
||||||
services.tailscale.useRoutingFeatures = "client";
|
|
||||||
systemd.services."backlight@backlight:amdgpu_bl2".enable = false;
|
|
||||||
|
|
||||||
nix.buildMachines = [
|
|
||||||
{
|
|
||||||
hostName = "nocomputer";
|
|
||||||
systems = ["x86_64-linux" "i686-linux"];
|
|
||||||
supportedFeatures = [
|
|
||||||
"benchmark"
|
|
||||||
"big-parallel"
|
|
||||||
"gccarch-znver4"
|
|
||||||
"kvm"
|
|
||||||
"nixos-test"
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
nix.extraOptions = ''
|
|
||||||
builders-use-substitutes = true
|
|
||||||
'';
|
'';
|
||||||
nix.distributedBuilds = true;
|
};
|
||||||
|
|
||||||
services.udev.extraRules = ''
|
# nixpkgs.overlays = [
|
||||||
# ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness"
|
# (final: prev: {
|
||||||
# ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chmod g+w /sys/class/backlight/%k/brightness"
|
# libinput = prev.libinput.overrideAttrs (old: {
|
||||||
|
# patches =
|
||||||
|
# (old.patches or [])
|
||||||
|
# ++ [
|
||||||
|
# ../extras/libinput-delay.patch
|
||||||
|
# ];
|
||||||
|
# });
|
||||||
|
# })
|
||||||
|
# ];
|
||||||
|
|
||||||
ACTION=="add|change", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0012", ATTR{power/wakeup}="disabled"
|
environment.systemPackages = with pkgs; [
|
||||||
ACTION=="add|change", KERNEL=="i2c", SUBSYSTEM=="i2c", DEVPATH=="/sys/devices/platform/AMDI0010:03/i2c-1/i2c-PIXA3854:00", ATTR{power/wakeup}="disabled"
|
fw-ectool
|
||||||
|
framework-tool
|
||||||
|
nvtopPackages.amd
|
||||||
|
lact
|
||||||
|
];
|
||||||
|
|
||||||
# ACTION=="add", SUBSYSTEM=="acpi", DRIVERS=="button", ATTRS{hid}=="PNP0C0D", ATTR{power/wakeup}="disabled"
|
systemd.services.lactd.wantedBy = ["multi-user.target"];
|
||||||
# ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled"
|
|
||||||
# ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled"
|
|
||||||
'';
|
|
||||||
|
|
||||||
services.fprintd.enable = true;
|
services.fwupd.enable = true;
|
||||||
|
services.tailscale.useRoutingFeatures = "client";
|
||||||
|
systemd.services."backlight@backlight:amdgpu_bl2".enable = false;
|
||||||
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
nix.buildMachines = [
|
||||||
# boot.initrd.availableKernelModules = [
|
{
|
||||||
# "nvme"
|
hostName = "nocomputer";
|
||||||
# "sd_mod"
|
systems = ["x86_64-linux" "i686-linux"];
|
||||||
# "thunderbolt"
|
supportedFeatures = [
|
||||||
# "usb_storage"
|
"benchmark"
|
||||||
# "xhci_pci"
|
"big-parallel"
|
||||||
# "usbhid"
|
"gccarch-znver4"
|
||||||
# "uas"
|
"kvm"
|
||||||
# ];
|
"nixos-test"
|
||||||
boot.kernelParams = [
|
];
|
||||||
"amdgpu.abmlevel=1"
|
}
|
||||||
# "amdgpu.dcdebugmask=0x400"
|
];
|
||||||
# "mem_sleep_default=deep"
|
nix.extraOptions = ''
|
||||||
];
|
builders-use-substitutes = true
|
||||||
# boot.kernelModules = ["kvm-amd"];
|
'';
|
||||||
boot.kernelModules = ["amdgpu"];
|
nix.distributedBuilds = true;
|
||||||
powerManagement.cpuFreqGovernor = "powersave";
|
|
||||||
systemd.sleep.extraConfig = "HibernateDelaySec=360m";
|
|
||||||
|
|
||||||
networking.hostName = "NOlaptop";
|
services.udev.extraRules = ''
|
||||||
|
# ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness"
|
||||||
|
# ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chmod g+w /sys/class/backlight/%k/brightness"
|
||||||
|
|
||||||
|
ACTION=="add|change", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0012", ATTR{power/wakeup}="disabled"
|
||||||
|
ACTION=="add|change", KERNEL=="i2c", SUBSYSTEM=="i2c", DEVPATH=="/sys/devices/platform/AMDI0010:03/i2c-1/i2c-PIXA3854:00", ATTR{power/wakeup}="disabled"
|
||||||
|
|
||||||
|
# ACTION=="add", SUBSYSTEM=="acpi", DRIVERS=="button", ATTRS{hid}=="PNP0C0D", ATTR{power/wakeup}="disabled"
|
||||||
|
# ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled"
|
||||||
|
# ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled"
|
||||||
|
'';
|
||||||
|
|
||||||
|
services.fprintd.enable = true;
|
||||||
|
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
# boot.initrd.availableKernelModules = [
|
||||||
|
# "nvme"
|
||||||
|
# "sd_mod"
|
||||||
|
# "thunderbolt"
|
||||||
|
# "usb_storage"
|
||||||
|
# "xhci_pci"
|
||||||
|
# "usbhid"
|
||||||
|
# "uas"
|
||||||
|
# ];
|
||||||
|
boot.kernelParams = [
|
||||||
|
"amdgpu.abmlevel=1"
|
||||||
|
# "amdgpu.dcdebugmask=0x400"
|
||||||
|
# "mem_sleep_default=deep"
|
||||||
|
];
|
||||||
|
boot.kernelModules = ["amdgpu"];
|
||||||
|
powerManagement.cpuFreqGovernor = "powersave";
|
||||||
|
systemd.sleep.extraConfig = "HibernateDelaySec=360m";
|
||||||
|
|
||||||
|
networking.hostName = "NOlaptop";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue