Compare commits
2 Commits
4caac02796
...
406cfcdcca
| Author | SHA1 | Date | |
|---|---|---|---|
| 406cfcdcca | |||
| daf346127a |
@@ -14,7 +14,7 @@
|
||||
modules = with self.nixosModules; [
|
||||
audio
|
||||
systemTheme
|
||||
quickshell
|
||||
quickshell
|
||||
];
|
||||
|
||||
runtimePkgs = self'.packages.hyprland.passthru.runtimePackages;
|
||||
@@ -28,10 +28,10 @@
|
||||
imports = modules;
|
||||
|
||||
options = {
|
||||
hyprland.enablePlugins = lib.mkOption {
|
||||
tabletSupport = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
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";
|
||||
pluginFile = pkgs.writeText "plugins.lua" ''
|
||||
hl.on("hyprland.start", function ()
|
||||
${lib.optionalString config.hyprland.enablePlugins ''
|
||||
${lib.optionalString config.tabletSupport ''
|
||||
hl.exec_cmd("hyprctl plugin load ${hyprgrassPath}")
|
||||
''}
|
||||
end)
|
||||
|
||||
@@ -13,9 +13,9 @@
|
||||
quickshell
|
||||
]
|
||||
++ (
|
||||
if config.hyprland.enablePlugins == true
|
||||
if config.tabletSupport == true
|
||||
then
|
||||
# If on tablet enable on screen keyboard
|
||||
# If on tablet enable on screen keyboard
|
||||
(with pkgs; [
|
||||
wvkbd
|
||||
])
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
thinkpadFanControl
|
||||
upower
|
||||
({...}: {
|
||||
hyprland.enablePlugins = true;
|
||||
tabletSupport = true;
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
@@ -1,13 +1,5 @@
|
||||
{
|
||||
self,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
flake.nixosModules.network = {
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
{moduleWithSystem, ...}: {
|
||||
flake.nixosModules.network = moduleWithSystem ({...}: {config, ...}: {
|
||||
networking = {
|
||||
networkmanager = {
|
||||
enable = true;
|
||||
@@ -22,7 +14,11 @@
|
||||
services.unbound = {
|
||||
enable = true;
|
||||
};
|
||||
programs.nm-applet.enable =
|
||||
if config.tabletSupport == true
|
||||
then true
|
||||
else false;
|
||||
|
||||
systemd.services.NetworkManager-wait-online.enable = false;
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user