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

configurations: add vk basalt, add hp drivers, vim changes

This commit is contained in:
Mateusz Słodkowicz 2024-10-15 21:22:16 +02:00
parent 8327d4cfd3
commit 006250b806
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
8 changed files with 76 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configurations/host/default.nix
View File

@ -13,6 +13,7 @@ let
inherit host; inherit host;
inherit hm; inherit hm;
inherit hmAsModule; inherit hmAsModule;
inherit arch;
nixerus = if stable then inputs.configInputs-stable.nixerus else inputs.configInputs.nixerus; nixerus = if stable then inputs.configInputs-stable.nixerus else inputs.configInputs.nixerus;
configInputs = if stable then inputs.configInputs-stable else inputs.configInputs; configInputs = if stable then inputs.configInputs-stable else inputs.configInputs;
path = materusFlake.selfPath; path = materusFlake.selfPath;

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

@ -33,6 +33,7 @@
vaapiVdpau vaapiVdpau
libvdpau-va-gl libvdpau-va-gl
amdvlk amdvlk
vkbasalt
rocmPackages.clr.icd rocmPackages.clr.icd
rocmPackages.clr rocmPackages.clr
materusArg.pkgs.amdgpu-pro-libs.vulkan materusArg.pkgs.amdgpu-pro-libs.vulkan
@ -40,6 +41,7 @@
]; ];
hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [
vaapiVdpau vaapiVdpau
vkbasalt
pkgs.driversi686Linux.amdvlk pkgs.driversi686Linux.amdvlk
materusArg.pkgs.i686Linux.amdgpu-pro-libs.vulkan materusArg.pkgs.i686Linux.amdgpu-pro-libs.vulkan
libvdpau-va-gl libvdpau-va-gl

2
configurations/host/materusPC/kde.nix
View File

@ -72,5 +72,5 @@ in
kdePackages.ark kdePackages.ark
]; ];
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin pkgs.vlc ]; materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin pkgs.vlc pkgs.vkbasalt-cli ];
} }

13
configurations/host/materusPC/other/apps.nix
View File

@ -1,9 +1,9 @@
{config, pkgs, materusArg, ...}: { config, pkgs, materusArg, ... }:
{ {
services.jackett.enable = true; services.jackett.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
#(pkgs.lutris.override { extraLibraries = pkgs: with pkgs; [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; }) #(pkgs.lutris.override { extraLibraries = pkgs: with pkgs; [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
materusArg.pkgs.amdgpu-pro-libs.prefixes materusArg.pkgs.amdgpu-pro-libs.prefixes
(pkgs.bottles.override { extraPkgs = pkgs: [ pkgs.libsForQt5.breeze-qt5 pkgs.kdePackages.breeze-gtk pkgs.nss_latest ]; extraLibraries = pkgs: [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; }) (pkgs.bottles.override { extraPkgs = pkgs: [ pkgs.libsForQt5.breeze-qt5 pkgs.kdePackages.breeze-gtk pkgs.nss_latest ]; extraLibraries = pkgs: [ pkgs.samba pkgs.jansson pkgs.tdb pkgs.libunwind pkgs.libusb1 pkgs.gnutls pkgs.gtk3 pkgs.pango ]; })
@ -15,7 +15,8 @@
kdePackages.dolphin kdePackages.dolphin
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
vlc vlc
vkbasalt-cli
patchelf patchelf
killall killall
util-linux util-linux
@ -104,7 +105,7 @@
binutils binutils
qbittorrent qbittorrent
mkvtoolnix mkvtoolnix
nicotine-plus nicotine-plus
@ -113,4 +114,4 @@
aegisub aegisub
audacity audacity
]; ];
} }

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

