Compare commits

..

2 Commits

4 changed files with 14 additions and 18 deletions

View File

@@ -14,7 +14,7 @@
modules = with self.nixosModules; [ modules = with self.nixosModules; [
audio audio
systemTheme systemTheme
quickshell quickshell
]; ];
runtimePkgs = self'.packages.hyprland.passthru.runtimePackages; runtimePkgs = self'.packages.hyprland.passthru.runtimePackages;
@@ -28,10 +28,10 @@
imports = modules; imports = modules;
options = { options = {
hyprland.enablePlugins = lib.mkOption { tabletSupport = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = false;
description = "Enable plugins, basically just touchscreen support"; description = "Enable tablet support across all modules";
}; };
}; };
@@ -62,7 +62,7 @@
hyprgrassPath = "${inputs'.hyprgrass.packages.default}/lib/libhyprgrass.so"; hyprgrassPath = "${inputs'.hyprgrass.packages.default}/lib/libhyprgrass.so";
pluginFile = pkgs.writeText "plugins.lua" '' pluginFile = pkgs.writeText "plugins.lua" ''
hl.on("hyprland.start", function () hl.on("hyprland.start", function ()
${lib.optionalString config.hyprland.enablePlugins '' ${lib.optionalString config.tabletSupport ''
hl.exec_cmd("hyprctl plugin load ${hyprgrassPath}") hl.exec_cmd("hyprctl plugin load ${hyprgrassPath}")
''} ''}
end) end)

View File

@@ -13,9 +13,9 @@
quickshell quickshell
] ]
++ ( ++ (
if config.hyprland.enablePlugins == true if config.tabletSupport == true
then then
# If on tablet enable on screen keyboard # If on tablet enable on screen keyboard
(with pkgs; [ (with pkgs; [
wvkbd wvkbd
]) ])

View File

@@ -12,7 +12,7 @@
thinkpadFanControl thinkpadFanControl
upower upower
({...}: { ({...}: {
hyprland.enablePlugins = true; tabletSupport = true;
}) })
]; ];
}; };

View File

@@ -1,13 +1,5 @@
{ {moduleWithSystem, ...}: {
self, flake.nixosModules.network = moduleWithSystem ({...}: {config, ...}: {
inputs,
...
}: {
flake.nixosModules.network = {
pkgs,
lib,
...
}: {
networking = { networking = {
networkmanager = { networkmanager = {
enable = true; enable = true;
@@ -22,7 +14,11 @@
services.unbound = { services.unbound = {
enable = true; enable = true;
}; };
programs.nm-applet.enable =
if config.tabletSupport == true
then true
else false;
systemd.services.NetworkManager-wait-online.enable = false; systemd.services.NetworkManager-wait-online.enable = false;
}; });
} }