matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(ags nvim): get eslint to work again and update deps
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-08-01 12:54:32 -04:00
parent a79cb29aaf
commit 28615e8152
31 changed files with 773 additions and 734 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
common/home/neovim/langs/web.nix
View file

@ -66,6 +66,41 @@ in
command = 'EslintFixAll', command = 'EslintFixAll',
}); });
end, end,
settings = {
validate = 'on',
packageManager = 'npm',
useESLintClass = true,
useFlatConfig = true,
experimental = {
useFlatConfig = true,
},
codeAction = {
disableRuleComment = {
enable = true,
location = 'separateLine'
},
showDocumentation = {
enable = true,
},
},
codeActionOnSave = {
mode = 'all',
rules = {},
},
format = true,
quiet = false,
onIgnoredFiles = 'off',
rulesCustomizations = {},
run = 'onType',
problems = {
shortenToSingleLine = false,
},
nodePath = "",
workingDirectory = {
mode = 'location',
},
},
}); });
lsp.cssls.setup({ lsp.cssls.setup({

39
modules/ags/config/eslint.config.js
View file

@ -1,29 +1,23 @@
// TODO: switch to typescript https://github.com/eslint/eslint/pull/18134 // TODO: switch to typescript https://github.com/eslint/eslint/pull/18134
import eslint from '@eslint/js'; import eslint from '@eslint/js';
import tseslint from 'typescript-eslint';
import tsPlugin from '@typescript-eslint/eslint-plugin';
import stylistic from '@stylistic/eslint-plugin';
// import stylisticRules from '@stylistic/eslint-plugin/rule-options';
import jsdoc from 'eslint-plugin-jsdoc'; import jsdoc from 'eslint-plugin-jsdoc';
import stylistic from '@stylistic/eslint-plugin';
import tseslint from 'typescript-eslint';
export default tseslint.config( export default tseslint.config({
// @ts-expect-error this works // @ts-expect-error this should work
files: ['**/*.js', '**/*.ts'],
ignores: ['node_modules/**', 'types/**'],
extends: [
eslint.configs.recommended, eslint.configs.recommended,
jsdoc.configs['flat/recommended-typescript'], jsdoc.configs['flat/recommended-typescript'],
stylistic.configs['recommended-flat'],
{ ignores: ['js'] }, ...tseslint.configs.recommended,
...tseslint.configs.stylistic,
{ ],
plugins: {
jsdoc,
'@stylistic': stylistic, // as typeof stylisticRules,
'@typescript-eslint': tsPlugin,
},
rules: { rules: {
// JSDoc settings // JSDoc settings
@ -31,10 +25,13 @@ export default tseslint.config(
'jsdoc/check-line-alignment': ['warn', 'always', { 'jsdoc/check-line-alignment': ['warn', 'always', {
tags: ['param', 'arg', 'argument', 'property', 'prop'], tags: ['param', 'arg', 'argument', 'property', 'prop'],
}], }],
'jsdoc/no-types': 'off',
// Newer settings // Newer settings
'@typescript-eslint/no-extraneous-class': ['off'], '@typescript-eslint/no-extraneous-class': ['off'],
'@typescript-eslint/no-implied-eval': ['off'], '@typescript-eslint/no-implied-eval': ['off'],
'class-methods-use-this': 'off',
'@stylistic/no-multiple-empty-lines': 'off',
// Pre-flat config // Pre-flat config
'@typescript-eslint/no-unused-vars': [ '@typescript-eslint/no-unused-vars': [
@ -78,9 +75,6 @@ export default tseslint.config(
'block-scoped-var': [ 'block-scoped-var': [
'error', 'error',
], ],
'class-methods-use-this': [
'error',
],
'curly': [ 'curly': [
'warn', 'warn',
], ],
@ -457,5 +451,4 @@ export default tseslint.config(
'warn', 'warn',
], ],
}, },
}, });
);

264
modules/ags/config/global-types.d.ts vendored
View file

@ -5,137 +5,6 @@ import { Variable as Var } from 'types/variable';
import { Widget as agsWidget } from 'types/widgets/widget'; import { Widget as agsWidget } from 'types/widgets/widget';
export type AgsWidget = agsWidget<unknown> & Widget; export type AgsWidget = agsWidget<unknown> & Widget;
// For ./ts/applauncher/main.ts
import { Application } from 'types/service/applications.ts';
import { CursorBoxProps } from 'ts/misc/cursorbox';
export type AgsAppItem = AgsEventBox<Widget, { app: Application }
& CursorBoxProps<Widget, unknown>>;
// For ./ts/bar/hovers/keyboard.ts
export type Keyboard = {
address: string;
name: string;
rules: string;
model: string;
layout: string;
variant: string;
options: string;
active_keymap: string;
main: boolean;
};
// For ./ts/bar/items/workspaces.ts
// TODO: improve type
export type Workspace = AgsRevealer<unknown & Widget, unknown & { id: number }>;
// For ./ts/bar/fullscreen.ts
export type DefaultProps = RevealerProps<CenterBoxGeneric>;
// For ./ts/media-player/gesture.ts
export type Gesture = {
attribute?: object
setup?(self: OverlayGeneric): void
props?: OverlayProps<unknown & Widget, unknown>
};
// For ./ts/media-player/mpris.ts
type PlayerDragProps = unknown & { dragging: boolean };
export type PlayerDrag = AgsCenterBox<
unknown & Widget, unknown & Widget, unknown & Widget, unknown & PlayerDragProps
>;
type Colors = {
imageAccent: string;
buttonAccent: string;
buttonText: string;
hoverAccent: string;
};
// For ./ts/media-player
export type PlayerBoxProps = {
bgStyle: string,
player: MprisPlayer,
};
export type PlayerBox = AgsCenterBox<
unknown & Widget, unknown & Widget, unknown & Widget, PlayerBoxProps
>;
export type PlayerOverlay = AgsOverlay<AgsWidget, {
players: Map;
setup: boolean;
dragging: boolean;
includesWidget(playerW: PlayerBox): PlayerBox;
showTopOnly(): void;
moveToTop(player: PlayerBox): void;
}>;
export type PlayerButtonType = {
player: MprisPlayer
colors: Var<Colors>
children: StackProps['children']
onClick: string
prop: string
};
// For ./ts/notifications/gesture.js
type NotifGestureProps = {
dragging: boolean;
hovered: boolean
ready: boolean
id: number;
slideAway(side: 'Left' | 'Right'): void;
};
export type NotifGesture = AgsEventBox<BoxGeneric, NotifGestureProps>;
// For ./ts/osd/ctor.ts
export type OSDStack = AgsStack<unknown & Widget, {
popup(osd: string): void,
}>;
export type ConnectFunc = (self?: ProgressBarGeneric) => void;
export type OSD = {
name: string;
icon: IconPropsGeneric['icon'];
info: {
mod: GObject.Object;
signal?: string | string[];
logic?(self: ProgressBarGeneric): void;
widget?: AgsWidget;
}
};
// For ./ts/on-screen-keyboard
export type OskWindow = Window<BoxGeneric, {
startY: null | number;
setVisible: (state: boolean) => void;
killGestureSigs: () => void;
setSlideUp: () => void;
setSlideDown: () => void;
}>;
// For CursorBox
import { CursorBox, CursorBoxProps } from 'ts/misc/cursorbox';
export type CursorBox = CursorBox;
export type CursorBoxProps = CursorBoxProps;
// For PopupWindow
export type HyprTransition = 'slide' | 'slide top' | 'slide bottom' | 'slide left' |
'slide right' | 'popin' | 'fade';
export type CloseType = 'none' | 'stay' | 'released' | 'clicked';
import { PopupWindow } from 'ts/misc/popup';
export type PopupWindow = PopupWindow;
// For ./ts/quick-settings
import { BluetoothDevice as BTDev } from 'types/service/bluetooth.ts';
export type APType = {
bssid: string
address: string
lastSeen: number
ssid: string
active: boolean
strength: number
iconName: string
};
export type APBox = AgsBox<unknown & Widget, { ap: Var<APType> }>;
export type DeviceBox = AgsBox<unknown & Widget, { dev: BTDev }>;
// Generic widgets // Generic widgets
import AgsBox from 'types/widgets/box.ts'; import AgsBox from 'types/widgets/box.ts';
export type BoxGeneric = AgsBox<unknown & Widget, unknown>; export type BoxGeneric = AgsBox<unknown & Widget, unknown>;
@ -168,10 +37,141 @@ import AgsRevealer, { RevealerProps } from 'types/widgets/revealer';
export type RevealerGeneric = AgsRevealer<unknown & Widget, unknown>; export type RevealerGeneric = AgsRevealer<unknown & Widget, unknown>;
import AgsStack, { StackProps } from 'types/widgets/stack'; import AgsStack, { StackProps } from 'types/widgets/stack';
export type StackGeneric = AgsStack<{ [name: string]: Widget; }, unknown>; export type StackGeneric = AgsStack<Record<string, Widget>, unknown>;
import AgsScrollable from 'types/widgets/scrollable'; import AgsScrollable from 'types/widgets/scrollable';
export type ScrollableGeneric = AgsScrollable<unkown & Widget, unknown>; export type ScrollableGeneric = AgsScrollable<unkown & Widget, unknown>;
import AgsWindow from 'types/widgets/window'; import AgsWindow from 'types/widgets/window';
export type WindowGeneric = AgsWindow<unknown & Widget, unknown>; export type WindowGeneric = AgsWindow<unknown & Widget, unknown>;
// For ./ts/applauncher/main.ts
import { Application } from 'types/service/applications.ts';
import { CursorBoxProps } from 'ts/misc/cursorbox';
export type AgsAppItem = AgsEventBox<Widget, { app: Application }
& CursorBoxProps<Widget, unknown>>;
// For ./ts/bar/hovers/keyboard.ts
export interface Keyboard {
address: string
name: string
rules: string
model: string
layout: string
variant: string
options: string
active_keymap: string
main: boolean
}
// For ./ts/bar/items/workspaces.ts
// TODO: improve type
export type Workspace = AgsRevealer<unknown & Widget, unknown & { id: number }>;
// For ./ts/bar/fullscreen.ts
export type DefaultProps = RevealerProps<CenterBoxGeneric>;
// For ./ts/media-player/gesture.ts
export interface Gesture {
attribute?: object
setup?(self: OverlayGeneric): void
props?: OverlayProps<unknown & Widget, unknown>
}
// For ./ts/media-player/mpris.ts
type PlayerDragProps = unknown & { dragging: boolean };
export type PlayerDrag = AgsCenterBox<
unknown & Widget, unknown & Widget, unknown & Widget, unknown & PlayerDragProps
>;
interface Colors {
imageAccent: string
buttonAccent: string
buttonText: string
hoverAccent: string
}
// For ./ts/media-player
export interface PlayerBoxProps {
bgStyle: string
player: MprisPlayer
}
export type PlayerBox = AgsCenterBox<
unknown & Widget, unknown & Widget, unknown & Widget, PlayerBoxProps
>;
export type PlayerOverlay = AgsOverlay<AgsWidget, {
players: Map
setup: boolean
dragging: boolean
includesWidget(playerW: PlayerBox): PlayerBox
showTopOnly(): void
moveToTop(player: PlayerBox): void
}>;
export interface PlayerButtonType {
player: MprisPlayer
colors: Var<Colors>
children: StackProps['children']
onClick: string
prop: string
}
// For ./ts/notifications/gesture.js
interface NotifGestureProps {
dragging: boolean
hovered: boolean
ready: boolean
id: number
slideAway(side: 'Left' | 'Right'): void
}
export type NotifGesture = AgsEventBox<BoxGeneric, NotifGestureProps>;
// For ./ts/osd/ctor.ts
export type OSDStack = AgsStack<unknown & Widget, {
popup(osd: string): void
}>;
export type ConnectFunc = (self?: ProgressBarGeneric) => void;
export interface OSD {
name: string
icon: IconPropsGeneric['icon']
info: {
mod: GObject.Object
signal?: string | string[]
logic?(self: ProgressBarGeneric): void
widget?: AgsWidget
}
}
// For ./ts/on-screen-keyboard
export type OskWindow = Window<BoxGeneric, {
startY: null | number
setVisible: (state: boolean) => void
killGestureSigs: () => void
setSlideUp: () => void
setSlideDown: () => void
}>;
// For CursorBox
import { CursorBox, CursorBoxProps } from 'ts/misc/cursorbox';
export type CursorBox = CursorBox;
export type CursorBoxProps = CursorBoxProps;
// For PopupWindow
export type HyprTransition = 'slide' | 'slide top' | 'slide bottom' | 'slide left' |
'slide right' | 'popin' | 'fade';
export type CloseType = 'none' | 'stay' | 'released' | 'clicked';
import { PopupWindow } from 'ts/misc/popup';
export type PopupWindow = PopupWindow;
// For ./ts/quick-settings
import { BluetoothDevice as BTDev } from 'types/service/bluetooth.ts';
export interface APType {
bssid: string
address: string
lastSeen: number
ssid: string
active: boolean
strength: number
iconName: string
}
export type APBox = AgsBox<unknown & Widget, { ap: Var<APType> }>;
export type DeviceBox = AgsBox<unknown & Widget, { dev: BTDev }>;

9
modules/ags/config/js/utils.js
View file

@ -1,7 +1,9 @@
const { execAsync, monitorFile } = Utils; const { execAsync, monitorFile } = Utils;
/** @param {string} host */ /**
* @param {string} host the name of the machine/user who's running ags
*/
const watchAndCompileSass = (host) => { const watchAndCompileSass = (host) => {
const reloadCss = () => { const reloadCss = () => {
const scss = `${App.configDir}/scss/${host}.scss`; const scss = `${App.configDir}/scss/${host}.scss`;
@ -20,7 +22,10 @@ const watchAndCompileSass = (host) => {
reloadCss(); reloadCss();
}; };
/** @param {string} host */ /**
* @param {string} host the name of the machine/user who's running ags
* @returns the config
*/
export const transpileTypeScript = async(host) => { export const transpileTypeScript = async(host) => {
const outPath = `/tmp/ags-${host}/index.js`; const outPath = `/tmp/ags-${host}/index.js`;

BIN
modules/ags/config/package-lock.json generated
View file

Binary file not shown.

17
modules/ags/config/package.json
View file

@ -5,16 +5,13 @@
"fzf": "0.5.2" "fzf": "0.5.2"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "9.7.0", "@eslint/js": "9.8.0",
"@stylistic/eslint-plugin": "2.3.0", "@stylistic/eslint-plugin": "2.6.1",
"@types/eslint__js": "8.42.3", "@types/eslint__js": "8.42.3",
"@types/node": "20.14.11", "@types/node": "22.0.2",
"eslint": "9.7.0", "eslint": "9.8.0",
"eslint-plugin-jsdoc": "48.7.0", "eslint-plugin-jsdoc": "48.10.2",
"typescript": "5.5.3", "typescript": "5.5.4",
"typescript-eslint": "7.16.1" "typescript-eslint": "8.0.0"
},
"overrides": {
"eslint": "$eslint"
} }
} }

38
modules/ags/config/services/brightness.ts
View file

@ -41,22 +41,6 @@ class Brightness extends Service {
return this.#kbd; return this.#kbd;
} }
get screen() {
return this.#screen;
}
get screenIcon() {
return this.#screenIcon;
}
get caps() {
return this.#caps;
}
get capsIcon() {
return this.#capsIcon;
}
set kbd(value) { set kbd(value) {
if (value < 0 || value > this.#kbdMax) { if (value < 0 || value > this.#kbdMax) {
return; return;
@ -70,6 +54,10 @@ class Brightness extends Service {
.catch(console.error); .catch(console.error);
} }
get screen() {
return this.#screen;
}
set screen(percent) { set screen(percent) {
if (percent < 0) { if (percent < 0) {
percent = 0; percent = 0;
@ -88,16 +76,27 @@ class Brightness extends Service {
.catch(console.error); .catch(console.error);
} }
get screenIcon() {
return this.#screenIcon;
}
get caps() {
return this.#caps;
}
get capsIcon() {
return this.#capsIcon;
}
constructor() { constructor() {
super(); super();
try { try {
this.#monitorKbdState(); this.#monitorKbdState();
this.#kbdMax = Number(exec(`brightnessctl -d ${KBD} m`)); this.#kbdMax = Number(exec(`brightnessctl -d ${KBD} m`));
this.#caps = Number(exec(`bash -c brightnessctl -d ${this.#capsName} g`)); this.#caps = Number(exec(`bash -c brightnessctl -d ${this.#capsName} g`));
this.#screen = Number(exec('brightnessctl g')) / this.#screen = Number(exec('brightnessctl g')) / Number(exec('brightnessctl m'));
Number(exec('brightnessctl m'));
} }
catch (error) { catch (_e) {
console.error('missing dependancy: brightnessctl'); console.error('missing dependancy: brightnessctl');
} }
} }
@ -140,6 +139,7 @@ class Brightness extends Service {
} }
}, },
).catch(() => { ).catch(() => {
// @ts-expect-error this works in ags
interval.destroy(); interval.destroy();
}); });
}, INTERVAL); }, INTERVAL);

6
modules/ags/config/services/clipboard.ts
View file

@ -16,7 +16,7 @@ class Clipboard extends Service {
// Class Attributes // Class Attributes
private _clips_left = 0; private _clips_left = 0;
private _clips: Map<number, { clip: string; isImage: boolean }> = new Map(); private _clips = new Map<number, { clip: string, isImage: boolean }>();
get clips() { get clips() {
return this._clips; return this._clips;
@ -83,7 +83,7 @@ class Clipboard extends Service {
if (clip.includes('img')) { if (clip.includes('img')) {
this._decrementClipsLeft(); this._decrementClipsLeft();
const newClip: [number, {clip: string; isImage: boolean;}] = [ const newClip: [number, { clip: string, isImage: boolean }] = [
parseInt((clip.match('[0-9]+') ?? [''])[0]), parseInt((clip.match('[0-9]+') ?? [''])[0]),
{ {
clip, clip,
@ -98,7 +98,7 @@ class Clipboard extends Service {
const decodedClip = await this._decodeItem(clip); const decodedClip = await this._decodeItem(clip);
if (decodedClip) { if (decodedClip) {
const newClip: [number, {clip: string; isImage: boolean;}] = [ const newClip: [number, { clip: string, isImage: boolean }] = [
parseInt(clip), parseInt(clip),
{ {
clip: decodedClip, clip: decodedClip,

52
modules/ags/config/services/pointers.ts
View file

@ -14,27 +14,27 @@ const ON_CLICK_TRIGGERS = [
// Types // Types
import { PopupWindow } from 'global-types'; import { PopupWindow } from 'global-types';
import { Subprocess } from 'types/@girs/gio-2.0/gio-2.0.cjs'; import { Subprocess } from 'types/@girs/gio-2.0/gio-2.0.cjs';
type Layer = { interface Layer {
address: string; address: string
x: number; x: number
y: number; y: number
w: number; w: number
h: number; h: number
namespace: string; namespace: string
}; }
type Levels = { interface Levels {
0?: Array<Layer> | null; 0?: Layer[] | null
1?: Array<Layer> | null; 1?: Layer[] | null
2?: Array<Layer> | null; 2?: Layer[] | null
3?: Array<Layer> | null; 3?: Layer[] | null
}; }
type Layers = { interface Layers {
levels: Levels; levels: Levels
}; }
type CursorPos = { interface CursorPos {
x: number; x: number
y: number; y: number
}; }
class Pointers extends Service { class Pointers extends Service {
@ -51,7 +51,7 @@ class Pointers extends Service {
#process = null as Subprocess | null; #process = null as Subprocess | null;
#lastLine = ''; #lastLine = '';
#pointers = [] as Array<string>; #pointers = [] as string[];
get process() { get process() {
return this.#process; return this.#process;
@ -111,7 +111,7 @@ class Pointers extends Service {
#initAppConnection() { #initAppConnection() {
App.connect('window-toggled', () => { App.connect('window-toggled', () => {
const anyVisibleAndClosable = const anyVisibleAndClosable =
(App.windows as Array<PopupWindow>).some((w) => { (App.windows as PopupWindow[]).some((w) => {
const closable = w.close_on_unfocus && const closable = w.close_on_unfocus &&
!( !(
w.close_on_unfocus === 'none' || w.close_on_unfocus === 'none' ||
@ -132,7 +132,7 @@ class Pointers extends Service {
} }
static detectClickedOutside(clickStage: string) { static detectClickedOutside(clickStage: string) {
const toClose = ((App.windows as Array<PopupWindow>)).some((w) => { const toClose = ((App.windows as PopupWindow[])).some((w) => {
const closable = ( const closable = (
w.close_on_unfocus && w.close_on_unfocus &&
w.close_on_unfocus === clickStage w.close_on_unfocus === clickStage
@ -160,8 +160,8 @@ class Pointers extends Service {
'osk', 'osk',
]; ];
const getNoCloseWidgets = (names: Array<string>) => { const getNoCloseWidgets = (names: string[]) => {
const arr = [] as Array<Layer>; const arr = [] as Layer[];
names.forEach((name) => { names.forEach((name) => {
arr.push( arr.push(

2
modules/ags/config/ts/applauncher/main.ts
View file

@ -69,7 +69,7 @@ export default () => {
rows.forEach((row) => { rows.forEach((row) => {
row.changed(); row.changed();
const item = (row.get_children()[0] as AgsAppItem); const item = row.get_children()[0] as AgsAppItem;
if (item.attribute.app) { if (item.attribute.app) {
const isMatching = fzfResults.some((r) => { const isMatching = fzfResults.some((r) => {

4
modules/ags/config/ts/date/binto.ts
View file

@ -3,10 +3,12 @@ import CalendarWidget from './main.ts';
import { get_gdkmonitor_from_desc } from '../lib.ts'; import { get_gdkmonitor_from_desc } from '../lib.ts';
const RIGHT_MARGIN = 20;
export default () => PopupWindow({ export default () => PopupWindow({
name: 'calendar', name: 'calendar',
anchor: ['bottom', 'right'], anchor: ['bottom', 'right'],
margins: [0, 20, 0, 0], margins: [0, RIGHT_MARGIN, 0, 0],
transition: 'slide bottom', transition: 'slide bottom',
gdkmonitor: get_gdkmonitor_from_desc('desc:Acer Technologies Acer K212HQL T3EAA0014201'), gdkmonitor: get_gdkmonitor_from_desc('desc:Acer Technologies Acer K212HQL T3EAA0014201'),

4
modules/ags/config/ts/lockscreen/lock.ts
View file

@ -15,8 +15,8 @@ import { Box as AgsBox } from 'types/widgets/box';
const lock = Lock.prepare_lock(); const lock = Lock.prepare_lock();
const windows: Map<Gdk.Monitor, Gtk.Window> = new Map(); const windows = new Map<Gdk.Monitor, Gtk.Window>();
const blurBGs: AgsBox<Gtk.Widget, { geometry: { w: number, h: number }; }>[] = []; const blurBGs: AgsBox<Gtk.Widget, { geometry: { w: number, h: number } }>[] = [];
const transition_duration = 1000; const transition_duration = 1000;
const WINDOW_MARGINS = -2; const WINDOW_MARGINS = -2;

2
modules/ags/config/ts/misc/closer.ts
View file

@ -3,7 +3,7 @@ import { PopupWindow } from 'global-types';
export default () => { export default () => {
(App.windows as Array<PopupWindow>) (App.windows as PopupWindow[])
.filter((w) => w && .filter((w) => w &&
w.close_on_unfocus && w.close_on_unfocus &&
w.close_on_unfocus !== 'stay') w.close_on_unfocus !== 'stay')

7
modules/ags/config/ts/misc/cursorbox.ts
View file

@ -5,6 +5,9 @@ import Gdk from 'gi://Gdk?version=3.0';
import { BaseProps, Widget as AgsWidget } from 'types/widgets/widget'; import { BaseProps, Widget as AgsWidget } from 'types/widgets/widget';
type EventHandler<Self> = (self: Self, event: Gdk.Event) => boolean | unknown; type EventHandler<Self> = (self: Self, event: Gdk.Event) => boolean | unknown;
// eslint-disable-next-line
export interface CursorBox<Child, Attr> extends AgsWidget<Attr> { }
export type CursorBoxProps< export type CursorBoxProps<
Child extends Gtk.Widget, Child extends Gtk.Widget,
Attr = unknown, Attr = unknown,
@ -26,10 +29,8 @@ export type CursorBoxProps<
on_secondary_click_release?: EventHandler<Self> on_secondary_click_release?: EventHandler<Self>
}, Attr>; }, Attr>;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
export interface CursorBox<Child, Attr> extends AgsWidget<Attr> { }
// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
export class CursorBox<Child extends Gtk.Widget, Attr> extends Gtk.EventBox { export class CursorBox<Child extends Gtk.Widget, Attr> extends Gtk.EventBox {
static { static {
Widget.register(this, { Widget.register(this, {

4
modules/ags/config/ts/misc/persist.ts
View file

@ -3,7 +3,7 @@ const { get_home_dir } = imports.gi.GLib;
import GObject from 'types/@girs/gobject-2.0/gobject-2.0'; import GObject from 'types/@girs/gobject-2.0/gobject-2.0';
type Persist = { interface Persist {
name: string name: string
gobject: GObject.Object gobject: GObject.Object
prop: string prop: string
@ -11,7 +11,7 @@ type Persist = {
whenTrue?: boolean | string whenTrue?: boolean | string
whenFalse?: boolean | string whenFalse?: boolean | string
signal?: string signal?: string
}; }
export default ({ export default ({

19
modules/ags/config/ts/misc/popup.ts
View file

@ -8,6 +8,9 @@ import { Window } from 'resource:///com/github/Aylur/ags/widgets/window.js';
import type { WindowProps } from 'types/widgets/window'; import type { WindowProps } from 'types/widgets/window';
import type { Widget as AgsWidget } from 'types/widgets/widget'; import type { Widget as AgsWidget } from 'types/widgets/widget';
// eslint-disable-next-line
export interface PopupWindow<Child, Attr> extends AgsWidget<Attr> { }
import { import {
CloseType, CloseType,
HyprTransition, HyprTransition,
@ -18,17 +21,15 @@ export type PopupWindowProps<
Attr = unknown, Attr = unknown,
Self = PopupWindow<Child, Attr>, Self = PopupWindow<Child, Attr>,
> = WindowProps<Child, Attr, Self> & { > = WindowProps<Child, Attr, Self> & {
transition?: HyprTransition; transition?: HyprTransition
on_open?(self: PopupWindow<Child, Attr>): void; on_open?(self: PopupWindow<Child, Attr>): void
on_close?(self: PopupWindow<Child, Attr>): void; on_close?(self: PopupWindow<Child, Attr>): void
close_on_unfocus?: CloseType; close_on_unfocus?: CloseType
anchor?: Array<'top' | 'bottom' | 'right' | 'left'>; anchor?: ('top' | 'bottom' | 'right' | 'left')[]
}; };
// eslint-disable-next-line @typescript-eslint/no-unused-vars
export interface PopupWindow<Child, Attr> extends AgsWidget<Attr> { }
// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
export class PopupWindow< export class PopupWindow<
Child extends Gtk.Widget, Child extends Gtk.Widget,
Attr, Attr,
@ -68,6 +69,7 @@ export class PopupWindow<
} }
// eslint-disable-next-line no-use-before-define
protected _on_open: (self: PopupWindow<Child, Attr>) => void; protected _on_open: (self: PopupWindow<Child, Attr>) => void;
get on_open() { get on_open() {
@ -79,6 +81,7 @@ export class PopupWindow<
} }
// eslint-disable-next-line no-use-before-define
private _on_close: (self: PopupWindow<Child, Attr>) => void; private _on_close: (self: PopupWindow<Child, Attr>) => void;
get on_close() { get on_close() {

15
modules/ags/config/ts/misc/sorted-list.ts
View file

@ -9,22 +9,24 @@ import { ListBoxRow } from 'types/@girs/gtk-3.0/gtk-3.0.cjs';
import { Monitor } from 'types/service/hyprland'; import { Monitor } from 'types/service/hyprland';
import { Binding } from 'types/service'; import { Binding } from 'types/service';
// eslint-disable-next-line @typescript-eslint/no-empty-object-type
export interface SortedList<Attr> extends AgsWidget<Attr> { }
// eslint-disable-next-line no-use-before-define
type MakeChild = ReturnType<typeof makeChild>; type MakeChild = ReturnType<typeof makeChild>;
type SortedListProps<Attr = unknown, Self = SortedList<Attr>> = type SortedListProps<Attr = unknown, Self = SortedList<Attr>> =
PopupWindowProps<MakeChild['child'], Attr, Self> & { PopupWindowProps<MakeChild['child'], Attr, Self> & {
on_select: (row: ListBoxRow) => void; on_select: (row: ListBoxRow) => void
init_rows?: (list: MakeChild['list']) => void; init_rows?: (list: MakeChild['list']) => void
set_sort: ( set_sort: (
text: string, text: string,
list: MakeChild['list'], list: MakeChild['list'],
placeholder: MakeChild['placeholder'], placeholder: MakeChild['placeholder'],
) => void; ) => void
setup_list?: (list: MakeChild['list']) => void; setup_list?: (list: MakeChild['list']) => void
}; };
// eslint-disable-next-line @typescript-eslint/no-unused-vars
export interface SortedList<Attr> extends AgsWidget<Attr> { }
const centerCursor = async(): Promise<void> => { const centerCursor = async(): Promise<void> => {
@ -108,6 +110,7 @@ const makeChild = (class_name: string | Binding<any, any, string>) => {
}; };
}; };
// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
export class SortedList< export class SortedList<
Attr, Attr,
> extends PopupWindow<MakeChild['child'], Attr> { > extends PopupWindow<MakeChild['child'], Attr> {

8
modules/ags/config/ts/notifications/base.ts
View file

@ -14,11 +14,11 @@ import { launchApp } from '../applauncher/launch.ts';
// Types // Types
import { Notification as NotifObj } from 'types/service/notifications.ts'; import { Notification as NotifObj } from 'types/service/notifications.ts';
import { Client } from 'types/service/hyprland.ts'; import { Client } from 'types/service/hyprland.ts';
type NotificationWidget = { interface NotificationWidget {
notif: NotifObj notif: NotifObj
slideIn?: 'Left' | 'Right' slideIn?: 'Left' | 'Right'
command?(): void command?(): void
}; }
import { import {
CursorBox as CBox, CursorBox as CBox,
EventBoxGeneric, EventBoxGeneric,
@ -74,8 +74,8 @@ const NotificationIcon = (notif: NotifObj) => {
} }
else { else {
Hyprland.messageAsync('j/clients').then((msg) => { Hyprland.messageAsync('j/clients').then((msg) => {
const clients = JSON.parse(msg) as Array<Client>; const clients = JSON.parse(msg) as Client[];
const classes = [] as Array<string>; const classes = [] as string[];
for (const key of clients) { for (const key of clients) {
if (key.class) { if (key.class) {

2
modules/ags/config/ts/on-screen-keyboard/gesture.ts
View file

@ -28,7 +28,7 @@ export default (window: OskWindow) => {
window.child.setCss(`margin-bottom: -${HIDDEN_MARGIN}px;`); window.child.setCss(`margin-bottom: -${HIDDEN_MARGIN}px;`);
let signals = [] as Array<number>; let signals = [] as number[];
window.attribute = { window.attribute = {
startY: null, startY: null,

14
modules/ags/config/ts/on-screen-keyboard/keys.ts
View file

@ -45,14 +45,14 @@ const LCTRL_CODE = 29;
// Types // Types
import { Variable as Var } from 'types/variable.ts'; import { Variable as Var } from 'types/variable.ts';
type Key = { interface Key {
keytype: string, keytype: string
label: string, label: string
labelShift?: string, labelShift?: string
labelAltGr?: string, labelAltGr?: string
shape: string, shape: string
keycode: number keycode: number
}; }
const ModKey = (key: Key) => { const ModKey = (key: Key) => {

2
modules/ags/config/ts/osd/main.ts
View file

@ -7,7 +7,7 @@ import PopupWindow from '../misc/popup.ts';
import { BoxGeneric } from 'global-types'; import { BoxGeneric } from 'global-types';
// Import all the OSDs as an array // Import all the OSDs as an array
const OSDList = [] as Array<() => BoxGeneric>; const OSDList = [] as (() => BoxGeneric)[];
import * as Modules from './osds.ts'; import * as Modules from './osds.ts';
for (const osd in Modules) { for (const osd in Modules) {

2
modules/ags/config/ts/quick-settings/bluetooth.ts
View file

@ -200,7 +200,7 @@ export const BluetoothMenu = () => {
} }
// Trigger sort_func // Trigger sort_func
(self.get_children() as Array<ListBoxRow>) (self.get_children() as ListBoxRow[])
.forEach((ch) => { .forEach((ch) => {
ch.changed(); ch.changed();
}); });

8
modules/ags/config/ts/quick-settings/button-grid.ts
View file

@ -36,7 +36,7 @@ type IndicatorTuple = [
signal?: string, signal?: string,
]; ];
type GridButtonType = { interface GridButtonType {
command?(): void command?(): void
secondary_command?(): void secondary_command?(): void
on_open?(menu: RevealerGeneric): void on_open?(menu: RevealerGeneric): void
@ -44,12 +44,12 @@ type GridButtonType = {
indicator?: IndicatorTuple indicator?: IndicatorTuple
// @ts-expect-error me is lazy // @ts-expect-error me is lazy
menu?: Widget menu?: Widget
}; }
// TODO: do vpn button // TODO: do vpn button
const SPACING = 28; const SPACING = 28;
const ButtonStates = [] as Array<Var<boolean>>; const ButtonStates = [] as Var<boolean>[];
const GridButton = ({ const GridButton = ({
command = () => { /**/ }, command = () => { /**/ },
@ -158,7 +158,7 @@ const GridButton = ({
?.children[1] as BoxGeneric; ?.children[1] as BoxGeneric;
const isSetup = (rowMenu const isSetup = (rowMenu
.get_children() as Array<BoxGeneric>) .get_children() as BoxGeneric[])
.find((ch) => ch === menu); .find((ch) => ch === menu);
if (!isSetup) { if (!isSetup) {

4
modules/ags/config/ts/quick-settings/network.ts
View file

@ -150,7 +150,7 @@ export const NetworkMenu = () => {
self.hook(Network, () => { self.hook(Network, () => {
// Add missing APs // Add missing APs
const currentAPs = Network.wifi const currentAPs = Network.wifi
?.access_points as Array<APType>; ?.access_points as APType[];
currentAPs.forEach((ap) => { currentAPs.forEach((ap) => {
if (ap.ssid !== 'Unknown') { if (ap.ssid !== 'Unknown') {
@ -227,7 +227,7 @@ export const NetworkMenu = () => {
} }
// Trigger sort_func // Trigger sort_func
(self.get_children() as Array<ListBoxRow>) (self.get_children() as ListBoxRow[])
.forEach((ch) => { .forEach((ch) => {
ch.changed(); ch.changed();
}); });