removed non-functional hyprland module in favour of a symlinked file
This commit is contained in:
8
flake.lock
generated
8
flake.lock
generated
@@ -374,11 +374,11 @@
|
||||
"wshowkeys": "wshowkeys"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1787581843,
|
||||
"narHash": "sha256-cqdct8W+Q7f1BXt9d+G0GMJP9j0wtFDMrf1z/xGU4eI=",
|
||||
"lastModified": 1787681733,
|
||||
"narHash": "sha256-+KuqE3sLF/rSO9QU3ByxPVYhkl3WH9rPOIvZZARK2LM=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "e83ab7a6f808006c62cc9d4d092def098c710bbc",
|
||||
"revCount": 64,
|
||||
"rev": "31e7c1ccb7b6a0cb396fa57846232ab8c5bd7e81",
|
||||
"revCount": 65,
|
||||
"type": "git",
|
||||
"url": "https://git.voidarc.co.uk/voidarc/hypr"
|
||||
},
|
||||
|
||||
@@ -10,13 +10,9 @@
|
||||
inputs',
|
||||
...
|
||||
}: {config, ...}: let
|
||||
modules = with self.nixosModules;
|
||||
[
|
||||
modules = with self.nixosModules; [
|
||||
audio
|
||||
systemTheme
|
||||
]
|
||||
++ [
|
||||
inputs.hyprland.inputs.hyprland.nixosModules.default
|
||||
];
|
||||
|
||||
runtimePkgs = self'.packages.hyprland.passthru.runtimePackages;
|
||||
@@ -38,15 +34,9 @@
|
||||
};
|
||||
|
||||
config = {
|
||||
programs.hyprland =
|
||||
{
|
||||
programs.hyprland = {
|
||||
enable = true;
|
||||
package = self'.packages.hyprland;
|
||||
}
|
||||
// lib.optionalAttrs config.hyprland.enablePlugins {
|
||||
plugins = with inputs'; [
|
||||
hyprgrass.packages.default
|
||||
];
|
||||
};
|
||||
|
||||
services.displayManager.defaultSession = "hyprland";
|
||||
@@ -65,9 +55,20 @@
|
||||
runtimePkgs)}
|
||||
'';
|
||||
|
||||
system.activationScripts.hyprConfig = lib.stringAfter ["specialfs"] ''
|
||||
system.activationScripts.hyprConfig = let
|
||||
pluginFile = builtins.toFile "plugins.lua" ''
|
||||
hl.on("hyprland.start", function ()
|
||||
${lib.optionalString config.hyprland.enablePlugins ''
|
||||
hl.exec("hyprctl plugin load ${inputs'.hyprgrass.default}/lib/lib${inputs'.hyprgrass.default.pname}.so")
|
||||
''}
|
||||
end)
|
||||
'';
|
||||
in
|
||||
lib.stringAfter ["specialfs"] ''
|
||||
mkdir -p /run/hypr/config
|
||||
rm -rf /run/hypr/config/*
|
||||
ln -sfn ${inputs'.hyprland.packages.repo-files}/* /run/hypr/config
|
||||
ln -sfn ${pluginFile} /run/hypr/config/plugins.lua
|
||||
'';
|
||||
};
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user