diff --git a/flake.lock b/flake.lock index bd133c2..66d48a9 100644 --- a/flake.lock +++ b/flake.lock @@ -1,47 +1,5 @@ { "nodes": { - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732307740, - "narHash": "sha256-ZDsYdZOtg5qkK/wfLLB83B3SI+fE32S+/6Ey0ggHODM=", - "owner": "Aylur", - "repo": "ags", - "rev": "81159966eb8b39b66c3efc133982fd76920c9605", - "type": "github" - }, - "original": { - "owner": "Aylur", - "repo": "ags", - "type": "github" - } - }, - "astal": { - "inputs": { - "nixpkgs": [ - "ags", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1731952585, - "narHash": "sha256-Sh1E7sJd8JJM3PCU1ZOei/QWz97OLCENIi2rTRoaniw=", - "owner": "aylur", - "repo": "astal", - "rev": "664c7a4ddfcf48c6e8accd3c33bb94424b0e8609", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -611,7 +569,6 @@ }, "root": { "inputs": { - "ags": "ags", "emacs": "emacs", "eww": "eww", "home-manager": "home-manager", diff --git a/flake.nix b/flake.nix index 5c159a0..2b9a950 100644 --- a/flake.nix +++ b/flake.nix @@ -31,10 +31,10 @@ url = "github:elkowar/eww"; inputs.nixpkgs.follows = "nixpkgs"; }; - ags = { - url = "github:Aylur/ags"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # ags = { + # url = "github:Aylur/ags"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; emacs = { url = "github:nix-community/emacs-overlay/dd38645351b6f14cda47c81456131c86b11386db"; inputs.nixpkgs.follows = "nixpkgs"; @@ -64,7 +64,7 @@ emacs, nix-bitcoin, eww, - ags, + # ags, stylix, ... }: let system = "x86_64-linux"; @@ -117,7 +117,7 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit ags; }; + # home-manager.extraSpecialArgs = { inherit ags; }; home-manager.users.chris = import ./home/home.nix; home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ]; } @@ -137,7 +137,7 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { inherit ags; }; + # home-manager.extraSpecialArgs = { inherit ags; }; home-manager.users.chris = import ./home/home.nix; } ]; diff --git a/home/home.nix b/home/home.nix index 91a2d4f..bed3f54 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ags, ... }: +{ config, lib, pkgs, ... }: let laptop = builtins.readFile "/etc/hostname" == "syl\n"; @@ -6,7 +6,7 @@ in { imports = [ ./modules/hyprland.nix - ags.homeManagerModules.default + # ags.homeManagerModules.default # ./modules/plasma.nix ]; # Home Manager needs a bit of information about you and the @@ -801,14 +801,14 @@ tooltip label { source = ../.config/fish/functions; }; - programs.ags = { - enable = true; - extraPackages = with pkgs; [ - gtksourceview - webkitgtk - accountsservice - ]; - }; + # programs.ags = { + # enable = true; + # extraPackages = with pkgs; [ + # gtksourceview + # webkitgtk + # accountsservice + # ]; + # }; programs.fish = { enable = true; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index c46ba52..f5dc7e2 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -309,9 +309,8 @@ in "SUPERALT,a,movetoworkspace,special:agenda" "SUPER,g,togglespecialworkspace,agenda" - "SUPERSHIFT,g,exec,ags --toggle-window ${if laptop then "bar0" else "bar2"}" + "SUPERSHIFT,g,exec,waybar.sh" "SUPERALT,n,exec,eww update rightside=true" - "SUPERSHIFT,b,exec,restart-ags" ]; binde = [