This commit is contained in:
Matt Nish-Lapidus 2025-05-08 12:48:06 -04:00
parent e670de3def
commit d79bfc413d
2 changed files with 34 additions and 45 deletions

66
flake.lock generated
View file

@ -30,11 +30,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746411114, "lastModified": 1746695594,
"narHash": "sha256-mLlkVX1kKbAa/Ns5u26wDYw4YW4ziMFM21fhtRmfirU=", "narHash": "sha256-pAAWYs3S+/tY65vemHZdVSXpeIz4JINEJZoPoBjr8JU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "b5d1320ebc2f34dbea4655f95167f55e2130cdb3", "rev": "6bb82b77ce140137177e30df067759931ab60a73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -90,11 +90,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1746465776, "lastModified": 1746721524,
"narHash": "sha256-kq/92ELWHJHHWv2yH2aBFYf14YtiKEYKE1IJ4H2GfYs=", "narHash": "sha256-DZFZfWKobG/Z+F2Hd99csxUT5Oo4TnnZQV2OSYvblVY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "7ed7865b51f7ca63ea51b84545eee5d7c63369e1", "rev": "3cbccdceacacdb60d18f31272451cfc748039ba4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -378,11 +378,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746413188, "lastModified": 1746719124,
"narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", "narHash": "sha256-KOL73WIjO00ds1oIe+5HAcGcpd/TfE6dymmmYbiSlYM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", "rev": "3c59c5132b64e885faca381e713b579dcbddba75",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -540,11 +540,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1746457884, "lastModified": 1746602021,
"narHash": "sha256-ohvAx7CjDLzw1NWj2M1CxVnMArk/bqFmNCN8BM6lSt0=", "narHash": "sha256-t0WFf/bGwxR+28jYix5GxRbfogdzUaGqVZDs9PrxAK4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlock", "repo": "hyprlock",
"rev": "e3bd47e177e39bccfdc85f3a27d8581ef2820557", "rev": "c12cf8e5098bfacd0254b7ceb583329347e5ed1a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -740,11 +740,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746442382, "lastModified": 1746705602,
"narHash": "sha256-lFUHQdnDqnXXzigQn6Kd4aVrDDjg80HAb7DfThQNC/I=", "narHash": "sha256-IJZaGco28YI4IF7gErOyWxZGZ9sLxrbAHBAbV1q3GXw=",
"owner": "viperML", "owner": "viperML",
"repo": "nh", "repo": "nh",
"rev": "4eb1941c2e30f3dabbf24619c7ca7303c448983d", "rev": "d36ff531d2e0503dce3ac8a6ec5915d2dd2a3a54",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -910,11 +910,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1746468201, "lastModified": 1746621361,
"narHash": "sha256-hSOSlrvMJwGr8hX/gc0mnhUf5UIClMDUAadfXlSXzfc=", "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "6aabf68429c0a414221d1790945babfb6a0bd068", "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -968,11 +968,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1746422338, "lastModified": 1746557022,
"narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1016,11 +1016,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1746422338, "lastModified": 1746557022,
"narHash": "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc=", "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5b35d248e9206c1f3baf8de6a7683fee126364aa", "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1064,11 +1064,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1746328495, "lastModified": 1746461020,
"narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1260,11 +1260,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745310711, "lastModified": 1746485181,
"narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", "rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1587,11 +1587,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1746432685, "lastModified": 1746583055,
"narHash": "sha256-hvdf+4gfQ3joNEx/xXhptHQVPkGDHcpBgXipun8bfbQ=", "narHash": "sha256-SZpi+vHxhzM6dQVJtU+B5pEaX0N5yEa4d10DZWnmRaM=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "db609517835cc56e25920fde60a9f9e91a8b0648", "rev": "3ae767327436c59fead00e99126c237a071a6c3e",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -154,7 +154,6 @@
systemd-boot = { systemd-boot = {
enable = true; enable = true;
configurationLimit = 8; configurationLimit = 8;
# consoleMode = "max";
}; };
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };
@ -162,15 +161,13 @@
kernelModules = [ kernelModules = [
"i2c-dev" "i2c-dev"
"ddcci-backlight" "ddcci-backlight"
"amd_3d_vcache" # "amd_3d_vcache"
"uinput" "uinput"
"hid-playstation" "hid-playstation"
"xpadneo"
"amd_pstate=active" "amd_pstate=active"
]; ];
extraModulePackages = with config.boot.kernelPackages; [ extraModulePackages = with config.boot.kernelPackages; [
ddcci-driver ddcci-driver
xpadneo
openrazer openrazer
]; ];
extraModprobeConfig = '' extraModprobeConfig = ''
@ -222,12 +219,7 @@
enable32Bit = true; enable32Bit = true;
extraPackages = [ extraPackages = [
pkgs.rocmPackages.clr.icd pkgs.rocmPackages.clr.icd
# pkgs.amdvlk
]; ];
# extraPackages32 = [
# pkgs.driversi686Linux.amdvlk
# ];
}; };
enableAllFirmware = true; enableAllFirmware = true;
@ -245,8 +237,6 @@
powerManagement.enable = true; powerManagement.enable = true;
powerManagement.finegrained = true; powerManagement.finegrained = true;
# forceFullCompositionPipeline = true;
package = config.boot.kernelPackages.nvidiaPackages.beta; package = config.boot.kernelPackages.nvidiaPackages.beta;
prime = { prime = {
@ -275,7 +265,6 @@
}; };
}; };
}; };
# services.blueman.enable = true;
services.fstrim.enable = true; services.fstrim.enable = true;