diff --git a/README.md b/README.md index 960b476..edd76c2 100644 --- a/README.md +++ b/README.md @@ -71,10 +71,10 @@ reboot | DM | ly | ly | | WM/DE | Hyprland | AwesomeWM | | Compositor | Hyprland | Picom (Jonaburg) | -| Bar | Astal | Wibar | +| Bar | AGS | Wibar | | Hotkeys | Hyprland | Awful | -| Launcher | Astal | Rofi | -| Notifications | Astal | Naughty | +| Launcher | AGS | Rofi | +| Notifications | AGS | Naughty | | Terminal | Wezterm | Wezterm | | Editor | Neovim | Neovim | diff --git a/flake.lock b/flake.lock index 1727cca..42b573b 100755 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1744557573, - "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=", + "lastModified": 1758577685, + "narHash": "sha256-iHT0kvsQJG+Z89quGi7rNCXEg2e3DBGfuuCMu/UwiIo=", "owner": "aylur", "repo": "ags", - "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6", + "rev": "aa7a8a2dd6e54aaeb4e13a73ed3bc2283995090b", "type": "github" }, "original": { @@ -64,32 +64,11 @@ ] }, "locked": { - "lastModified": 1742571008, - "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=", + "lastModified": 1756474652, + "narHash": "sha256-iiBU6itpEqE0spXeNJ3uJTfioSyKYjt5bNepykpDXTE=", "owner": "aylur", "repo": "astal", - "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, - "astal_2": { - "inputs": { - "nixpkgs": [ - "tpanel", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748416910, - "narHash": "sha256-FEQcs58HL8Fe4i7XlqVEUwthjxwvRvgX15gTTfW17sU=", - "owner": "aylur", - "repo": "astal", - "rev": "c1bd89a47c81c66ab5fc6872db5a916c0433fb89", + "rev": "20bd8318e4136fbd3d4eb2d64dbabc3acbc915dd", "type": "github" }, "original": { @@ -1637,17 +1616,16 @@ "tpanel": { "inputs": { "ags": "ags", - "astal": "astal_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1754642875, - "narHash": "sha256-BdLzQs/SAgHOjTWYkT7slWJA/cHyRkkbJMsao8MjKGY=", + "lastModified": 1758712174, + "narHash": "sha256-BP06CCykqlq6kCZ+BVjZmQ7t17icTO88zQ+rm2RvAas=", "owner": "tuxdotrs", "repo": "tpanel", - "rev": "6437cad6202b9398babc1dab8b74bc6217d35b7f", + "rev": "9649ab0b6ed9dac81b7f3be14b1806d3e1d60615", "type": "github" }, "original": { diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix index cafbec7..0686958 100644 --- a/modules/home/desktop/hyprland/default.nix +++ b/modules/home/desktop/hyprland/default.nix @@ -4,7 +4,7 @@ ./hyprpaper.nix ]; - home.packages = with pkgs; [astal]; + home.packages = with pkgs; [ags]; wayland.windowManager.hyprland = { enable = true; @@ -192,7 +192,7 @@ bind = [ # apps "SUPER, Return, exec, ${terminal}" - "SUPER, A, exec, astal -t app-launcher" + "SUPER, A, exec, ags toggle app-launcher" "SUPER, F, exec, ${filemanager}" "SUPER, E, exec, ${editor}" "SUPER, B, exec, ${browser}" @@ -204,9 +204,9 @@ "SUPER_SHIFT, Return, exec, ${floating_terminal}" "SUPER_SHIFT, S, exec, flameshot gui" - # astal - "SUPER_SHIFT, R, exec, astal -q; ${pkgs.tpanel}/bin/tpanel" - "SUPER_SHIFT, B, exec, astal toggle-bar" + # ags + "SUPER_SHIFT, R, exec, ags quit; ${pkgs.tpanel}/bin/tpanel" + "SUPER_SHIFT, B, exec, ags toggle bar" # hyprland "SUPER, Q, killactive" diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix index cbc1085..13b3756 100644 --- a/modules/nixos/desktop/hyprland/default.nix +++ b/modules/nixos/desktop/hyprland/default.nix @@ -9,19 +9,19 @@ (pkgs.writeShellScriptBin "mirror-display" '' hyprctl keyword monitor "eDP-1,2560x1440@90,0x0,1" \ && hyprctl keyword monitor "HDMI-A-1,preferred,0x0,1,mirror,eDP-1" \ - && astal -q \ + && ags quit \ && ${pkgs.tpanel}/bin/tpanel & '') (pkgs.writeShellScriptBin "extend-display" '' hyprctl keyword monitor "eDP-1,2560x1440@90,0x0,1" \ && hyprctl keyword monitor "HDMI-A-1,preferred,0x-1440,1" \ - && astal -q \ + && ags quit \ && ${pkgs.tpanel}/bin/tpanel & '') (pkgs.writeShellScriptBin "dock-display" '' hyprctl keyword monitor "eDP-1,disable" \ && hyprctl keyword monitor "HDMI-A-1,preferred,0x0,1" \ - && astal -q \ + && ags quit \ && ${pkgs.tpanel}/bin/tpanel & '') ]; diff --git a/overlays/default.nix b/overlays/default.nix index 6bf081b..86a7c8d 100755 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -7,7 +7,7 @@ tawm = inputs.tawm.packages.${prev.system}.default; tnvim = inputs.tnvim.packages.${prev.system}.default; tpanel = inputs.tpanel.packages.${prev.system}.default; - astal = inputs.tpanel.packages.${prev.system}.astal.default; + ags = inputs.tpanel.packages.${prev.system}.ags.default; tfolio = inputs.tfolio.packages.${prev.system}.default; trok = inputs.trok.packages.${prev.system}.default; cyber-tux = inputs.cyber-tux.packages.${prev.system}.default;