materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configurations: update

This commit is contained in:
Mateusz Słodkowicz 2023-10-14 14:40:37 +02:00
parent 08819b8107
commit 609f9252dc
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
6 changed files with 87 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configurations/home/materus/default.nix
View File

@ -7,4 +7,6 @@
programs.git.signing.key = lib.mkDefault "28D140BCA60B4FD1"; programs.git.signing.key = lib.mkDefault "28D140BCA60B4FD1";
programs.git.userEmail = lib.mkDefault "materus@podkos.pl"; programs.git.userEmail = lib.mkDefault "materus@podkos.pl";
programs.git.userName = lib.mkDefault "materus"; programs.git.userName = lib.mkDefault "materus";
programs.home-manager.enable = lib.mkDefault true;
} }

35
configurations/host/materusPC/extraHome.nix
View File

@ -13,13 +13,34 @@
enableTerminalExtra = lib.mkDefault true; enableTerminalExtra = lib.mkDefault true;
enableNixDevel = lib.mkDefault true; enableNixDevel = lib.mkDefault true;
editor.code.fhs.enable = true; editor.code.fhs.enable = true;
editor.code.fhs.packages = (ps: with ps;[
llvmPackages_16.clang editor.code.fhs.packages = (ps: with ps; let llvmpkgs = llvmPackages_16; in[
llvmPackages_16.llvm llvmpkgs.clang
llvmPackages_16.bintools llvmpkgs.llvm
llvmPackages_16.lld llvmpkgs.bintools
llvmPackages_16.lldb llvmpkgs.lld
llvmPackages_16.libllvm llvmpkgs.lldb
llvmpkgs.libllvm
gcc
gdb
cmake
mold
python3
lua
SDL2.dev
SDL2
boost.dev
boost
fpc
jdk
ldc
dmd
dub
]); ]);
}; };

13
configurations/host/materusPC/hardware/default.nix
View File

@ -7,12 +7,19 @@
]; ];
hardware.firmware = with pkgs; [ hardware.firmware = with pkgs; [
materusPkgs.amdgpu-pro-libs.firmware.vcn #materusPkgs.amdgpu-pro-libs.firmware.vcn
#materusPkgs.amdgpu-pro-libs.firmware #materusPkgs.amdgpu-pro-libs.firmware
linux-firmware linux-firmware
alsa-firmware alsa-firmware
sof-firmware sof-firmware
]; ];
environment.variables = {
DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1 = "1";
VK_ICD_FILENAMES = "${pkgs.mesa.drivers}/share/vulkan/icd.d/radeon_icd.x86_64.json:${pkgs.driversi686Linux.mesa.drivers}/share/vulkan/icd.d/radeon_icd.i686.json";
AMD_VULKAN_ICD = "RADV";
RADV_PERFTEST = "gpl,rt,sam";
};
hardware.cpu.amd.updateMicrocode = lib.mkForce true; hardware.cpu.amd.updateMicrocode = lib.mkForce true;
#extra #extra
@ -27,8 +34,8 @@
vaapiVdpau vaapiVdpau
libvdpau-va-gl libvdpau-va-gl
amdvlk amdvlk
rocm-opencl-icd rocmPackages.clr.icd
rocm-opencl-runtime rocmPackages.clr
materusPkgs.amdgpu-pro-libs.vulkan materusPkgs.amdgpu-pro-libs.vulkan
materusPkgs.amdgpu-pro-libs.amf materusPkgs.amdgpu-pro-libs.amf
]; ];

13
configurations/host/materusPC/tmp.nix
View File

@ -17,7 +17,7 @@
services.teamviewer.enable = true; services.teamviewer.enable = true;
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.hip}" "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
]; ];
services.flatpak.enable = true; services.flatpak.enable = true;
@ -48,7 +48,12 @@
services.xserver.displayManager.lightdm.greeters.enso.blur = true; services.xserver.displayManager.lightdm.greeters.enso.blur = true;
*/ */
services.xserver.config = pkgs.lib.mkAfter '' xdg.portal.enable = true;
xdg.portal.wlr.enable = true;
xdg.portal.xdgOpenUsePortal = true;
services.xserver.exportConfiguration = true;
services.xserver.extraConfig = pkgs.lib.mkDefault ''
Section "OutputClass" Section "OutputClass"
Identifier "amd-options" Identifier "amd-options"
Option "TearFree" "True" Option "TearFree" "True"
@ -105,10 +110,6 @@
# ]; # ];
}; };
environment.variables = { environment.variables = {
DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1 = "1";
VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json:/run/opengl-driver-32/share/vulkan/icd.d/radeon_icd.i686.json";
AMD_VULKAN_ICD = "RADV";
RADV_PERFTEST = "gpl,rt,sam";
ALSOFT_DRIVERS = "pulse"; ALSOFT_DRIVERS = "pulse";
}; };
environment.sessionVariables = rec { environment.sessionVariables = rec {

7
configurations/profile/os/games/steam.nix
View File

@ -2,7 +2,7 @@
let let
optHip = pkgs.stdenv.mkDerivation rec { optHip = pkgs.stdenv.mkDerivation rec {
pname = "optHip"; pname = "optHip";
version = pkgs.hip.version; version = pkgs.rocmPackages.clr.version;
dontFixup = true; dontFixup = true;
@ -12,12 +12,12 @@ let
sourceRoot = "."; sourceRoot = ".";
buildInputs = [ buildInputs = [
pkgs.hip pkgs.rocmPackages.clr
]; ];
installPhase = '' installPhase = ''
mkdir -p $out/opt/rocm mkdir -p $out/opt/rocm
ln -s ${pkgs.hip} $out/opt/rocm/hip ln -s ${pkgs.rocmPackages.clr} $out/opt/rocm/hip
''; '';
}; };
@ -26,6 +26,7 @@ let
#config.materus.profile.packages.firefox #config.materus.profile.packages.firefox
optHip #for blender optHip #for blender
pkgs.libdecor
pkgs.obs-studio-plugins.obs-vkcapture pkgs.obs-studio-plugins.obs-vkcapture
pkgs.steamcmd pkgs.steamcmd
pkgs.nss_latest pkgs.nss_latest

142
flake.lock
View File

@ -35,36 +35,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1696760954, "lastModified": 1697280510,
"narHash": "sha256-XsbxElB7PjHUC15MKzuRMInQyIPSOohIUvrWs7d+knc=", "narHash": "sha256-fQxxX/lrYnBXTt70qhxOKKRmUfoYLyFt6Sa/k1wVQ80=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "c7ac54dd8409046d50d17c11d4fa29a782b37804", "rev": "fa2c99af244d425c43ef768cec348c995a98a1a5",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"repo": "emacs-overlay",
"type": "github"
}
},
"emacs-overlay_2": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"configInputs",
"nixerus",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1696730756,
"narHash": "sha256-u+UbAnVCD3RnMyXgvo5k0fDmyRNAixDh07lrOSdtZgs=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "3f942773192735d987ab517ceaae2a0479d4e601",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -92,24 +67,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -118,11 +75,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1696737557, "lastModified": 1696940889,
"narHash": "sha256-YD/pjDjj/BNmisEvRdM/vspkCU3xyyeGVAUWhvVSi5Y=", "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d", "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -137,11 +94,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1696737557, "lastModified": 1696940889,
"narHash": "sha256-YD/pjDjj/BNmisEvRdM/vspkCU3xyyeGVAUWhvVSi5Y=", "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d", "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -151,7 +108,6 @@
}, },
"nixerus": { "nixerus": {
"inputs": { "inputs": {
"emacs-overlay": "emacs-overlay_2",
"home-manager": [ "home-manager": [
"configInputs", "configInputs",
"home-manager" "home-manager"
@ -163,12 +119,13 @@
"nur": "nur" "nur": "nur"
}, },
"locked": { "locked": {
"lastModified": 1696757058, "lastModified": 1697242196,
"narHash": "sha256-9ikKmi8n+ml13hJyVIFpFXRSc12B3kCL+kubc7z5P8Y=", "narHash": "sha256-BsRtI8kB0l7uMYqIiGKxQMqiPjrLvA86JEcO7DXwJCw=",
"owner": "materusPL", "ref": "refs/heads/master",
"repo": "Nixerus", "rev": "a1bf3d068ab522d3adcf291e1d67abf2bbb35ce5",
"rev": "29a0bd613c216d0c657e5a2f38bdba7fbd4f7ab7", "revCount": 119,
"type": "github" "type": "git",
"url": "file:///materus/config/Nixerus"
}, },
"original": { "original": {
"owner": "materusPL", "owner": "materusPL",
@ -195,27 +152,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1696697597, "lastModified": 1696983906,
"narHash": "sha256-q26Qv4DQ+h6IeozF2o1secyQG0jt2VUT3V0K58jr3pg=", "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5a237aecb57296f67276ac9ab296a41c23981f56", "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1696374741,
"narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8a4c17493e5c39769f79117937c79e1c88de6729",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,11 +168,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1696604326, "lastModified": 1697059129,
"narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=", "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64", "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,27 +184,25 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1696749357, "lastModified": 1696758426,
"narHash": "sha256-DOinkqGrYPGqE0cQ6iQfN8Rwhdj43OGmn4U0402PSKk=", "narHash": "sha256-8ebGev/aEoy9NUhexXLg1gFtcdgT+pmYXoc1rg4U5TM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "f77ed4768c0b2763cae81a30a1905145178c105e", "rev": "2a1a76ccc91abc61c09521931253f9fe9e012a85",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "id": "nur",
"ref": "master", "type": "indirect"
"repo": "NUR",
"type": "github"
} }
}, },
"nur_2": { "nur_2": {
"locked": { "locked": {
"lastModified": 1696772745, "lastModified": 1697284020,
"narHash": "sha256-9cXNUJwpHLOTPqlpUF33oFJHzrscb9oi/YKS2QiiTtQ=", "narHash": "sha256-3h9Yb7G+OKBBclvBukFlRQLYeHzsJCguGbBfQOnljok=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "09a721cf6869671ec2258da3c377436e3498eead", "rev": "61721aa0a28da42c13c059efc67d5d1e40b9ebea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -275,11 +214,11 @@
}, },
"nur_3": { "nur_3": {
"locked": { "locked": {
"lastModified": 1696772745, "lastModified": 1697284020,
"narHash": "sha256-9cXNUJwpHLOTPqlpUF33oFJHzrscb9oi/YKS2QiiTtQ=", "narHash": "sha256-3h9Yb7G+OKBBclvBukFlRQLYeHzsJCguGbBfQOnljok=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "09a721cf6869671ec2258da3c377436e3498eead", "rev": "61721aa0a28da42c13c059efc67d5d1e40b9ebea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -326,21 +265,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",