Mon Jun 10 04:09:54 PM CEST 2024
This commit is contained in:
parent
85791beff8
commit
c7da813de2
20
flake.lock
20
flake.lock
|
|
@ -75,11 +75,11 @@
|
|||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717946608,
|
||||
"narHash": "sha256-YtqFGpsbPXBp8hvuzYYTrxVrBuxb+MNcPVsOeebLvxY=",
|
||||
"lastModified": 1718025901,
|
||||
"narHash": "sha256-RpNsQZ3jCNEkYKy9crhIV5LFjTNRJHvdHHr+DFATDqs=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "4168b8c17b12b90873fab1ca73c2981b53f48bf5",
|
||||
"revCount": 4786,
|
||||
"rev": "7ba2c31822b3df9b40b4184550423f23023b55bb",
|
||||
"revCount": 4793,
|
||||
"submodules": true,
|
||||
"type": "git",
|
||||
"url": "https://github.com/hyprwm/Hyprland"
|
||||
|
|
@ -232,11 +232,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1717948052,
|
||||
"narHash": "sha256-2gCnJZoXuNOBRaYKHOemGhktvPxywIQGX4cfb5EB0Bo=",
|
||||
"lastModified": 1718026702,
|
||||
"narHash": "sha256-B62vRJYFK7x5pJKDvXCIRgKcAS9K/KwoTBYAECfb81A=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "83e160a6adc2c8bb270b68dd23409d6539e19cb2",
|
||||
"rev": "f7e5fe023ea5742a1db039b6ba17f717ef24cc0f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -263,11 +263,11 @@
|
|||
"nix-filter": "nix-filter"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1717619251,
|
||||
"narHash": "sha256-jMgeJRhw7UdPph11HCWqyrZADz+p7QR2146+P4ACuRA=",
|
||||
"lastModified": 1717967427,
|
||||
"narHash": "sha256-ltR6Svr220r008dqQw4IJNmr4Pas///qLPVQ4NNto4A=",
|
||||
"owner": "Duckonaut",
|
||||
"repo": "split-monitor-workspaces",
|
||||
"rev": "dbe698335f1f1967ada31f654f77b776ad904c81",
|
||||
"rev": "2b57b5706cde7577c9cbb4de9e1f9a14777d09af",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -1,65 +1,23 @@
|
|||
{ pkgs, inputs, config, ... }:
|
||||
{
|
||||
imports = [
|
||||
(import ../Common { inherit inputs pkgs; })
|
||||
(import ../Common/default.nix { inherit inputs pkgs config; })
|
||||
(import ../Common/nvidia.nix { inherit inputs pkgs config; })
|
||||
];
|
||||
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
hardware.opengl.extraPackages = [
|
||||
pkgs.intel-compute-runtime
|
||||
pkgs.intel-media-driver
|
||||
];
|
||||
environment.systemPackages = with pkgs; [
|
||||
# Cuda
|
||||
pciutils
|
||||
file
|
||||
gnumake
|
||||
gcc
|
||||
cudatoolkit
|
||||
];
|
||||
hardware.nvidia = {
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
modesetting.enable = true;
|
||||
powerManagement.enable = false;
|
||||
powerManagement.finegrained = true;
|
||||
open = false;
|
||||
nvidiaSettings = true;
|
||||
prime = {
|
||||
intelBusId = "PCI:0:2:0";
|
||||
nvidiaBusId = "PCI:1:0:0";
|
||||
offload = {
|
||||
enable = true;
|
||||
enableOffloadCmd = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
systemd.services.nvidia-control-devices = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig.ExecStart = "${pkgs.linuxPackages.nvidia_x11.bin}/bin/nvidia-smi";
|
||||
};
|
||||
specialisation = {
|
||||
docked.configuration = {
|
||||
system.nixos.tags = [ "docked" ];
|
||||
hardware.nvidia = {
|
||||
powerManagement.finegrained = pkgs.lib.mkForce false;
|
||||
prime.offload.enable = pkgs.lib.mkForce false;
|
||||
prime.offload.enableOffloadCmd = pkgs.lib.mkForce false;
|
||||
prime.sync.enable = pkgs.lib.mkForce true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
acceleration = "cuda";
|
||||
};
|
||||
|
||||
|
||||
services.logind.extraConfig = ''HandlePowerKey=ignore'';
|
||||
networking.wg-quick.interfaces = {
|
||||
wg0 = {
|
||||
address = [ "10.0.0.5/24" "2a02:a03f:83ad:2101::5/128" ];
|
||||
# dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];
|
||||
privateKeyFile = "/home/user/.secrets/Wireguard/Aloria.key";
|
||||
listenPort = 51820;
|
||||
postUp = "resolvectl dns wg0 10.0.0.1; resolvectl domain wg0 ~thomasave.be;";
|
||||
|
|
@ -71,18 +29,6 @@
|
|||
}];
|
||||
};
|
||||
};
|
||||
# networking.networkmanager = {
|
||||
# enable = true;
|
||||
# ensureProfiles = {
|
||||
# environmentFiles = [
|
||||
# "/home/user/.secrets/Wireless/Aloria.env"
|
||||
# ];
|
||||
# profiles = pkgs.lib.mapAttrs mkConnection connections;
|
||||
# };
|
||||
# dns = "systemd-resolved";
|
||||
# };
|
||||
# networking.networkmanager.wifi.backend = "iwd";
|
||||
|
||||
networking.wireless.iwd.enable = true;
|
||||
networking.wireless.iwd.settings = {
|
||||
IPv6 = {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
{ pkgs, config, ... }:
|
||||
{
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
environment.systemPackages = with pkgs; [
|
||||
# Cuda
|
||||
pciutils
|
||||
file
|
||||
gnumake
|
||||
gcc
|
||||
cudatoolkit
|
||||
];
|
||||
hardware.nvidia = {
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
modesetting.enable = true;
|
||||
powerManagement.enable = false;
|
||||
powerManagement.finegrained = true;
|
||||
open = false;
|
||||
nvidiaSettings = true;
|
||||
prime = {
|
||||
intelBusId = "PCI:0:2:0";
|
||||
nvidiaBusId = "PCI:1:0:0";
|
||||
offload = {
|
||||
enable = true;
|
||||
enableOffloadCmd = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
systemd.services.nvidia-control-devices = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
serviceConfig.ExecStart = "${pkgs.linuxPackages.nvidia_x11.bin}/bin/nvidia-smi";
|
||||
};
|
||||
|
||||
specialisation = {
|
||||
docked.configuration = {
|
||||
system.nixos.tags = [ "docked" ];
|
||||
hardware.nvidia = {
|
||||
powerManagement.finegrained = pkgs.lib.mkForce false;
|
||||
prime.offload.enable = pkgs.lib.mkForce false;
|
||||
prime.offload.enableOffloadCmd = pkgs.lib.mkForce false;
|
||||
prime.sync.enable = pkgs.lib.mkForce true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -16,7 +16,6 @@
|
|||
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
# acceleration = "";
|
||||
};
|
||||
|
||||
networking.wg-quick.interfaces = {
|
||||
|
|
|
|||
Loading…
Reference in New Issue