bump and fix lappy gpu
This commit is contained in:
parent
b66cf2c1e7
commit
d2f59d5995
3 changed files with 147 additions and 124 deletions
212
extras/dev.nix
212
extras/dev.nix
|
|
@ -1,118 +1,118 @@
|
||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
# services.globalprotect = {
|
# services.globalprotect = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
# settings = {
|
# settings = {
|
||||||
# "vpn1.usfca.edu" = {
|
# "vpn1.usfca.edu" = {
|
||||||
# openconnect-args = "";
|
# openconnect-args = "";
|
||||||
# };
|
# };
|
||||||
# };
|
# };
|
||||||
# };
|
# };
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
# (llm.withPlugins (ps: with ps; [llm-openrouter]))
|
# (llm.withPlugins (ps: with ps; [llm-openrouter]))
|
||||||
# bash-language-server
|
# bash-language-server
|
||||||
# digital
|
# digital
|
||||||
# etcher
|
# etcher
|
||||||
# fontforge
|
# fontforge
|
||||||
# freecad
|
# freecad
|
||||||
# llm
|
# llm
|
||||||
# lychee # link checker
|
# lychee # link checker
|
||||||
# quickemu
|
# quickemu
|
||||||
# radicle-node
|
# radicle-node
|
||||||
# vulkan-loader
|
# vulkan-loader
|
||||||
# act
|
# act
|
||||||
# aichat
|
# aichat
|
||||||
# aider-chat
|
# aider-chat
|
||||||
# asm-lsp
|
# asm-lsp
|
||||||
b3sum
|
b3sum
|
||||||
devenv
|
devenv
|
||||||
direnv
|
direnv
|
||||||
gh
|
gh
|
||||||
# git-cliff
|
# git-cliff
|
||||||
hyperfine
|
hyperfine
|
||||||
jujutsu
|
jujutsu
|
||||||
just
|
just
|
||||||
lldb
|
lldb
|
||||||
# lua-language-server
|
# lua-language-server
|
||||||
# markdown-oxide # markdown lsp
|
# markdown-oxide # markdown lsp
|
||||||
qFlipper
|
qFlipper
|
||||||
qemu
|
qemu
|
||||||
sd
|
sd
|
||||||
sshfs
|
sshfs
|
||||||
taplo # toml lsp
|
taplo # toml lsp
|
||||||
tio
|
tio
|
||||||
tokei # repo code stats
|
tokei # repo code stats
|
||||||
typos
|
typos
|
||||||
|
|
||||||
# # databases
|
# # databases
|
||||||
# sqlite
|
# sqlite
|
||||||
# sqls
|
# sqls
|
||||||
# sqlx-cli
|
# sqlx-cli
|
||||||
# sea-orm-cli
|
# sea-orm-cli
|
||||||
# rainfrog
|
# rainfrog
|
||||||
|
|
||||||
# # arduino
|
# # arduino
|
||||||
# arduino-language-server
|
# arduino-language-server
|
||||||
# arduino-cli
|
# arduino-cli
|
||||||
# pkgsCross.avr.buildPackages.gcc
|
# pkgsCross.avr.buildPackages.gcc
|
||||||
# avrdude
|
# avrdude
|
||||||
# ravedude
|
# ravedude
|
||||||
|
|
||||||
# c
|
# c
|
||||||
clang
|
clang
|
||||||
clang-tools
|
clang-tools
|
||||||
gcc
|
gcc
|
||||||
gdb
|
gdb
|
||||||
gnumake
|
gnumake
|
||||||
|
|
||||||
# nix
|
# nix
|
||||||
nil
|
nil
|
||||||
alejandra
|
alejandra
|
||||||
|
|
||||||
# python
|
# python
|
||||||
# pypy3
|
# pypy3
|
||||||
python3
|
python3
|
||||||
# (python3.withPackages (ps:
|
# (python3.withPackages (ps:
|
||||||
# with ps; [
|
# with ps; [
|
||||||
# llm
|
# llm
|
||||||
# # llm-openrouter
|
# # llm-openrouter
|
||||||
# ]))
|
# ]))
|
||||||
# python310Packages.python-lsp-server
|
# python310Packages.python-lsp-server
|
||||||
uv
|
uv
|
||||||
ruff
|
ruff
|
||||||
|
|
||||||
# rust
|
# rust
|
||||||
cargo-binstall
|
cargo-binstall
|
||||||
bacon
|
bacon
|
||||||
cargo-expand
|
cargo-expand
|
||||||
cargo-feature
|
cargo-feature
|
||||||
cargo-generate
|
cargo-generate
|
||||||
cargo-watch
|
cargo-watch
|
||||||
elf2uf2-rs
|
elf2uf2-rs
|
||||||
flip-link
|
flip-link
|
||||||
mdbook
|
mdbook
|
||||||
mold-wrapped
|
mold-wrapped
|
||||||
probe-rs
|
probe-rs
|
||||||
rustup
|
rustup
|
||||||
sccache
|
sccache
|
||||||
trunk
|
trunk
|
||||||
wasm-bindgen-cli
|
wasm-bindgen-cli
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware.flipperzero.enable = true;
|
hardware.flipperzero.enable = true;
|
||||||
|
|
||||||
services.udev.extraRules = ''
|
services.udev.extraRules = ''
|
||||||
SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb"
|
SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb"
|
||||||
SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic UART Port", SYMLINK+="ttyBmpTarg"
|
SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic UART Port", SYMLINK+="ttyBmpTarg"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# virtualisation.docker = {
|
# virtualisation.docker = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
# storageDriver = "btrfs";
|
# storageDriver = "btrfs";
|
||||||
# };
|
# };
|
||||||
# virtualisation.docker.rootless = {
|
# virtualisation.docker.rootless = {
|
||||||
# enable = true;
|
# enable = true;
|
||||||
# setSocketVariable = true;
|
# setSocketVariable = true;
|
||||||
# };
|
# };
|
||||||
# users.extraGroups.docker.members = ["tao"];
|
# users.extraGroups.docker.members = ["tao"];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
45
flake.lock
generated
45
flake.lock
generated
|
|
@ -9,6 +9,7 @@
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747575206,
|
"lastModified": 1747575206,
|
||||||
|
"narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "4835b1dc898959d8547a871ef484930675cb47f1",
|
"rev": "4835b1dc898959d8547a871ef484930675cb47f1",
|
||||||
|
|
@ -88,10 +89,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747621015,
|
"lastModified": 1747742835,
|
||||||
|
"narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "cec44d77d9dacf0c91d3d51aff128fefabce06ee",
|
"rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -214,10 +216,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747688838,
|
"lastModified": 1747834438,
|
||||||
|
"narHash": "sha256-AHJt79W8wADzur2htCx1U8FtEk4XjvrHb9/3iDfNedI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "45c2985644b60ab64de2a2d93a4d132ecb87cf66",
|
"rev": "6c2eb1e24cd0e76d88bdd633ef4c50d6286586e0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -271,6 +274,7 @@
|
||||||
"nixos": {
|
"nixos": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1735563628,
|
"lastModified": 1735563628,
|
||||||
|
"narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
|
"rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
|
||||||
|
|
@ -293,10 +297,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747652941,
|
"lastModified": 1747826251,
|
||||||
|
"narHash": "sha256-Fe4AXmnnAKnh/wIe1ao4Pv/8m6WGA1ujwp6VApgos30=",
|
||||||
"owner": "lilyinstarlight",
|
"owner": "lilyinstarlight",
|
||||||
"repo": "nixos-cosmic",
|
"repo": "nixos-cosmic",
|
||||||
"rev": "db6a8028fd470863b3121621944ecdc81ee3ad2a",
|
"rev": "9a67b4a289cd8994080398d40b57cfde8e8cfb0a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -308,6 +313,7 @@
|
||||||
"nixos-facter-modules": {
|
"nixos-facter-modules": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1743671943,
|
"lastModified": 1743671943,
|
||||||
|
"narHash": "sha256-7sYig0+RcrR3sOL5M+2spbpFUHyEP7cnUvCaqFOBjyU=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "nixos-facter-modules",
|
"repo": "nixos-facter-modules",
|
||||||
"rev": "58ad9691670d293a15221d4a78818e0088d2e086",
|
"rev": "58ad9691670d293a15221d4a78818e0088d2e086",
|
||||||
|
|
@ -321,10 +327,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747684167,
|
"lastModified": 1747860404,
|
||||||
|
"narHash": "sha256-9IMwxC4g1AyhOHTx8iTimoKnyzl9Rk2OJZiDtFoF3pA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "e8f38b2c19c0647e39021c3d47172ff5469af8a9",
|
"rev": "2b9118883d29290a1b16ae3a12aedc478dae2546",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -384,11 +391,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747485343,
|
"lastModified": 1747676747,
|
||||||
"narHash": "sha256-YbsZyuRE1tobO9sv0PUwg81QryYo3L1F3R3rF9bcG38=",
|
"narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9b5ac7ad45298d58640540d0323ca217f32a6762",
|
"rev": "72841a4a8761d1aed92ef6169a636872c986c76d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -430,10 +437,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747542820,
|
"lastModified": 1747744144,
|
||||||
|
"narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
|
"rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -465,11 +473,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747622321,
|
"lastModified": 1747795013,
|
||||||
"narHash": "sha256-W0dYIWgsUu6rvOJRtKLhKskkv0VhQhJYGNIq+gGUc8g=",
|
"narHash": "sha256-c7i0xJ+xFhgjO9SWHYu5dF/7lq63RPDvwKAdjc6VCE4=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "bd030fd9983f7fddf87be1c64aa3064c8afa24c4",
|
"rev": "6b1cf12374361859242a562e1933a7930649131a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -501,10 +509,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1747710747,
|
"lastModified": 1747862287,
|
||||||
|
"narHash": "sha256-ys4f+C9kfLMV6uRHqKscok3OCEPduNE2wPko5hMr3to=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "281cda71fda95e9dc5e0eb0887d4e53e894ca037",
|
"rev": "6cf000b8a04cba6592cc96f2127ce7666f14c243",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,16 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
|
hardware.opengl.extraPackages = with pkgs; [
|
||||||
|
amdvlk
|
||||||
|
];
|
||||||
|
hardware.opengl.extraPackages32 = with pkgs; [
|
||||||
|
driversi686Linux.amdvlk
|
||||||
|
];
|
||||||
|
services.xserver.videoDrivers = [
|
||||||
|
"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;
|
||||||
|
|
@ -46,8 +56,11 @@
|
||||||
fw-ectool
|
fw-ectool
|
||||||
framework-tool
|
framework-tool
|
||||||
nvtopPackages.amd
|
nvtopPackages.amd
|
||||||
|
lact
|
||||||
];
|
];
|
||||||
|
|
||||||
|
systemd.services.lactd.wantedBy = ["multi-user.target"];
|
||||||
|
|
||||||
services.fwupd.enable = true;
|
services.fwupd.enable = true;
|
||||||
services.tailscale.useRoutingFeatures = "client";
|
services.tailscale.useRoutingFeatures = "client";
|
||||||
systemd.services."backlight@backlight:amdgpu_bl2".enable = false;
|
systemd.services."backlight@backlight:amdgpu_bl2".enable = false;
|
||||||
|
|
@ -100,6 +113,7 @@
|
||||||
# "mem_sleep_default=deep"
|
# "mem_sleep_default=deep"
|
||||||
];
|
];
|
||||||
# boot.kernelModules = ["kvm-amd"];
|
# boot.kernelModules = ["kvm-amd"];
|
||||||
|
boot.kernelModules = ["amdgpu"];
|
||||||
powerManagement.cpuFreqGovernor = "powersave";
|
powerManagement.cpuFreqGovernor = "powersave";
|
||||||
systemd.sleep.extraConfig = "HibernateDelaySec=360m";
|
systemd.sleep.extraConfig = "HibernateDelaySec=360m";
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue