tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Update plasma & add 32bit amdgpu libs

Browse source
This commit is contained in:
Tristan D. 2023-12-10 21:51:02 +01:00
parent ee625d0191
commit 48dc0acc56
Signed by: tristan
SSH key fingerprint: SHA256:3RU4RLOoM8oAjFU19f1W6t8uouZbA7GWkaSW6rjp1k8
5 changed files with 56 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
flake.lock generated
View file

@ -10,11 +10,11 @@
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1702060383, "lastModified": 1702226237,
"narHash": "sha256-XMMBRB3RoygT+lvQOlZHQI04VbhxpJkDQ3pa75aQiZg=", "narHash": "sha256-DWTjzjGQaODVNqjFitOz8FBcKFNUYQMK8YzRhd2xANw=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "bb23b9a821adf19ed91bc4651c5d8689cfee1707", "rev": "fcb86262e7bcd5dcbe165e5959aad80064cd82f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -175,12 +175,12 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701728041, "lastModified": 1702203126,
"narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=",
"rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883",
"revCount": 3154, "revCount": 3178,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3154%2Brev-ac7216918cd65f3824ba7817dea8f22e61221eaf/018c36ef-b711-7d13-9b93-76b97d62673a/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.1.3178%2Brev-defbb9c5857e157703e8fc7cf3c2ceb01cb95883/018c5337-b35a-70f9-ab26-b36c9064d16c/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -194,11 +194,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700814205, "lastModified": 1702195709,
"narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "aeb2232d7a32530d3448318790534d196bf9427a", "rev": "6761b8188b860f374b457eddfdb05c82eef9752f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -215,11 +215,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701980277, "lastModified": 1702177733,
"narHash": "sha256-qSMnoUIZl3lyaAXgXGQ4qnA5jufnNrBAI0bYw7kJgtE=", "narHash": "sha256-lr3hkmmuqDFPj3i41cHpaALF3Txo3kxsJ3L6jZLujJ8=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "ca1f1798f63ada20dffcb8b23039b00a597dafe9", "rev": "58ecd98e27e27fcbb27a51a588555c828b1ec56e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -272,11 +272,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1701718080, "lastModified": 1702151865,
"narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -288,12 +288,12 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1701718080, "lastModified": 1702151865,
"narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
"rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
"revCount": 556224, "revCount": 557885,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.556224%2Brev-2c7f3c0fb7c08a0814627611d9d7d45ab6d75335/018c4130-1dfe-7107-b79c-75c69c756ef4/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.557885%2Brev-666fc80e7b2afb570462423cb0e1cf1a3a34fedd/018c547a-1b6d-7b79-84fc-aab0c12f1b6e/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -318,11 +318,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1701693815, "lastModified": 1702206697,
"narHash": "sha256-7BkrXykVWfkn6+c1EhFA3ko4MLi3gVG0p9G96PNnKTM=", "narHash": "sha256-vE9oEx3Y8TO5MnWwFlmopjHd1JoEBno+EhsfUCq5iR8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "09ec6a0881e1a36c29d67497693a67a16f4da573", "rev": "29d6c96900b9b576c2fb89491452f283aa979819",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -350,11 +350,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1702060431, "lastModified": 1702237445,
"narHash": "sha256-8/yGvqBUx/oR2rDhY8+iWZ1nErjpsNCe2O8PvzFaerM=", "narHash": "sha256-gCfV7eIdLghN/1NG2xngn4q0SXPO92cZ4/hPJepCw1w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d854884a8c7d2014ff44a27cfe9cac8dd78cc7ea", "rev": "444a9b5c426db74aea5e9dc8123705e4cf757815",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -88,6 +88,7 @@
permittedInsecurePackages = [ permittedInsecurePackages = [
"electron-22.3.27" "electron-22.3.27"
"electron-24.8.6" "electron-24.8.6"
"electron-25.9.0"
]; ];
}; };
}; };

2
home-mods/desktop/default.nix
View file

@ -22,7 +22,7 @@ in
packages = with pkgs.unstable-pkgs; [ packages = with pkgs.unstable-pkgs; [
airshipper airshipper
ardour ardour
blender # blender
bitwarden bitwarden
brave brave
cavalier cavalier

15
home-mods/plasma/default.nix
View file

@ -150,13 +150,20 @@
"kded5rc"."Module-smbwatcher"."autoload" = true; "kded5rc"."Module-smbwatcher"."autoload" = true;
"kded5rc"."Module-statusnotifierwatcher"."autoload" = true; "kded5rc"."Module-statusnotifierwatcher"."autoload" = true;
"kded5rc"."PlasmaBrowserIntegration"."shownCount" = 4; "kded5rc"."PlasmaBrowserIntegration"."shownCount" = 4;
"kdeglobals"."General"."TerminalApplication" = "alacritty";
"kdeglobals"."General"."TerminalService" = "Alacritty.desktop";
"kdeglobals"."General"."AccentColor" = "233,100,58"; "kdeglobals"."General"."AccentColor" = "233,100,58";
"kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop";
"kdeglobals"."General"."LastUsedCustomAccentColor" = "233,100,58"; "kdeglobals"."General"."LastUsedCustomAccentColor" = "233,100,58";
"kdeglobals"."General"."XftHintStyle" = "hintmedium"; "kdeglobals"."General"."XftHintStyle" = "hintmedium";
"kdeglobals"."General"."XftSubPixel" = "rgb"; "kdeglobals"."General"."XftSubPixel" = "rgb";
"kdeglobals"."General"."font" = "Iosevka Nerd Font Propo,11,-1,5,63,0,0,0,0,0,SemiBold";
"kdeglobals"."General"."fixed" = "Iosevka Nerd Font Mono,10,-1,5,50,0,0,0,0,0"; "kdeglobals"."General"."fixed" = "Iosevka Nerd Font Mono,10,-1,5,50,0,0,0,0,0";
"kdeglobals"."KDE"."AnimationDurationFactor" = 0.250000; "kdeglobals"."General"."menuFont" = "Iosevka Nerd Font Propo,11,-1,5,63,0,0,0,0,0,SemiBold";
"kdeglobals"."General"."smallestReadableFont" = "Iosevka Nerd Font Propo,8,-1,5,63,0,0,0,0,0,SemiBold";
"kdeglobals"."General"."toolBarFont" = "Iosevka Nerd Font Propo,11,-1,5,63,0,0,0,0,0,SemiBold";
"kdeglobals"."KDE"."AnimationDurationFactor" = 0.35;
"kdeglobals"."KDE"."SingleClick" = true;
"kdeglobals"."KDE"."widgetStyle" = "Breeze"; "kdeglobals"."KDE"."widgetStyle" = "Breeze";
"kdeglobals"."KFileDialog Settings"."Allow Expansion" = false; "kdeglobals"."KFileDialog Settings"."Allow Expansion" = false;
"kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true; "kdeglobals"."KFileDialog Settings"."Automatically select filename extension" = true;
@ -217,7 +224,7 @@
"kwalletrc"."Wallet"."Prompt on Open" = true; "kwalletrc"."Wallet"."Prompt on Open" = true;
"kwalletrc"."Wallet"."Use One Wallet" = true; "kwalletrc"."Wallet"."Use One Wallet" = true;
"kwalletrc"."org.freedesktop.secrets"."apiEnabled" = true; "kwalletrc"."org.freedesktop.secrets"."apiEnabled" = true;
"kwinrc"."Compositing"."LatencyPolicy" = "High"; "kwinrc"."Compositing"."LatencyPolicy" = "Medium";
"kwinrc"."Desktops"."Id_1" = "6b86c814-0a63-4a66-83aa-8f923109b8dc"; "kwinrc"."Desktops"."Id_1" = "6b86c814-0a63-4a66-83aa-8f923109b8dc";
"kwinrc"."Desktops"."Id_2" = "51266a99-9eeb-4a62-a7f1-8b9ddedc5296"; "kwinrc"."Desktops"."Id_2" = "51266a99-9eeb-4a62-a7f1-8b9ddedc5296";
"kwinrc"."Desktops"."Id_3" = "7b7d4799-86fe-4b40-8951-1eac646f2707"; "kwinrc"."Desktops"."Id_3" = "7b7d4799-86fe-4b40-8951-1eac646f2707";
@ -236,11 +243,13 @@
"kwinrc"."Tiling"."padding" = 4; "kwinrc"."Tiling"."padding" = 4;
"kwinrc"."Tiling.dd29d4b5-4a19-5d84-85bd-6613fc295b35"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Tiling.dd29d4b5-4a19-5d84-85bd-6613fc295b35"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}";
"kwinrc"."Tiling.fe00a83e-01b8-5971-9f13-c03d1702129e"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Tiling.fe00a83e-01b8-5971-9f13-c03d1702129e"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}";
"kwinrc"."Xwayland"."Scale" = 1; "kwinrc"."Windows"."RollOverDesktops" = true;
"kwinrc"."Xwayland"."Scale" = 1.25;
"kxkbrc"."Layout"."Options" = "caps:ctrl_modifier"; "kxkbrc"."Layout"."Options" = "caps:ctrl_modifier";
"kxkbrc"."Layout"."ResetOldOptions" = true; "kxkbrc"."Layout"."ResetOldOptions" = true;
"plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8";
"plasmarc"."Wallpapers"."usersWallpapers" = ""; "plasmarc"."Wallpapers"."usersWallpapers" = "";
"plasmarc"."Theme"."name" = "breeze-dark";
"krunnerrc"."General"."FreeFloating" = true; "krunnerrc"."General"."FreeFloating" = true;
"kscreenlockerrc"."Greeter.Wallpaper.org.kde.image.General"."Image" = "/home/tristand/.background"; "kscreenlockerrc"."Greeter.Wallpaper.org.kde.image.General"."Image" = "/home/tristand/.background";
"kscreenlockerrc"."Greeter.Wallpaper.org.kde.image.General"."PreviewImage" = "/home/tristand/.background"; "kscreenlockerrc"."Greeter.Wallpaper.org.kde.image.General"."PreviewImage" = "/home/tristand/.background";

14
os-mods/amdgpu/default.nix
View file

@ -15,6 +15,8 @@
}; };
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ];
#services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
]; ];
@ -23,8 +25,20 @@
driSupport32Bit = true; driSupport32Bit = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
amdvlk amdvlk
rocmPackages.rocm-runtime
rocm-opencl-icd rocm-opencl-icd
rocm-opencl-runtime rocm-opencl-runtime
vaapiVdpau
libvdpau-va-gl
# libva1
obs-studio-plugins.obs-vaapi # TODO check if obs is enabled
gst_all_1.gstreamer
gst_all_1.gst-vaapi
];
extraPackages32 = with pkgs; [
driversi686Linux.amdvlk
driversi686Linux.vaapiVdpau
driversi686Linux.libvdpau-va-gl
]; ];
}; };
} }