@ -76,6 +76,8 @@
"libvirt" "libvirt"
"libvirtd" "libvirtd"
"podman" "podman"
"scanner"
"lp"
]; ];
shell = pkgs.zsh; shell = pkgs.zsh;
description = "Mateusz Słodkowicz"; description = "Mateusz Słodkowicz";
@ -160,6 +162,9 @@
openFirewall = true; openFirewall = true;
autoStart = false; autoStart = false;
}; };
hardware.sane.enable = true;
hardware.sane.extraBackends = [ pkgs.hplipWithPlugin ];
environment.enableAllTerminfo = true; environment.enableAllTerminfo = true;
environment.pathsToLink = [ "/share/zsh" "/share/bash-completion" "/share/fish" ]; environment.pathsToLink = [ "/share/zsh" "/share/bash-completion" "/share/fish" ];

2
configurations/profile/common/default.nix
View File

@ -4,6 +4,8 @@ let
pkgs = (import materusCfg.nixerus { inherit pkgs; }) // pkgs = (import materusCfg.nixerus { inherit pkgs; }) //
(if pkgs.system == "x86_64-linux" then { i686Linux = import materusCfg.nixerus { pkgs = pkgs.pkgsi686Linux; }; } else { }); (if pkgs.system == "x86_64-linux" then { i686Linux = import materusCfg.nixerus { pkgs = pkgs.pkgsi686Linux; }; } else { });
cfg = materusCfg; cfg = materusCfg;
unstable = import materusCfg.materusFlake.inputs.nixpkgs { system = materusCfg.arch; config = { allowUnfree = true; nvidia.acceptLicense = true; }; };
}; };
in in
{ {

11
configurations/profile/home/editor/neovim.nix
View File

@ -7,24 +7,29 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.neovim = { programs.neovim = {
enable = true; enable = true;
package = materusArg.unstable.neovim-unwrapped;
coc.enable = true; coc.enable = true;
coc.package = materusArg.unstable.vimPlugins.coc-nvim;
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
vimdiffAlias = true; vimdiffAlias = true;
defaultEditor = true;
extraConfig = '' extraConfig = ''
set number set number
''; '';
extraLuaConfig = ''
'';
extraPackages = with pkgs;[
];
plugins = with pkgs.vimPlugins;[ plugins = with materusArg.unstable.vimPlugins;[
syntastic syntastic
vim-fugitive vim-fugitive
vim-airline vim-airline
vim-nix vim-nix
nvim-fzf nvim-fzf
nvim-treesitter.withAllGrammars nvim-treesitter.withAllGrammars

100
flake.lock
View File

@ -159,11 +159,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1726822766, "lastModified": 1728007496,
"narHash": "sha256-3SC6yL7vqLymqHCU6BCWzcpt5tgS7qGtj12aO1AKNyQ=", "narHash": "sha256-5WC0lourOxiruuLbiLXjWqzYZ75mg724fbDqdr93MU4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "c64436a2941e042e63c5efb5eab94a11a12ca5de", "rev": "c51fe4531ae40b08b61f7ea680f3df2a964cd936",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -186,11 +186,11 @@
"nixpkgs-stable": "nixpkgs-stable_3" "nixpkgs-stable": "nixpkgs-stable_3"
}, },
"locked": { "locked": {
"lastModified": 1726822766, "lastModified": 1728007496,
"narHash": "sha256-3SC6yL7vqLymqHCU6BCWzcpt5tgS7qGtj12aO1AKNyQ=", "narHash": "sha256-5WC0lourOxiruuLbiLXjWqzYZ75mg724fbDqdr93MU4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "c64436a2941e042e63c5efb5eab94a11a12ca5de", "rev": "c51fe4531ae40b08b61f7ea680f3df2a964cd936",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,11 +329,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726818100, "lastModified": 1726989464,
"narHash": "sha256-z2V74f5vXqkN5Q+goFlhbFXY/dNaBAyeLpr2bxu4Eic=", "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1bbc1a5a1f4de7401c92db85b2119ed21bb4139d", "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -351,11 +351,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726818292, "lastModified": 1728026342,
"narHash": "sha256-sFI+LTeRTPOAZe9ewhQpIq5CkIr4IpzfzuyIFCz6ugY=", "narHash": "sha256-3mGqKM1jSkc2DrJvR/HCTav0Chd1n8/s1eJ9Y5GzNVM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8d7e352a4b25ac2d88a881ffa3472680af916ddc", "rev": "30e04f3d477256de3eb6a7cff608e220087537d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -370,10 +370,10 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1725703823, "lastModified": 1726818100,
"narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "narHash": "sha256-z2V74f5vXqkN5Q+goFlhbFXY/dNaBAyeLpr2bxu4Eic=",
"path": "/nix/store/bvmlcvi835al1d21d7alw8v1nl2yjs7l-source", "path": "/nix/store/4xbp0f9kg78pl3cmzx1rna1s0y708m4c-source",
"rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "rev": "1bbc1a5a1f4de7401c92db85b2119ed21bb4139d",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -437,11 +437,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1726724509, "lastModified": 1727665282,
"narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=", "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94", "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -453,11 +453,11 @@
}, },
"nixos-hardware_2": { "nixos-hardware_2": {
"locked": { "locked": {
"lastModified": 1726724509, "lastModified": 1727665282,
"narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=", "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94", "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -485,11 +485,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1726447378, "lastModified": 1727907660,
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -517,11 +517,11 @@
}, },
"nixpkgs-stable_3": { "nixpkgs-stable_3": {
"locked": { "locked": {
"lastModified": 1726447378, "lastModified": 1727907660,
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -549,11 +549,11 @@
}, },
"nixpkgs-stable_5": { "nixpkgs-stable_5": {
"locked": { "locked": {
"lastModified": 1726447378, "lastModified": 1727907660,
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -565,11 +565,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1726463316, "lastModified": 1727802920,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -594,11 +594,11 @@
}, },
"nur_2": { "nur_2": {
"locked": { "locked": {
"lastModified": 1726822046, "lastModified": 1728027550,
"narHash": "sha256-DcQA6LhSUozXsFtXjvis5BOU9Y6f/C7ewhxlMsHJMH4=", "narHash": "sha256-be13RazohHlmNJPH/zK9SGns8O0iLfwYzk77sZDB30o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "1a6b64958b310d5418afa0e8ddddb2e3ac1cb529", "rev": "c9c5e4e57b475f94fa0ba622611428b8fa3bd1cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -623,11 +623,11 @@
}, },
"nur_4": { "nur_4": {
"locked": { "locked": {
"lastModified": 1726822046, "lastModified": 1728027550,
"narHash": "sha256-DcQA6LhSUozXsFtXjvis5BOU9Y6f/C7ewhxlMsHJMH4=", "narHash": "sha256-be13RazohHlmNJPH/zK9SGns8O0iLfwYzk77sZDB30o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "1a6b64958b310d5418afa0e8ddddb2e3ac1cb529", "rev": "c9c5e4e57b475f94fa0ba622611428b8fa3bd1cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -639,10 +639,10 @@
}, },
"nur_5": { "nur_5": {
"locked": { "locked": {
"lastModified": 1726311124, "lastModified": 1726822046,
"narHash": "sha256-jzlUpw8li3BbKlpAcqyue5VYMKtjKiXZXyyaju/nnSo=", "narHash": "sha256-DcQA6LhSUozXsFtXjvis5BOU9Y6f/C7ewhxlMsHJMH4=",
"path": "/nix/store/dnaaw3xw44spw32fs83p5p7mnzzs1s5k-source", "path": "/nix/store/j0zra22vpm23mjd176n04bwpfxsq54gs-source",
"rev": "c3d547e38fbf32808f94f58e2b2852f1ad2bccf5", "rev": "1a6b64958b310d5418afa0e8ddddb2e3ac1cb529",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -687,11 +687,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1726524647, "lastModified": 1727734513,
"narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e2d404a7ea599a013189aa42947f66cede0645c8", "rev": "3198a242e547939c5e659353551b0668ec150268",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -710,11 +710,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1726524647, "lastModified": 1727734513,
"narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=", "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e2d404a7ea599a013189aa42947f66cede0645c8", "rev": "3198a242e547939c5e659353551b0668ec150268",
"type": "github" "type": "github"
}, },
"original": { "original": {