Moved AGS project to root, and refactored with flake.
This commit is contained in:
commit
95710adabe
10 changed files with 297 additions and 0 deletions
1
.envrc
Normal file
1
.envrc
Normal file
|
@ -0,0 +1 @@
|
|||
use flake
|
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
@ -0,0 +1,2 @@
|
|||
node_modules/
|
||||
@girs/
|
10
app.ts
Normal file
10
app.ts
Normal file
|
@ -0,0 +1,10 @@
|
|||
import { App } from "astal/gtk4"
|
||||
import style from "./style.scss"
|
||||
import Bar from "./widget/Bar"
|
||||
|
||||
App.start({
|
||||
css: style,
|
||||
main() {
|
||||
App.get_monitors().map(Bar)
|
||||
},
|
||||
})
|
21
env.d.ts
vendored
Normal file
21
env.d.ts
vendored
Normal file
|
@ -0,0 +1,21 @@
|
|||
declare const SRC: string
|
||||
|
||||
declare module "inline:*" {
|
||||
const content: string
|
||||
export default content
|
||||
}
|
||||
|
||||
declare module "*.scss" {
|
||||
const content: string
|
||||
export default content
|
||||
}
|
||||
|
||||
declare module "*.blp" {
|
||||
const content: string
|
||||
export default content
|
||||
}
|
||||
|
||||
declare module "*.css" {
|
||||
const content: string
|
||||
export default content
|
||||
}
|
91
flake.lock
generated
Normal file
91
flake.lock
generated
Normal file
|
@ -0,0 +1,91 @@
|
|||
{
|
||||
"nodes": {
|
||||
"ags": {
|
||||
"inputs": {
|
||||
"astal": "astal",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738087375,
|
||||
"narHash": "sha256-GLyNtU9A2VN22jNRHZ2OXuFfTJLh8uEVVt+ftsKUX0c=",
|
||||
"owner": "aylur",
|
||||
"repo": "ags",
|
||||
"rev": "a6a7a0adb17740f4c34a59902701870d46fbb6a4",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "aylur",
|
||||
"repo": "ags",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"astal": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"ags",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737670815,
|
||||
"narHash": "sha256-ZCxxshGN7XooabArcoGkYSNx5yVunqjKJi2aTv6cznI=",
|
||||
"owner": "aylur",
|
||||
"repo": "astal",
|
||||
"rev": "127e9cdcbf173846a3c40ddc0abfbb038df48042",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "aylur",
|
||||
"repo": "astal",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"astal_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742571008,
|
||||
"narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=",
|
||||
"owner": "aylur",
|
||||
"repo": "astal",
|
||||
"rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "aylur",
|
||||
"repo": "astal",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1742422364,
|
||||
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"ags": "ags",
|
||||
"astal": "astal_2",
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
72
flake.nix
Normal file
72
flake.nix
Normal file
|
@ -0,0 +1,72 @@
|
|||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
|
||||
|
||||
ags = {
|
||||
url = "github:aylur/ags";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
astal = {
|
||||
url = "github:aylur/astal";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{ self, nixpkgs, ... }@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
|
||||
extraPkgs = with pkgs; [
|
||||
fzf
|
||||
];
|
||||
|
||||
agsPkgs = with inputs.ags.packages.${pkgs.system}; [
|
||||
apps
|
||||
bluetooth
|
||||
greet
|
||||
hyprland
|
||||
mpris
|
||||
network
|
||||
notifd
|
||||
tray
|
||||
wireplumber
|
||||
];
|
||||
in
|
||||
{
|
||||
packages.${system} = {
|
||||
default = inputs.ags.lib.bundle {
|
||||
inherit pkgs;
|
||||
src = ./.;
|
||||
name = "yash"; # name of executable
|
||||
entry = "app.ts";
|
||||
gtk4 = true;
|
||||
|
||||
# additional libraries and executables to add to gjs' runtime
|
||||
extraPackages = extraPkgs ++ agsPkgs;
|
||||
};
|
||||
};
|
||||
|
||||
devShells.${system} = {
|
||||
default = pkgs.mkShell {
|
||||
nativeBuildInputs = [
|
||||
pkgs.wrapGAppsHook
|
||||
pkgs.gobject-introspection
|
||||
(inputs.ags.packages.${system}.agsFull.override {
|
||||
extraPackages = [
|
||||
# include extra libs here to add to the gjs runtime environment
|
||||
pkgs.libgtop
|
||||
];
|
||||
})
|
||||
] ++ extraPkgs;
|
||||
|
||||
buildInputs = [
|
||||
inputs.astal.packages.${system}.default
|
||||
pkgs.pnpm
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
41
scripts/git.fish
Normal file
41
scripts/git.fish
Normal file
|
@ -0,0 +1,41 @@
|
|||
#!/usr/bin/env fish
|
||||
|
||||
if test (count $argv) -ne 1
|
||||
echo "Usage: $argv0 push|pull"
|
||||
exit 1
|
||||
end
|
||||
|
||||
set action $argv[1]
|
||||
set subtree_path "ags"
|
||||
set remote "RyotShell-origin"
|
||||
set branch "main"
|
||||
|
||||
cd (git rev-parse --show-toplevel)
|
||||
switch $action
|
||||
case push
|
||||
set changes (git status --porcelain "$subtree_path")
|
||||
if test -n "$changes"
|
||||
set_color yellow; echo " Cannot push. There are uncommitted changes in $subtree_path."
|
||||
exit 1
|
||||
end
|
||||
git subtree push --prefix="$subtree_path" $remote $branch
|
||||
case pull
|
||||
git subtree pull --prefix="$subtree_path" $remote $branch
|
||||
case commit
|
||||
set changes (git status --porcelain "$subtree_path")
|
||||
if test -z "$changes"
|
||||
echo "No changes to commit in $subtree_path."
|
||||
exit 0
|
||||
end
|
||||
echo " Enter commit message:"
|
||||
read commit_message
|
||||
if test -z "$commit_message"
|
||||
echo "Commit message cannot be empty."
|
||||
exit 1
|
||||
end
|
||||
git add "$subtree_path"
|
||||
git commit -m "$commit_message"
|
||||
case '*'
|
||||
echo "Unknown argument. Use push or pull."
|
||||
exit 1
|
||||
end
|
20
style.scss
Normal file
20
style.scss
Normal file
|
@ -0,0 +1,20 @@
|
|||
// https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/gtk/theme/Adwaita/_colors-public.scss
|
||||
$fg-color: #{"@theme_fg_color"};
|
||||
$bg-color: #{"@theme_bg_color"};
|
||||
|
||||
window.Bar {
|
||||
background: transparent;
|
||||
color: $fg-color;
|
||||
font-weight: bold;
|
||||
|
||||
>centerbox {
|
||||
background: $bg-color;
|
||||
border-radius: 10px;
|
||||
margin: 8px;
|
||||
}
|
||||
|
||||
button {
|
||||
border-radius: 8px;
|
||||
margin: 2px;
|
||||
}
|
||||
}
|
14
tsconfig.json
Normal file
14
tsconfig.json
Normal file
|
@ -0,0 +1,14 @@
|
|||
{
|
||||
"$schema": "https://json.schemastore.org/tsconfig",
|
||||
"compilerOptions": {
|
||||
"experimentalDecorators": true,
|
||||
"strict": true,
|
||||
"target": "ES2022",
|
||||
"module": "ES2022",
|
||||
"moduleResolution": "Bundler",
|
||||
// "checkJs": true,
|
||||
// "allowJs": true,
|
||||
"jsx": "react-jsx",
|
||||
"jsxImportSource": "astal/gtk4",
|
||||
}
|
||||
}
|
25
widget/Bar.tsx
Normal file
25
widget/Bar.tsx
Normal file
|
@ -0,0 +1,25 @@
|
|||
import { App, Astal, Gtk, Gdk } from "astal/gtk4";
|
||||
import { Variable } from "astal";
|
||||
|
||||
const time = Variable("").poll(1000, "date");
|
||||
|
||||
export default function Bar(gdkmonitor: Gdk.Monitor) {
|
||||
const { TOP, LEFT, RIGHT } = Astal.WindowAnchor;
|
||||
|
||||
return (
|
||||
<window visible cssClasses={["Bar"]} gdkmonitor={gdkmonitor} exclusivity={Astal.Exclusivity.EXCLUSIVE} anchor={TOP | LEFT | RIGHT} application={App}>
|
||||
<centerbox cssName="centerbox">
|
||||
<button onClicked="echo hello" hexpand halign={Gtk.Align.CENTER}>
|
||||
Welcome to AGS!
|
||||
</button>
|
||||
<box />
|
||||
<menubutton hexpand halign={Gtk.Align.CENTER}>
|
||||
<label label={time()} />
|
||||
<popover>
|
||||
<Gtk.Calendar />
|
||||
</popover>
|
||||
</menubutton>
|
||||
</centerbox>
|
||||
</window>
|
||||
);
|
||||
}
|
Loading…
Add table
Reference in a new issue