remove darwin from supported systems
This commit is contained in:
Aylur
2024-12-29 18:48:59 +01:00
committed by GitHub
parent 28b634d8ed
commit 2fbbdd7b41
2 changed files with 65 additions and 110 deletions

63
flake.lock generated
View File

@@ -3,14 +3,16 @@
"ags": { "ags": {
"inputs": { "inputs": {
"astal": "astal", "astal": "astal",
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1735430786, "lastModified": 1735485506,
"narHash": "sha256-y3GiH8wFEQh4HNBfW1jlSORxwCzsKB8URufYAGo8zQE=", "narHash": "sha256-7CWr3Q83KnGiLUn0oaboafLMOXQ0X9/fjFRVY1xopbM=",
"owner": "aylur", "owner": "aylur",
"repo": "ags", "repo": "ags",
"rev": "99f1c3f5b51ac86a42319ef25ef2cea413379505", "rev": "251d39413543264361898b02035775aa3e46fe52",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -40,57 +42,7 @@
"type": "github" "type": "github"
} }
}, },
"astal_2": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1735382966,
"narHash": "sha256-xBh40ENNkS0GdgKT+zFT9lBHiAwrM1iQEjkDDp208lQ=",
"owner": "aylur",
"repo": "astal",
"rev": "b89b08ef482a30726d9e716f593b449ce640099f",
"type": "github"
},
"original": {
"owner": "aylur",
"repo": "astal",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": {
"lastModified": 1734649271,
"narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1734424634,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1735291276, "lastModified": 1735291276,
"narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=",
@@ -109,8 +61,7 @@
"root": { "root": {
"inputs": { "inputs": {
"ags": "ags", "ags": "ags",
"astal": "astal_2", "nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs_3"
} }
} }
}, },

112
flake.nix
View File

@@ -1,17 +1,19 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
ags.url = "github:aylur/ags";
astal.url = "github:aylur/astal"; ags = {
url = "github:aylur/ags";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { self, nixpkgs, ags, astal }: let outputs = {
systems = [ self,
"x86_64-linux" nixpkgs,
"x86_64-darwin" ags,
"aarch64-darwin" }: let
"aarch64-linux" systems = ["x86_64-linux" "aarch64-linux"];
];
forEachSystem = nixpkgs.lib.genAttrs systems; forEachSystem = nixpkgs.lib.genAttrs systems;
in { in {
packages = forEachSystem (system: let packages = forEachSystem (system: let
@@ -23,50 +25,52 @@
name = "hyprpanel"; # name of executable name = "hyprpanel"; # name of executable
entry = "app.ts"; entry = "app.ts";
# additional libraries and executables to add to gjs' runtime extraPackages =
extraPackages = [ (with ags.packages.${system}; [
ags.packages.${system}.agsFull tray
astal.packages.${system}.tray hyprland
astal.packages.${system}.hyprland apps
astal.packages.${system}.io battery
astal.packages.${system}.apps bluetooth
astal.packages.${system}.battery mpris
astal.packages.${system}.bluetooth network
astal.packages.${system}.mpris notifd
astal.packages.${system}.network powerprofiles
astal.packages.${system}.notifd wireplumber
astal.packages.${system}.powerprofiles ])
astal.packages.${system}.wireplumber ++ (with pkgs; [
pkgs.fish fish
pkgs.typescript typescript
pkgs.libnotify libnotify
pkgs.dart-sass dart-sass
pkgs.fd fd
pkgs.btop btop
pkgs.bluez bluez
pkgs.libgtop libgtop
pkgs.gobject-introspection gobject-introspection
pkgs.glib glib
pkgs.bluez-tools bluez-tools
pkgs.grimblast grimblast
pkgs.brightnessctl brightnessctl
pkgs.gnome-bluetooth gnome-bluetooth
(pkgs.python3.withPackages (python-pkgs: with python-pkgs; [ (python3.withPackages (ps:
gpustat with ps; [
dbus-python gpustat
pygobject3 dbus-python
])) pygobject3
pkgs.matugen ]))
pkgs.hyprpicker matugen
pkgs.hyprsunset hyprpicker
pkgs.hypridle hyprsunset
pkgs.wireplumber hypridle
pkgs.networkmanager wireplumber
pkgs.upower networkmanager
pkgs.gvfs upower
pkgs.swww gvfs
pkgs.pywal swww
] ++ (nixpkgs.lib.optionals (system == "x86_64-linux") [pkgs.gpu-screen-recorder]); pywal
])
++ (nixpkgs.lib.optionals (system == "x86_64-linux") [pkgs.gpu-screen-recorder]);
}; };
}); });
@@ -76,7 +80,7 @@
if [ "$#" -eq 0 ]; then if [ "$#" -eq 0 ]; then
exec ${self.packages.${final.stdenv.system}.default}/bin/hyprpanel exec ${self.packages.${final.stdenv.system}.default}/bin/hyprpanel
else else
exec ${astal.packages.${final.stdenv.system}.io}/bin/astal -i hyprpanel "$@" exec ${ags.packages.${final.stdenv.system}.io}/bin/astal -i hyprpanel "$@"
fi fi
''; '';
}; };