diff --git a/configurations/home-manager/leyla/packages.nix b/configurations/home-manager/leyla/packages.nix index d9f1b32..460fa1f 100644 --- a/configurations/home-manager/leyla/packages.nix +++ b/configurations/home-manager/leyla/packages.nix @@ -29,62 +29,66 @@ in { ) ++ ( lib.lists.optionals userConfig.isDesktopUser ( - with pkgs; [ + (with pkgs; [ # helvetica font aileron gnomeExtensions.dash-to-dock - #foss platforms - signal-desktop - bitwarden - ungoogled-chromium - libreoffice - inkscape - gimp - krita - freecad - # cura - # kicad-small - makemkv - transmission_4-gtk - onionshare - # rhythmbox - (lib.mkIf hardware.graphicsAcceleration.enable obs-studio) - # wireshark - # rpi-imager - # fritzing - mfoc - tor-browser - anki - pdfarranger - calibre - qbittorrent - - # proprietary platforms - discord - obsidian - # steam - (lib.mkIf hardware.graphicsAcceleration.enable davinci-resolve) - # development tools - # androidStudioPackages.canary - jetbrains.idea-community dbeaver-bin bruno - qFlipper proxmark3 + ]) + ++ ( + lib.lists.optionals hardware.directAccess.enable (with pkgs; [ + #foss platforms + signal-desktop-bin + bitwarden + ungoogled-chromium + libreoffice + inkscape + gimp + krita + freecad + # cura + # kicad-small + makemkv + onionshare + # rhythmbox + (lib.mkIf hardware.graphicsAcceleration.enable obs-studio) + # wireshark + # rpi-imager + # fritzing + mfoc + tor-browser + anki + pdfarranger + calibre + qbittorrent - # system tools - protonvpn-gui - openvpn - noisetorch + # proprietary platforms + discord + obsidian + # steam + (lib.mkIf hardware.graphicsAcceleration.enable davinci-resolve) - # hardware management tools - (lib.mkIf hardware.piperMouse.enable piper) - (lib.mkIf hardware.openRGB.enable openrgb) - (lib.mkIf hardware.viaKeyboard.enable via) - ] + # development tools + # androidStudioPackages.canary + jetbrains.idea-community + qFlipper + + # system tools + protonvpn-gui + openvpn + noisetorch + + # hardware management tools + (lib.mkIf hardware.piperMouse.enable piper) + (lib.mkIf hardware.openRGB.enable openrgb) + (lib.mkIf hardware.viaKeyboard.enable via) + ]) + ) ) ); }; diff --git a/configurations/nixos/horizon/configuration.nix b/configurations/nixos/horizon/configuration.nix index 5f1fd3a..ae0c8de 100644 --- a/configurations/nixos/horizon/configuration.nix +++ b/configurations/nixos/horizon/configuration.nix @@ -17,6 +17,10 @@ }; eve.isDesktopUser = true; }; + + hardware = { + directAccess.enable = true; + }; }; environment.systemPackages = [ diff --git a/configurations/nixos/twilight/configuration.nix b/configurations/nixos/twilight/configuration.nix index 73dd642..47e41ec 100644 --- a/configurations/nixos/twilight/configuration.nix +++ b/configurations/nixos/twilight/configuration.nix @@ -28,6 +28,7 @@ viaKeyboard.enable = true; openRGB.enable = true; graphicsAcceleration.enable = true; + directAccess.enable = true; }; }; diff --git a/modules/nixos-modules/desktop.nix b/modules/nixos-modules/desktop.nix index 2182cb2..cf59cd9 100644 --- a/modules/nixos-modules/desktop.nix +++ b/modules/nixos-modules/desktop.nix @@ -29,7 +29,6 @@ desktopManager.xterm.enable = false; excludePackages = with pkgs; [ xterm - transmission_4-qt atomix # puzzle game cheese # webcam tool epiphany # web browser diff --git a/modules/nixos-modules/hardware.nix b/modules/nixos-modules/hardware.nix index b002658..1b22ece 100644 --- a/modules/nixos-modules/hardware.nix +++ b/modules/nixos-modules/hardware.nix @@ -12,5 +12,8 @@ graphicsAcceleration = { enable = lib.mkEnableOption "host has a gpu for graphical acceleration"; }; + directAccess = { + enable = lib.mkEnableOption "can a host be used on its own"; + }; }; }