diff --git a/flake.lock b/flake.lock index fff0e48..8453aa8 100644 --- a/flake.lock +++ b/flake.lock @@ -73,49 +73,6 @@ "type": "github" } }, - "ags": { - "inputs": { - "astal": [ - "astal" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764289441, - "narHash": "sha256-ak+lgFiYE5PHByN1/BRkO5JP498hno6Ix24C1Qf/vec=", - "owner": "aylur", - "repo": "ags", - "rev": "e169694390548dfd38ff40f1ef2163d6c3ffe3ea", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "ags", - "type": "github" - } - }, - "astal": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764173295, - "narHash": "sha256-Jh4VtPcK2Ov+RTcV9FtyQRsxiJmXFQGfqX6jjM7/mgc=", - "owner": "aylur", - "repo": "astal", - "rev": "7d1fac8a4b2a14954843a978d2ddde86168c75ef", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, "awww": { "inputs": { "flake-compat": "flake-compat_4", @@ -1008,8 +965,6 @@ "affinity-nix": "affinity-nix", "agenix": "agenix", "agenix-rekey": "agenix-rekey", - "ags": "ags", - "astal": "astal", "awww": "awww", "darwin": "darwin_2", "disko": "disko", diff --git a/flake.nix b/flake.nix index 09cfa7e..9463d93 100644 --- a/flake.nix +++ b/flake.nix @@ -118,15 +118,5 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - astal = { - url = "github:aylur/astal"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - ags = { - url = "github:aylur/ags"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.astal.follows = "astal"; - }; }; } diff --git a/homes/x86_64-linux/christopher@cobalt/niri/ags/.gitignore b/homes/x86_64-linux/christopher@cobalt/niri/ags/.gitignore deleted file mode 100644 index 298eb4d..0000000 --- a/homes/x86_64-linux/christopher@cobalt/niri/ags/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -node_modules/ -@girs/ diff --git a/homes/x86_64-linux/christopher@cobalt/niri/ags/app.ts b/homes/x86_64-linux/christopher@cobalt/niri/ags/app.ts deleted file mode 100644 index 51d536f..0000000 --- a/homes/x86_64-linux/christopher@cobalt/niri/ags/app.ts +++ /dev/null @@ -1,10 +0,0 @@ -import app from "ags/gtk4/app" -import style from "./style.scss" -import Bar from "./widget/Bar" - -app.start({ - css: style, - main() { - app.get_monitors().map(Bar) - }, -}) diff --git a/homes/x86_64-linux/christopher@cobalt/niri/ags/env.d.ts b/homes/x86_64-linux/christopher@cobalt/niri/ags/env.d.ts deleted file mode 100644 index 792ebfd..0000000 --- a/homes/x86_64-linux/christopher@cobalt/niri/ags/env.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -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 -} diff --git a/homes/x86_64-linux/christopher@cobalt/niri/ags/package.json b/homes/x86_64-linux/christopher@cobalt/niri/ags/package.json deleted file mode 100644 index cbf736c..0000000 --- a/homes/x86_64-linux/christopher@cobalt/niri/ags/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "ags": "*", - "gnim": "*" - }, - "prettier": { - "semi": false, - "tabWidth": 2 - } -} diff --git a/homes/x86_64-linux/christopher@cobalt/niri/ags/style.scss b/homes/x86_64-linux/christopher@cobalt/niri/ags/style.scss deleted file mode 100644 index 2cc2a19..0000000 --- a/homes/x86_64-linux/christopher@cobalt/niri/ags/style.scss +++ /dev/null @@ -1,20 +0,0 @@ -// 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; - } -} diff --git a/homes/x86_64-linux/christopher@cobalt/niri/ags/tsconfig.json b/homes/x86_64-linux/christopher@cobalt/niri/ags/tsconfig.json deleted file mode 100644 index 2bb1f01..0000000 --- a/homes/x86_64-linux/christopher@cobalt/niri/ags/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "compilerOptions": { - "strict": true, - "module": "ES2022", - "target": "ES2020", - "lib": ["ES2023"], - "moduleResolution": "Bundler", - // "checkJs": true, - // "allowJs": true, - "jsx": "react-jsx", - "jsxImportSource": "ags/gtk4" - } -} diff --git a/homes/x86_64-linux/christopher@cobalt/niri/ags/widget/Bar.tsx b/homes/x86_64-linux/christopher@cobalt/niri/ags/widget/Bar.tsx deleted file mode 100644 index 56aa86a..0000000 --- a/homes/x86_64-linux/christopher@cobalt/niri/ags/widget/Bar.tsx +++ /dev/null @@ -1,39 +0,0 @@ -import app from "ags/gtk4/app" -import { Astal, Gtk, Gdk } from "ags/gtk4" -import { execAsync } from "ags/process" -import { createPoll } from "ags/time" - -export default function Bar(gdkmonitor: Gdk.Monitor) { - const time = createPoll("", 1000, "date") - const { TOP, LEFT, RIGHT } = Astal.WindowAnchor - - return ( - - - - - - - - - ) -} diff --git a/homes/x86_64-linux/christopher@cobalt/niri/shell.nix b/homes/x86_64-linux/christopher@cobalt/niri/shell.nix index 4c1f245..bb38f06 100644 --- a/homes/x86_64-linux/christopher@cobalt/niri/shell.nix +++ b/homes/x86_64-linux/christopher@cobalt/niri/shell.nix @@ -1,17 +1,12 @@ { - inputs, pkgs, ... }: { - imports = [inputs.ags.homeManagerModules.default]; - - programs.ags = { + programs.quickshell = { enable = true; - configDir = ./ags; - - extraPackages = with pkgs; [ - # inputs.astal.packages.${pkgs.system} - fzf - ]; + systemd = { + enable = true; + target = "graphical-session.target"; + }; }; }