diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index ec56f05..74c4345 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -41,13 +41,13 @@ rocmPackages.rocm-runtime rocmPackages.hipblas rocmPackages.llvm.clang - displaylink amdgpu_top amdctl - # Personal Apps + # Display Libraries + displaylink ]; # Personal Apps - home-manager.users.${user.name}.packages = with pkgs; [ + users.users.${user.name}.packages = with pkgs; [ firefox bitwarden-cli zoom-us diff --git a/modules/nix/docker.nix b/modules/nix/docker.nix deleted file mode 100644 index d92b86e..0000000 --- a/modules/nix/docker.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: -{ - virtualisation.docker.enable = true; - environment.systemPackages = with pkgs; [ - docker-compose - ]; -} diff --git a/modules/nix/main.nix b/modules/nix/main.nix index c8f57ee..40d8c1b 100644 --- a/modules/nix/main.nix +++ b/modules/nix/main.nix @@ -8,7 +8,6 @@ user = user; systemStateVersion = systemStateVersion; }) - ./docker.nix ./tmux.nix ]; } diff --git a/modules/optional/home-manager-config.nix b/modules/optional/home-manager-config.nix index d3b28cd..f6bfc3a 100644 --- a/modules/optional/home-manager-config.nix +++ b/modules/optional/home-manager-config.nix @@ -24,16 +24,16 @@ in stateVersion = homeMangerVersion; shellAliases = { cat = "bat"; }; packages = with pkgs; [ + jq nixfmt-classic kubectl terraform rye - betterdiscordctl - discord devenv conda neofetch ipfetch + nixd ]; }; programs = { diff --git a/modules/os/main.nix b/modules/os/main.nix index 59963b7..20d4d29 100644 --- a/modules/os/main.nix +++ b/modules/os/main.nix @@ -16,6 +16,9 @@ (import ./user.nix { user = user; }) + (import ./docker.nix { + user = user; + }) ] ++ (if enableFonts then [ ./fonts.nix ] else [ ]) ++ (if hardware.enable then [ diff --git a/modules/os/user.nix b/modules/os/user.nix index f581c21..79a41d0 100644 --- a/modules/os/user.nix +++ b/modules/os/user.nix @@ -8,10 +8,6 @@ extraGroups = [ "networkmanager" "wheel" - "docker" - ]; - packages = with pkgs; [ - nixd ]; }; }