diff --git a/home/hypr/hyprland/lua_converter.py b/home/hypr/hyprland/lua_converter.py deleted file mode 100644 index 2d077c9..0000000 --- a/home/hypr/hyprland/lua_converter.py +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i python3 -p python3 - -import sys -import re -import os - -def convert_file(filepath): - if not os.path.isfile(filepath): - return - - with open(filepath, 'r', encoding='utf-8') as f: - lines = f.readlines() - - new_lines = [] - changed = False - - # "CTRL $mainMod, right, layoutmsg, focus r" - pattern = re.compile(r'^(\s*)"([^"]*,[^"]*)"\s*$') - - for line in lines: - match = pattern.match(line) - if match: - indent = match.group(1) - content = match.group(2) - parts = [f'"{p.strip()}"' for p in content.split(',')] - args_str = " ".join(parts) - new_line = f'{indent}{{ _args = [ {args_str} ]; }}\n' - new_lines.append(new_line) - changed = True - else: - new_lines.append(line) - if changed: - with open(filepath, 'w', encoding='utf-8') as f: - f.writelines(new_lines) - print(f"Converted: {filepath}") - else: - print(f"Skipped (no changes): {filepath}") - -if __name__ == "__main__": - if len(sys.argv) < 2: - print("Usage: python3 lua_converter.py ...") - sys.exit(1) - - for file in sys.argv[1:]: - convert_file(file) diff --git a/home/hyprland.nix b/home/hyprland.nix index 6005315..a7d1347 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -9,7 +9,8 @@ wayland.windowManager.hyprland = { enable = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + configType = "hyprlang"; xwayland.enable = true; systemd.enable = false; systemd.variables = [ "-all" ]; diff --git a/nixos/desktop/window-managers/hyprland.nix b/nixos/desktop/window-managers/hyprland.nix index 06de54b..2ca8c62 100644 --- a/nixos/desktop/window-managers/hyprland.nix +++ b/nixos/desktop/window-managers/hyprland.nix @@ -7,8 +7,8 @@ { programs.hyprland = { enable = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; - portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; xwayland.enable = true; withUWSM = true; };