From 1a3486d77574c06b395ab6cda41084f5ed24a3f4 Mon Sep 17 00:00:00 2001 From: Preston Pan Date: Thu, 16 Jan 2025 02:11:26 -0800 Subject: modularized nix configuration; builds correctly --- nix/modules/configuration.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'nix/modules/configuration.nix') diff --git a/nix/modules/configuration.nix b/nix/modules/configuration.nix index 46deabb..286d485 100644 --- a/nix/modules/configuration.nix +++ b/nix/modules/configuration.nix @@ -1,6 +1,11 @@ { config, pkgs, lib, ... }: { - imports = []; + imports = [ + ./xserver.nix + ./ssh.nix + ./pipewire.nix + ./tor.nix + ]; documentation = { enable = lib.mkDefault config.monorepo.profiles.documentation.enable; @@ -197,10 +202,6 @@ usbguard.enable = false; dbus.apparmor = "enabled"; - tor = import ./tor.nix; - xserver = import ./xserver.nix; - pipewire = import ./pipewire.nix; - openssh = import ./ssh.nix; kanata.enable = true; # Misc. @@ -228,7 +229,7 @@ hostPlatform = lib.mkDefault "x86_64-linux"; config = { allowUnfree = true; - cudaSupport = lib.mkDefault false; + cudaSupport = lib.mkDefault config.monorepo.profiles.cuda.enable; }; }; @@ -273,9 +274,11 @@ }; environment.systemPackages = with pkgs; [ - tree restic sbctl + git + vim + curl ]; users.users = { -- cgit