mirror of
https://gitlab.com/Zaney/zaneyos.git
synced 2024-11-22 14:43:08 +01:00
Fix steam intel error
This commit is contained in:
parent
361f183a53
commit
43df512b8f
@ -37,6 +37,7 @@ in with lib; {
|
|||||||
natural_scroll = false
|
natural_scroll = false
|
||||||
}
|
}
|
||||||
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
|
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
|
||||||
|
accel_profile = flat
|
||||||
}
|
}
|
||||||
env = NIXOS_OZONE_WL, 1
|
env = NIXOS_OZONE_WL, 1
|
||||||
env = NIXPKGS_ALLOW_UNFREE, 1
|
env = NIXPKGS_ALLOW_UNFREE, 1
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
call plug#begin('~/.vim/plugged')
|
call plug#begin('~/.vim/plugged')
|
||||||
Plug 'scrooloose/nerdtree' " Nerdtree
|
Plug 'scrooloose/nerdtree' " Nerdtree
|
||||||
Plug 'ryanoasis/vim-devicons' " Icons for Nerdtree
|
Plug 'ryanoasis/vim-devicons' " Icons for Nerdtree
|
||||||
Plug 'dracula/vim', { 'as': 'dracula' } " Dracula Color Scheme
|
|
||||||
Plug 'tpope/vim-surround' " Change surrounding marks
|
Plug 'tpope/vim-surround' " Change surrounding marks
|
||||||
Plug 'PotatoesMaster/i3-vim-syntax' " i3 config highlighting
|
Plug 'PotatoesMaster/i3-vim-syntax' " i3 config highlighting
|
||||||
Plug 'kovetskiy/sxhkd-vim' " sxhkd highlighting
|
Plug 'kovetskiy/sxhkd-vim' " sxhkd highlighting
|
||||||
@ -27,6 +26,7 @@
|
|||||||
Plug 'junegunn/vim-emoji' " Vim needs emojis!
|
Plug 'junegunn/vim-emoji' " Vim needs emojis!
|
||||||
Plug 'https://github.com/tpope/vim-commentary' " Comment Out With gcc & Uncomment With gcgc
|
Plug 'https://github.com/tpope/vim-commentary' " Comment Out With gcc & Uncomment With gcgc
|
||||||
Plug 'neoclide/coc.nvim', {'branch': 'release'} " Code Completion (requires node)
|
Plug 'neoclide/coc.nvim', {'branch': 'release'} " Code Completion (requires node)
|
||||||
|
Plug 'LnL7/vim-nix' " Nix highlighting and detection
|
||||||
Plug 'suan/vim-instant-markdown', {'rtp': 'after'} " Markdown Preview
|
Plug 'suan/vim-instant-markdown', {'rtp': 'after'} " Markdown Preview
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
|
@ -3,9 +3,6 @@
|
|||||||
lib.mkIf ("${gpuType}" == "amd") {
|
lib.mkIf ("${gpuType}" == "amd") {
|
||||||
# OpenGL
|
# OpenGL
|
||||||
hardware.opengl = {
|
hardware.opengl = {
|
||||||
enable = true;
|
|
||||||
driSupport = true;
|
|
||||||
driSupport32Bit = true;
|
|
||||||
## amdvlk: an open-source Vulkan driver from AMD
|
## amdvlk: an open-source Vulkan driver from AMD
|
||||||
extraPackages = [ pkgs.amdvlk ];
|
extraPackages = [ pkgs.amdvlk ];
|
||||||
extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
|
extraPackages32 = [ pkgs.driversi686Linux.amdvlk ];
|
@ -2,14 +2,14 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./amd-opengl.nix
|
./amd-gpu.nix
|
||||||
./steam.nix
|
|
||||||
./autorun.nix
|
./autorun.nix
|
||||||
./boot.nix
|
./boot.nix
|
||||||
./displaymanager.nix
|
./displaymanager.nix
|
||||||
./intel-opengl.nix
|
./intel-gpu.nix
|
||||||
./packages.nix
|
./packages.nix
|
||||||
./polkit.nix
|
./polkit.nix
|
||||||
./services.nix
|
./services.nix
|
||||||
|
./steam.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -10,14 +10,11 @@ lib.mkIf ("${gpuType}" == "intel") {
|
|||||||
|
|
||||||
# OpenGL
|
# OpenGL
|
||||||
hardware.opengl = {
|
hardware.opengl = {
|
||||||
enable = true;
|
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
intel-media-driver
|
intel-media-driver
|
||||||
vaapiIntel
|
vaapiIntel
|
||||||
vaapiVdpau
|
vaapiVdpau
|
||||||
libvdpau-va-gl
|
libvdpau-va-gl
|
||||||
];
|
];
|
||||||
driSupport = true;
|
|
||||||
driSupport32Bit = true;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
10
config/system/opengl.nix
Normal file
10
config/system/opengl.nix
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
{ pkgs, config, lib, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
# OpenGL
|
||||||
|
hardware.opengl = {
|
||||||
|
enable = true;
|
||||||
|
driSupport = true;
|
||||||
|
driSupport32Bit = true;
|
||||||
|
};
|
||||||
|
}
|
@ -1,4 +1,4 @@
|
|||||||
{ pkgs, config, lib, cpuType, ... }:
|
{ pkgs, config, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Steam Configuration
|
# Steam Configuration
|
||||||
@ -6,11 +6,5 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
remotePlay.openFirewall = true;
|
remotePlay.openFirewall = true;
|
||||||
dedicatedServer.openFirewall = true;
|
dedicatedServer.openFirewall = true;
|
||||||
package = lib.mkIf ("${cpuType}" == "intel") {
|
|
||||||
pkgs.steam.override = {
|
|
||||||
withPrimus = true;
|
|
||||||
extraPkgs = [ pkgs.bumblebee pkgs.glxinfo ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -33,7 +33,8 @@
|
|||||||
wallpaperDir = "/home/${username}/Pictures/Wallpapers";
|
wallpaperDir = "/home/${username}/Pictures/Wallpapers";
|
||||||
flakeDir = "/home/${username}/zaneyos";
|
flakeDir = "/home/${username}/zaneyos";
|
||||||
# Driver selection profile
|
# Driver selection profile
|
||||||
# default options amd, intel, nvidia, vm (WIP)
|
# Options include amd (tested), intel, nvidia
|
||||||
|
# vm for both if you are running a vm
|
||||||
cpuType = "amd";
|
cpuType = "amd";
|
||||||
gpuType = "amd";
|
gpuType = "amd";
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user