jopejoe1/nix-conf
1
0
Fork 0
mirror of https://codeberg.org/jopejoe1/nix-conf.git synced 2025-01-04 09:46:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hoping this fixes nvidia issues

Browse source
This commit is contained in:
Johannes Jöns 2023-02-24 16:03:52 +01:00
parent f2bb64a089
commit 4016b181b0
7 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
flake.nix
View file

@ -99,7 +99,10 @@
}; };
flake-utils.url = github:numtide/flake-utils; flake-utils.url = github:numtide/flake-utils;
nixlib.url = github:nix-community/nixpkgs.lib; nixlib.url = github:nix-community/nixpkgs.lib;
naersk.url = github:nix-community/naersk; naersk.url = {
url = github:nix-community/naersk;
inputs.nixpkgs.follows = "nixpkgs";
};
flake-utils-plus = { flake-utils-plus = {
url = github:gytis-ivaskevicius/flake-utils-plus; url = github:gytis-ivaskevicius/flake-utils-plus;
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
@ -135,7 +138,7 @@
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
}; };
system.stateVersion = "23.05"; system.stateVersion = "22.11";
services.peerix = { services.peerix = {
#enable = true; #enable = true;
package = peerix.packages.x86_64-linux.peerix; package = peerix.packages.x86_64-linux.peerix;

2
modules/user/jopejoe1/default.nix
View file

@ -22,11 +22,11 @@ in
kate kate
carla carla
xdg-ninja xdg-ninja
prismlauncher
ark ark
]; ];
}; };
home-manager.users.jopejoe1 = import ./home.nix; home-manager.users.jopejoe1 = import ./home.nix;
home-manager.users.jopejoe1.home.stateVersion = config.system.stateVersion;
}; };
} }

3
modules/user/jopejoe1/home.nix
View file

@ -11,9 +11,6 @@
XCOMPOSECACHE = "${config.xdg.cacheHome}/X11/xcompos"; XCOMPOSECACHE = "${config.xdg.cacheHome}/X11/xcompos";
XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority"; XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority";
}; };
# Do not change this version unless 100% sure updatet evrything to the new version
stateVersion = "23.05";
}; };
accounts.email.accounts = { accounts.email.accounts = {

1
modules/user/root/default.nix
View file

@ -12,5 +12,6 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.root = import ./home.nix; home-manager.users.root = import ./home.nix;
home-manager.users.root.home.stateVersion = config.system.stateVersion;
}; };
} }

3
modules/user/root/home.nix
View file

@ -11,9 +11,6 @@
XCOMPOSECACHE = "${config.xdg.cacheHome}/X11/xcompos"; XCOMPOSECACHE = "${config.xdg.cacheHome}/X11/xcompos";
XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority"; XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority";
}; };
# Do not change this version unless 100% sure updatet evrything to the new version
stateVersion = "23.05";
}; };
xdg = { xdg = {

2
systems/x86_64-linux/kami/default.nix
View file

@ -27,7 +27,7 @@ with lib;
hardware.opengl.enable = true; hardware.opengl.enable = true;
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta; hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.beta;
#boot.kernelParams = [ "module_blacklist=i915" ]; boot.kernelParams = [ "module_blacklist=i915" ];
programs = { programs = {
dconf.enable = true; dconf.enable = true;

6
systems/x86_64-linux/kami/hardware.nix
View file

@ -7,14 +7,14 @@ in
imports = with nixos-hardware.nixosModules; [ imports = with nixos-hardware.nixosModules; [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
common-cpu-intel common-cpu-intel
common-gpu-nvidia #common-gpu-nvidia
common-pc common-pc
common-pc-ssd common-pc-ssd
]; ];
hardware.nvidia.prime = { hardware.nvidia.prime = {
offload.enable = false; offload.enable = false;
sync.enable = true; sync.enable = false;
# Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA # Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA
intelBusId = "PCI:0:2:0"; intelBusId = "PCI:0:2:0";
@ -24,7 +24,7 @@ in
}; };
boot = { boot = {
kernelPackages = pkgs.linuxPackages_zen; kernelPackages = pkgs.linuxPackages_latest;
initrd = { initrd = {
# kernelModules = [ "amdgpu" ]; # kernelModules = [ "amdgpu" ];