From 49595c3811d97e07c0712a7d7cb2744a8e0ce1d0 Mon Sep 17 00:00:00 2001 From: Janis Hutz Date: Tue, 25 Mar 2025 13:51:56 +0100 Subject: [PATCH] Restructure, move launcher to astal gtk4 --- .gitignore | 2 ++ build/build.js | 9 +++++++++ build/package.json | 19 +++++++++++++++++++ config/ags/launcher/app.ts | 11 ++++++----- config/ags/launcher/tsconfig.json | 2 +- config/ags/launcher/ui/components/calc.tsx | 0 config/ags/launcher/ui/components/cmd.tsx | 0 config/ags/launcher/ui/components/dict.tsx | 0 config/ags/launcher/ui/components/large.tsx | 0 config/ags/launcher/ui/components/list.tsx | 0 config/ags/launcher/ui/components/medium.tsx | 0 .../{ui/AppLauncher.tsx => widget/Bar.tsx} | 19 ++++++++++++------- scripts/build.js | 0 13 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 .gitignore create mode 100644 build/build.js create mode 100644 build/package.json delete mode 100644 config/ags/launcher/ui/components/calc.tsx delete mode 100644 config/ags/launcher/ui/components/cmd.tsx delete mode 100644 config/ags/launcher/ui/components/dict.tsx delete mode 100644 config/ags/launcher/ui/components/large.tsx delete mode 100644 config/ags/launcher/ui/components/list.tsx delete mode 100644 config/ags/launcher/ui/components/medium.tsx rename config/ags/launcher/{ui/AppLauncher.tsx => widget/Bar.tsx} (62%) delete mode 100644 scripts/build.js diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..504afef --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +node_modules/ +package-lock.json diff --git a/build/build.js b/build/build.js new file mode 100644 index 0000000..738d104 --- /dev/null +++ b/build/build.js @@ -0,0 +1,9 @@ +// Using commonjs instead of ejs, because more widely compatible +const mustache = require( 'mustache' ); + +// Define view options (for rendering with mustache) +const view = { + // Colours + 'colour_foreground': '', +} + diff --git a/build/package.json b/build/package.json new file mode 100644 index 0000000..f3f72d1 --- /dev/null +++ b/build/package.json @@ -0,0 +1,19 @@ +{ + "name": "janishutz-config-build", + "version": "1.0.0", + "description": "Build janishutz's dotfiles configs", + "repository": { + "type": "git", + "url": "https://git.janishutz.com/janishutz/dotfiles" + }, + "license": "GPL-3.0-or-later", + "author": "janishutz", + "type": "commonjs", + "main": "build.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "dependencies": { + "mustache": "^4.2.0" + } +} diff --git a/config/ags/launcher/app.ts b/config/ags/launcher/app.ts index 7428115..7e8cc7c 100644 --- a/config/ags/launcher/app.ts +++ b/config/ags/launcher/app.ts @@ -1,9 +1,10 @@ -import { App } from "astal/gtk3" +import { App } from "astal/gtk4" import style from "./style.scss" -import Applauncher from "./ui/AppLauncher" +import Bar from "./widget/Bar" App.start({ - instanceName: "launcher", css: style, - main: Applauncher, -}); + main() { + App.get_monitors().map(Bar) + }, +}) diff --git a/config/ags/launcher/tsconfig.json b/config/ags/launcher/tsconfig.json index 9471e35..a92bc43 100644 --- a/config/ags/launcher/tsconfig.json +++ b/config/ags/launcher/tsconfig.json @@ -9,6 +9,6 @@ // "checkJs": true, // "allowJs": true, "jsx": "react-jsx", - "jsxImportSource": "astal/gtk3", + "jsxImportSource": "astal/gtk4", } } diff --git a/config/ags/launcher/ui/components/calc.tsx b/config/ags/launcher/ui/components/calc.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/config/ags/launcher/ui/components/cmd.tsx b/config/ags/launcher/ui/components/cmd.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/config/ags/launcher/ui/components/dict.tsx b/config/ags/launcher/ui/components/dict.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/config/ags/launcher/ui/components/large.tsx b/config/ags/launcher/ui/components/large.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/config/ags/launcher/ui/components/list.tsx b/config/ags/launcher/ui/components/list.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/config/ags/launcher/ui/components/medium.tsx b/config/ags/launcher/ui/components/medium.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/config/ags/launcher/ui/AppLauncher.tsx b/config/ags/launcher/widget/Bar.tsx similarity index 62% rename from config/ags/launcher/ui/AppLauncher.tsx rename to config/ags/launcher/widget/Bar.tsx index 2ea91a5..c2db8c5 100644 --- a/config/ags/launcher/ui/AppLauncher.tsx +++ b/config/ags/launcher/widget/Bar.tsx @@ -1,31 +1,36 @@ -import { App, Astal, Gtk, Gdk } from "astal/gtk3" +import { App, Astal, Gtk, Gdk } from "astal/gtk4" import { Variable } from "astal" const time = Variable("").poll(1000, "date") -export default function AppLauncher(gdkmonitor: Gdk.Monitor) { +export default function Bar(gdkmonitor: Gdk.Monitor) { const { TOP, LEFT, RIGHT } = Astal.WindowAnchor return - + - + + + + } diff --git a/scripts/build.js b/scripts/build.js deleted file mode 100644 index e69de29..0000000