home: remove ags, move modules around

home/default.nix

@@ -13,7 +13,7 @@
     ./programs/terminal/bottom.nix
     ./programs/terminal/starship.nix
     ./programs/terminal/zoxide.nix
-    ./programs/direnv.nix
+    ./programs/terminal/direnv.nix
     ./programs/git.nix
   ];
 
@@ -39,6 +39,7 @@
       unrar
       p7zip
       procs
+      #  atac
     ];
     stateVersion = "23.05";
   };

home/profiles/ame/default.nix

@@ -1,15 +1,9 @@
 {
-  inputs,
   pkgs,
   ...
 }: {
   imports = [
-    inputs.hyprland.homeManagerModules.default
-    inputs.anyrun.homeManagerModules.default
-    inputs.ags.homeManagerModules.default
-    inputs.nix-index-database.hmModules.nix-index
     ../../services
-    ../../programs/ags
     ../../programs/anyrun
     ../../programs/browsers/firefox
     ../../programs/browsers/chromium

home/profiles/default.nix

@@ -1,7 +1,7 @@
 # stolen from fufexan
 {
-  self,
   inputs,
+  self,
   ...
 }: let
   extraSpecialArgs = {inherit inputs self;};

home/profiles/default/default.nix

@@ -1,4 +1,3 @@
 {
-  imports = [
-  ];
+  imports = [];
 }

home/profiles/tsuki/default.nix

@@ -4,18 +4,10 @@
   ...
 }: {
   imports = [
-    inputs.hyprland.homeManagerModules.default
-    inputs.anyrun.homeManagerModules.default
-    inputs.ags.homeManagerModules.default
-    inputs.hypridle.homeManagerModules.default
-    inputs.hyprlock.homeManagerModules.default
-    inputs.hyprpaper.homeManagerModules.default
-    inputs.nix-index-database.hmModules.nix-index
     ../../services
-    ../../programs/ags
     ../../programs/anyrun
+    ../../programs/ironbar
     ../../programs/browsers/firefox
-    ../../programs/browsers/chromium
     ../../programs/terminal/wezterm
     ../../programs/terminal/zellij
     ../../programs/gtk.nix
@@ -37,11 +29,8 @@
     pavucontrol
     anki-bin
     tomato-c
-    distrobox
-    gpg-tui
     vscode-fhs
     obsidian-wayland
-    jellyfin-mpv-shim
     virt-manager
     qbittorrent
     hyprpicker
@@ -53,14 +42,10 @@
     cryptomator
     ventoy-bin-full
     wine
-    lutris
-    mangohud
     bottles
     prismlauncher
-    stellarium
     inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
-    (libsForQt5.callPackage ../../../pkgs/chatterino7 {})
-    (callPackage ../../../pkgs/jellyfin-rpc {})
+    (callPackage ../../../pkgs/chatterino7 {})
   ];
 
   programs.ssh = {

home/programs/ags/config/.eslintrc.js

@@ -1,25 +0,0 @@
-module.exports = {
-  env: {
-    browser: true,
-    es2021: true
-  },
-  extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
-  overrides: [
-    {
-      env: {
-        node: true
-      },
-      files: [".eslintrc.{js,cjs}"],
-      parserOptions: {
-        sourceType: "script"
-      }
-    }
-  ],
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    ecmaVersion: "latest",
-    sourceType: "module"
-  },
-  plugins: ["@typescript-eslint"],
-  rules: {}
-};

home/programs/ags/config/.gitignore

@@ -1,2 +0,0 @@
-style.css
-style.css.map

home/programs/ags/config/.prettierrc.json

@@ -1,3 +0,0 @@
-{
-  "trailingComma": "none"
-}

home/programs/ags/config/config.js

@@ -1,21 +0,0 @@
-const entry = App.configDir + "/ts/main.ts";
-const outdir = "/tmp/ags/js";
-
-try {
-  await Utils.execAsync([
-    "bun",
-    "build",
-    entry,
-    "--outdir",
-    outdir,
-    "--external",
-    "resource://*",
-    "--external",
-    "gi://*"
-  ]);
-  await import(`file://${outdir}/main.js`);
-} catch (error) {
-  console.error(error);
-}
-
-export {};

home/programs/ags/config/main.scss

@@ -1 +0,0 @@
-@import "./style/main.scss";

home/programs/ags/config/package-lock.json

@@ -1,13 +0,0 @@
-{
-  "name": "snowflake-ags",
-  "version": "0.0.1",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "snowflake-ags",
-      "version": "0.0.1",
-      "license": "MIT"
-    }
-  }
-}

