From ad1b6da6cff0384b724875ec784e37fce782a0b8 Mon Sep 17 00:00:00 2001 From: smayzy Date: Sun, 2 Aug 2026 15:29:16 +0200 Subject: [PATCH] Revert "mv from groups to host" This reverts commit ffac8ef90a9f738d19c615be435026734a0474df. --- hosts/desktop1/configuration.nix | 33 +------------------------------- modules/nix/groups/desktop.nix | 26 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix index ff99776..7f72133 100644 --- a/hosts/desktop1/configuration.nix +++ b/hosts/desktop1/configuration.nix @@ -1,4 +1,4 @@ -{ inputs, config, pkgs, ... }: +{ inputs, config, ... }: { imports = [ @@ -81,8 +81,6 @@ virt.enable = true; hyprland.enable = true; kde.enable = true; - gui-utilities.enable = true; - mouse.enable = true; docker.enable = true; steam.enable = true; office.enable = true; @@ -108,35 +106,6 @@ }; }; }; - environment.systemPackages = with pkgs; [ - wireshark - librewolf - prismlauncher - obsidian - komikku - inkscape - blender - aegisub - kdePackages.kdenlive - freecad-wayland - fritzing - element-desktop - thunderbird - kicad - ghidra - calibre - arduino-ide - arduino-cli - qbittorrent - gdb - chromium - rpi-imager - ]; - - programs = { - firefox.enable = true; - wireshark.enable = true; - }; home-manager = { extraSpecialArgs = { diff --git a/modules/nix/groups/desktop.nix b/modules/nix/groups/desktop.nix index b18e9ec..ce76c67 100644 --- a/modules/nix/groups/desktop.nix +++ b/modules/nix/groups/desktop.nix @@ -21,11 +21,37 @@ in audio.enable = true; sddm.enable = true; wireguard.enable = true; + gui-utilities.enable = true; + mouse.enable = true; tor.enable = true; }; + programs.firefox.enable = true; + programs.wireshark.enable = true; environment.systemPackages = with pkgs; [ + wireshark + librewolf + prismlauncher + obsidian + komikku + inkscape + blender + aegisub + kdePackages.kdenlive + freecad-wayland + fritzing + element-desktop + thunderbird + kicad + ghidra + calibre + arduino-ide + arduino-cli firejail + qbittorrent android-tools + gdb + chromium + rpi-imager ]; }; }