From 2782bba090c005f0b34b4b2f01065c56f24d0954 Mon Sep 17 00:00:00 2001 From: Sakooooo <78461130+Sakooooo@users.noreply.github.com> Date: Wed, 4 Sep 2024 21:46:54 +0400 Subject: [PATCH] (feat): switched to ags ags 2 ags 3 --- config/ags/config.js | 6 +-- config/hyprland/hyprland.conf | 3 +- flake.lock | 77 ++++++++++++++++++++-------- flake.nix | 10 ++-- modules/desktop/hyprland/default.nix | 10 ++-- 5 files changed, 72 insertions(+), 34 deletions(-) diff --git a/config/ags/config.js b/config/ags/config.js index 3b58aa73..8c2137a6 100644 --- a/config/ags/config.js +++ b/config/ags/config.js @@ -215,11 +215,11 @@ function Bar(monitor = 0) { App.config({ style: "./style.css", windows: [ - Bar(), + // Bar(), // you can call it, for each monitor - // Bar(0), - // Bar(1) + Bar(0), + Bar(1) ], }) diff --git a/config/hyprland/hyprland.conf b/config/hyprland/hyprland.conf index 50fe8abb..f3d0f1ab 100644 --- a/config/hyprland/hyprland.conf +++ b/config/hyprland/hyprland.conf @@ -27,7 +27,8 @@ exec-once = dbus-update-activation-environment --systemd --all # background exec-once = hyprpaper # bar -exec-once = /home/sako/.config/waybar/launch-waybar.sh +# exec-once = /home/sako/.config/waybar/launch-waybar.sh +exec-once = /home/sako/.config/ags/launch-ags.sh # notification dameon exec-once = mako # exec-once = /home/sako/.config/ags/launch-ags.sh diff --git a/flake.lock b/flake.lock index 714cf994..691cd070 100644 --- a/flake.lock +++ b/flake.lock @@ -22,6 +22,27 @@ "type": "github" } }, + "ags": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1721306136, + "narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=", + "owner": "Aylur", + "repo": "ags", + "rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c", + "type": "github" + }, + "original": { + "owner": "Aylur", + "repo": "ags", + "type": "github" + } + }, "aquamarine": { "inputs": { "hyprutils": [ @@ -111,7 +132,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -184,7 +205,7 @@ "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_2", - "systems": "systems_3", + "systems": "systems_4", "xdph": "xdph" }, "locked": { @@ -294,7 +315,7 @@ "rose-pine-hyprcursor", "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1709914708, @@ -316,7 +337,7 @@ "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": "nixpkgs_3", - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1725200438, @@ -563,6 +584,7 @@ "root": { "inputs": { "NixOS-WSL": "NixOS-WSL", + "ags": "ags", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "hyprland": "hyprland", @@ -630,21 +652,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -659,6 +666,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_4": { "locked": { "lastModified": 1689347949, @@ -690,6 +712,21 @@ } }, "systems_6": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -706,7 +743,7 @@ }, "utils": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index 9eeaeb79..15f1e4fb 100644 --- a/flake.nix +++ b/flake.nix @@ -23,10 +23,10 @@ emacs-overlay = { url = "github:nix-community/emacs-overlay"; }; - # ags = { - # url = "github:Aylur/ags"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + ags = { + url = "github:Aylur/ags"; + inputs.nixpkgs.follows = "nixpkgs"; + }; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; hyprpaper.url = "github:hyprwm/hyprpaper"; rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; @@ -42,7 +42,7 @@ hyprland, hyprpaper, rose-pine-hyprcursor, - # ags, + ags, ... } @ inputs: let inherit (self) outputs; diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix index b88b4ce7..70ac0bed 100644 --- a/modules/desktop/hyprland/default.nix +++ b/modules/desktop/hyprland/default.nix @@ -105,7 +105,7 @@ in waybar # lock # swaylock - # ags + inputs.ags.packages.${pkgs.system}.default brightnessctl inotify-tools greetd.tuigreet @@ -123,7 +123,7 @@ in programs.hyprlock.enable = true; # ags battery - # services.upower.enable = true; + services.upower.enable = true; # piece of shit thanks! services.emacs.startWithGraphical = false; @@ -149,9 +149,9 @@ in # this automatically sets the types # thanks PartyWumpus # https://github.com/PartyWumpus/dotfiles/blob/277949d84d53a58a3f52be935cd3c581c89d5d7c/modules/hyprland/hyprland.nix#L492 - # "/nixos/config/ags/types" = { - # source = "${inputs.ags.packages.x86_64-linux.agsWithTypes.out}/share/com.github.Aylur.ags/types"; - # }; + "/nixos/config/ags/types" = { + source = "${inputs.ags.packages.x86_64-linux.agsWithTypes.out}/share/com.github.Aylur.ags/types"; + }; }; xdg.configFile = { hypr = {