home/programs/ags/config/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "snowflake-ags",
-  "version": "0.0.1",
-  "description": "",
-  "main": "config.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "notohh",
-  "license": "MIT"
-}

home/programs/ags/config/style/style.scss

@@ -1,7 +0,0 @@
-* {
-    all: unset;
-}
-
-window {
-    background: black;
-}

home/programs/ags/config/ts/main.ts

@@ -1,48 +0,0 @@
-const scss = App.configDir + "/main.scss";
-const css = App.configDir + "/style.css";
-
-const time = Variable("", {
-  poll: [
-    1000,
-    function () {
-      return Date().toString();
-    }
-  ]
-});
-
-Utils.monitorFile(
-  `${App.configDir}/style`,
-
-  function () {
-    const scss = `${App.configDir}/main.scss`;
-
-    const css = `./style.css`;
-
-    Utils.exec(`sass ${scss} ${css}`);
-    App.resetCss();
-    App.applyCss(css);
-  }
-);
-
-const Bar = (monitor: number) =>
-  Widget.Window({
-    monitor,
-    name: `bar${monitor}`,
-    anchor: ["top", "left", "right"],
-    exclusivity: "exclusive",
-    child: Widget.CenterBox({
-      start_widget: Widget.Label({
-        hpack: "center",
-        label: "Welcome to AGS!"
-      }),
-      end_widget: Widget.Label({
-        hpack: "center",
-        label: time.bind()
-      })
-    })
-  });
-
-App.config({
-  style: css,
-  windows: [Bar(2)]
-});

home/programs/ags/config/tsconfig.json

@@ -1,14 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "ES2022",
-    "lib": ["ES2022"],
-    "allowJs": true,
-    "checkJs": true,
-    "strict": true,
-    "noImplicitAny": false,
-    "baseUrl": ".",
-    "typeRoots": ["./types"],
-    "skipLibCheck": true
-  }
-}

home/programs/ags/config/types

@@ -1 +0,0 @@
-/home/notoh/.local/share/com.github.Aylur.ags/types

home/programs/ags/default.nix

@@ -1,16 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: let
-  configDir = "/home/notoh/snowflake/home/programs/ags/config";
-in {
-  programs.ags = {
-    enable = true;
-    extraPackages = with pkgs; [libsoup_3 libdbusmenu-gtk3];
-  };
-  home.packages = with pkgs; [dart-sass bun];
-  xdg.configFile = {
-    "ags".source = config.lib.file.mkOutOfStoreSymlink "${configDir}";
-  };
-}

home/programs/anyrun/default.nix

