kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Kopatz
2025-04-18 23:21:08 +02:00
parent 5fc0d22aa5
commit fe318aa2e3
5 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
flake.lock generated
View File

@@ -154,11 +154,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744145203, "lastModified": 1744940522,
"narHash": "sha256-I2oILRiJ6G+BOSjY+0dGrTPe080L3pbKpc+gCV3Nmyk=", "narHash": "sha256-TNoetfICvd29DhxRPpmyKItQBDlqSvKcV+wGNkn14jk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "76c0a6dba345490508f36c1aa3c7ba5b6b460989", "rev": "51d33bbb7f1e74ba5f9d9a77357735149da99081",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -445,11 +445,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744117652, "lastModified": 1744743431,
"narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -466,11 +466,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744663884, "lastModified": 1745001336,
"narHash": "sha256-a6QGaZMDM1miK8VWzAITsEPOdmLk+xTPyJSTjVs3WhI=", "narHash": "sha256-R4HuzrgYtOYBNmB3lfRxcieHEBO4uSfgHNz4MzWkZ5M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d5cdf55bd9f19a3debd55b6cb5d38f7831426265", "rev": "fc09cb7aaadb70d6c4898654ffc872f0d2415df9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -556,11 +556,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1744646317, "lastModified": 1745005494,
"narHash": "sha256-IHiF831GJNv+d+bAJ8Ys5+EaI222/T6QQA9BFcnlqTY=", "narHash": "sha256-hiRVFgpUi0aHjRV3yq7Vvvg6xCjJnVmsSIoOhBMeHtY=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "8b7b169043de2a9d95f8505edb8b6576fac586fd", "rev": "51afc2c2910d6f7c1f2dee9c90f54729d3c3d940",
"revCount": 5997, "revCount": 6007,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@@ -841,11 +841,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1744463964, "lastModified": 1744932701,
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -864,11 +864,11 @@
"nuschtosSearch": "nuschtosSearch" "nuschtosSearch": "nuschtosSearch"
}, },
"locked": { "locked": {
"lastModified": 1744669903, "lastModified": 1744874965,
"narHash": "sha256-gtfLmGx/N+BzIck9sGLIfzETxocYjVKo4gmSeH6zfaY=", "narHash": "sha256-eOnMgAWsjqOhGRoY9smkKlNQcCz9R89mgiKwLrCIYBE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "ee9655637cbf898415e09c399bc504180e246d42", "rev": "500b56f023e0f095ffee2d4f79e58aa09e6b0719",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -886,11 +886,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1744701653, "lastModified": 1745009194,
"narHash": "sha256-t2gPDe1tLXZ9vEkVzGm6kDlJpSjQlw9BwqNdCESvegM=", "narHash": "sha256-Y2CsvI0kxTf4F1HAN3uC7EUgrwtMmLcRGcnAr3Q/S1U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "be95402b424e1dafa2e1e1e8c2781381903ef7b3", "rev": "1a3564fa217bf2bf662f5fbcd5476318bfb12c07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1011,11 +1011,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1744668092, "lastModified": 1744910471,
"narHash": "sha256-XDmpI3ywMkypsHKRF2am6BzZ5OjwpQMulAe8L87Ek8U=", "narHash": "sha256-HItOUMA2whFnPMJuyN2XHq9TZttgrgOAZcoUXsaD4Js=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "38aff11a7097f4da6b95d4c4d2c0438f25a08d52", "rev": "8d5cd725ad591890c0cd804bf68cc842b8afca51",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
modules/graphical/basics.nix
View File

@@ -32,7 +32,6 @@ in {
v4l-utils v4l-utils
logseq # notes logseq # notes
ani-cli ani-cli
mangal-patched
]; ];
}; };
} }

36
modules/hardware/amd-gpu.nix
View File

@@ -3,6 +3,7 @@ let cfg = config.custom.hardware.amd-gpu;
in { in {
options.custom.hardware.amd-gpu = { options.custom.hardware.amd-gpu = {
enable = lib.mkEnableOption "Enables amd gpus"; enable = lib.mkEnableOption "Enables amd gpus";
rocm.enable = lib.mkEnableOption "Enables rocm";
}; };
config = config =
@@ -39,7 +40,7 @@ in {
enable32Bit = true; enable32Bit = true;
package = lib.mkForce mesa-new; package = lib.mkForce mesa-new;
#extraPackages = with pkgs; [ mesa-git.amdvlk ]; #extraPackages = with pkgs; [ mesa-git.amdvlk ];
#extraPackages = with pkgs; [ rocmPackages.clr.icd ]; extraPackages = lib.mkIf cfg.rocm.enable (with pkgs; [ rocmPackages.clr rocmPackages.clr.icd ]);
}; };
hardware.amdgpu.initrd.enable = lib.mkDefault true; hardware.amdgpu.initrd.enable = lib.mkDefault true;
@@ -49,23 +50,28 @@ in {
lact lact
nvtopPackages.amd nvtopPackages.amd
amdgpu_top amdgpu_top
] ++ lib.optionals cfg.rocm.enable [
clinfo
rocmPackages.rocminfo
]; ];
systemd.packages = with pkgs; [ lact ]; systemd.packages = with pkgs; [ lact ];
systemd.services.lactd.wantedBy = [ "multi-user.target" ]; systemd.services.lactd.wantedBy = [ "multi-user.target" ];
#rocm #rocm
#systemd.tmpfiles.rules = systemd.tmpfiles.rules =
# let let
# rocmEnv = pkgs.symlinkJoin { rocmEnv = pkgs.symlinkJoin {
# name = "rocm-combined"; name = "rocm-combined";
# paths = with pkgs.rocmPackages; [ paths = with pkgs.rocmPackages; [
# rocblas rocblas
# hipblas hipblas
# clr clr
# ]; ];
# }; };
# in in
# [ lib.mkIf cfg.rocm.enable
# "L+ /opt/rocm - - - - ${rocmEnv}" [
# ]; "L+ /opt/rocm - - - - ${rocmEnv}"
];
}; };
} }

1
overlays.nix
View File

@@ -25,7 +25,6 @@ in
inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland; inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland;
xdg-desktop-portal-hyprland = xdg-desktop-portal-hyprland =
inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
#rocmPackages = prev.rocm-update.rocmPackages;
}; };
# When applied, the unstable nixpkgs set (declared in the flake inputs) will # When applied, the unstable nixpkgs set (declared in the flake inputs) will

1
systems/pc/configuration.nix
View File

@@ -43,6 +43,7 @@
hardware = { hardware = {
android.enable = true; android.enable = true;
amd-gpu.enable = true; amd-gpu.enable = true;
amd-gpu.rocm.enable = true;
nvidia = { nvidia = {
enable = false; enable = false;
clock = { clock = {