rearranging

This commit is contained in:
ari committed 2024-05-15 21:45:43 -04:00
1 parent ca822f8bca
commit f27a7a64a3
7 files changed
+20 -41

No files matched your search

-7
View File
@@ -46,19 +46,12 @@
enable = true;
};
})
(import ./modules/rootUser.nix {
hostName = hostName;
})
(import ./modules/user.nix {
user = user;
})
(import ./modules/desktop/main.nix {
user = user;
enableKDE = true;
enableHypr = true;
enableX11 = true;
})
./modules/optional/ollama.nix
(import ./modules/optional/home-manager-config.nix {
user = user;
hostName = hostName;
+13
View File
@@ -44,11 +44,24 @@
displaylink
amdgpu_top
amdctl
# Personal Apps
firefox
bitwarden-cli
jq
zoom-us
vscode
];
# Ollama
services.ollama = {
enable = true;
acceleration = "rocm";
};
# Display Managers
services.xserver.videoDrivers = [ "displaylink" "modesetting" ];
services.xserver.displayManager.sessionCommands = ''
${lib.getBin pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource 2 0
'';
# Kernel
boot.initrd.kernelModules = [ "amdgpu" "evdi" ];
hardware.opengl.extraPackages = with pkgs; [
rocmPackages.clr.icd
-18
View File
@@ -1,18 +0,0 @@
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
rocmPackages.rocm-smi
rocmPackages.rpp
rocmPackages.rocm-core
rocmPackages.rocm-runtime
rocmPackages.hipblas
rocmPackages.llvm.clang
amdgpu_top
amdctl
];
boot.initrd.kernelModules = [ "amdgpu" ];
hardware.opengl.extraPackages = with pkgs; [
rocmPackages.clr.icd
amdvlk
];
}
-7
View File
@@ -1,7 +0,0 @@
{ ... }:
{
services.ollama = {
enable = true;
acceleration = "rocm";
};
}
+6 -1
View File
@@ -12,6 +12,10 @@
{
imports = [
./core.nix
./rootUser.nix
(import ./user.nix {
user = user;
})
] ++ (if enableFonts then [
./fonts.nix
] else [ ]) ++ (if hardware.enable then [
@@ -22,8 +26,9 @@
firewall = firewall;
})
] else [ ]) ++ (if enableSSH then [
(import ./core.nix {
(import ./ssh.nix {
enableSSHServer = true;
user = user;
})
] else [ ]);
}
@@ -1,5 +1,4 @@
{ hostName }:
{ pkgs, ... }:
{
users.users.root.shell = pkgs.zsh;
}
}
-6
View File
@@ -11,13 +11,7 @@
"docker"
];
packages = with pkgs; [
firefox
bitwarden-cli
jq
zoom-us
terminator
nixd
vscode
];
};
}