@@ -9,6 +9,8 @@
     ${lib.getExe pkgs.sassc} -t expanded '${source}' > $out/${name}.css
   ''}/${name}.css";
 in {
+  imports = [inputs.anyrun.homeManagerModules.default];
+
   programs.anyrun = {
     enable = true;
     config = {

home/programs/ironbar/config.nix

@@ -0,0 +1,28 @@
+_: {
+  programs.ironbar.config = let
+    nixlogo = rec {
+      type = "custom";
+      name = "nixlogo";
+      class = name;
+      bar = [
+        {
+          type = "image";
+          src = "https://files.artturin.com/files/nixoscolorful.svg";
+          size = 24;
+        }
+      ];
+    };
+    tray = {type = "tray";};
+    clock = {type = "clock";};
+  in {
+    monitors = {
+      "DP-2" = {
+        position = "top";
+        anchor_to_edges = true;
+        start = [nixlogo];
+        center = [];
+        end = [clock tray];
+      };
+    };
+  };
+}

home/programs/ironbar/default.nix

@@ -0,0 +1,19 @@
+{
+  inputs,
+  pkgs,
+  lib,
+  ...
+}: let
+  compileSCSS = name: source: "${pkgs.runCommandLocal name {} ''
+    mkdir -p $out
+    ${lib.getExe pkgs.sass} '${source}' > $out/${name}.css
+  ''}/${name}.css";
+in {
+  imports = [inputs.ironbar.homeManagerModules.default ./config.nix];
+
+  programs.ironbar = {
+    enable = true;
+    systemd = true;
+    style = builtins.readFile (compileSCSS "style" ./style.scss);
+  };
+}

home/programs/ironbar/style.scss

@@ -0,0 +1,3 @@
+* {
+    all: unset;
+}

home/wayland/hyprland/config/plugins.nix

@@ -0,0 +1,19 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  wayland.windowManager.hyprland.settings = {
+    plugins = [
+      inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo
+    ];
+    plugin = {
+      hyprexpo = {
+        columns = 3;
+        gap_size = 5;
+        bg_col = "rgb(111111)";
+        workspace_method = "center current";
+      };
+    };
+  };
+}

home/wayland/hyprland/config/rules.nix

@@ -19,6 +19,7 @@ _: {
     ];
     layerrule = [
       "blur, ^(gtk-layer-shell|anyrun)$"
+      "blur, ^(gtk-layer-shell|ironbar)$"
     ];
   };
 }

home/wayland/hyprland/default.nix

@@ -1,8 +1,10 @@
-_: {
+{inputs, ...}: {
   imports = [
+    inputs.hyprland.homeManagerModules.default
     ./config/general.nix
     ./config/binds.nix
     ./config/rules.nix
+    #   ./config/plugins.nix
   ];
   wayland.windowManager.hyprland = {
     enable = true;

home/wayland/programs/hyprlock.nix

@@ -1,4 +1,5 @@
-_: {
+{inputs, ...}: {
+  imports = [inputs.hyprlock.homeManagerModules.default];
   programs.hyprlock = {
     enable = true;
     backgrounds = let

home/wayland/services/greetd.nix

@@ -26,6 +26,7 @@
 
     $mainMod = SUPER
     bind = $mainMod, Q, exec, reboot
+    bind = $mainMod, Return, exec, ${lib.getExe pkgs.greetd.regreet}
 
     input {
       kb_layout = us

home/wayland/services/hypridle.nix

@@ -1,9 +1,11 @@
 {
+  inputs,
   pkgs,
-  config,
   lib,
+  config,
   ...
 }: {
+  imports = [inputs.hypridle.homeManagerModules.default];
   services.hypridle = {
     enable = true;
     ignoreDbusInhibit = false;

home/wayland/services/hyprpaper.nix

@@ -1,4 +1,5 @@
-_: {
+{inputs, ...}: {
+  imports = [inputs.hyprpaper.homeManagerModules.default];
   services.hyprpaper = {
     enable = true;
     ipc = true;

pkgs/chatterino7/default.nix

@@ -4,31 +4,36 @@
   cmake,
   pkg-config,
   fetchFromGitHub,
-  qtbase,
-  qtsvg,
-  qtmultimedia,
-  qtimageformats,
-  qttools,
+  qt6,
   boost,
   openssl,
-  wrapQtAppsHook,
   libsecret,
 }:
 stdenv.mkDerivation rec {
   pname = "chatterino7";
-  version = "7.4.6";
+  version = "7.5.0";
 
   src = fetchFromGitHub {
     owner = "SevenTV";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-6F27GVknSwFDYARdkgE31Oufz557vBKrcDLo9csRWPA=";
+    sha256 = "sha256-/L6X0/03e5wSa+cVlh1Tynz90sMEjSeJm4Ca07f7s18=";
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [cmake pkg-config wrapQtAppsHook];
-  buildInputs = [qtbase qtsvg qtmultimedia qtimageformats qttools boost openssl libsecret];
-
+  nativeBuildInputs = [cmake pkg-config qt6.wrapQtAppsHook];
+  buildInputs = [
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qtimageformats
+    qt6.qttools
+    qt6.qt5compat
+    qt6.qtwayland
+    boost
+    openssl
+    libsecret
+  ];
+  cmakeFlags = ["-DBUILD_WITH_QT6=ON"];
   postInstall =
     ''
       mkdir -p "$out/bin"