diff --git a/flake.nix b/flake.nix index 73a353c..e191b85 100644 --- a/flake.nix +++ b/flake.nix @@ -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; diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index b80227a..ee9690f 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -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 diff --git a/modules/optional/amd-packages.nix b/modules/optional/amd-packages.nix deleted file mode 100644 index d5b3205..0000000 --- a/modules/optional/amd-packages.nix +++ /dev/null @@ -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 - ]; -} diff --git a/modules/optional/ollama.nix b/modules/optional/ollama.nix deleted file mode 100644 index 656c508..0000000 --- a/modules/optional/ollama.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: -{ - services.ollama = { - enable = true; - acceleration = "rocm"; - }; -} diff --git a/modules/os/main.nix b/modules/os/main.nix index bd40cf4..59963b7 100644 --- a/modules/os/main.nix +++ b/modules/os/main.nix @@ -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 [ ]); } diff --git a/modules/rootUser.nix b/modules/os/rootUser.nix similarity index 78% rename from modules/rootUser.nix rename to modules/os/rootUser.nix index b812cfc..7cab540 100644 --- a/modules/rootUser.nix +++ b/modules/os/rootUser.nix @@ -1,5 +1,4 @@ -{ hostName }: { pkgs, ... }: { users.users.root.shell = pkgs.zsh; -} \ No newline at end of file +} diff --git a/modules/user.nix b/modules/os/user.nix similarity index 75% rename from modules/user.nix rename to modules/os/user.nix index 13ebe47..f581c21 100644 --- a/modules/user.nix +++ b/modules/os/user.nix @@ -11,13 +11,7 @@ "docker" ]; packages = with pkgs; [ - firefox - bitwarden-cli - jq - zoom-us - terminator nixd - vscode ]; }; }