From a0fd63fb982a871863e007ce1b3588413c5da701 Mon Sep 17 00:00:00 2001 From: OCbwoy3 Date: Mon, 31 Mar 2025 20:41:05 +0300 Subject: [PATCH] qol --- config/qt5ct/qt5ct.conf | 2 +- hosts/default/packages.nix | 3 ++- modules/nixos/nvidia.nix | 1 + modules/nixos/programs.nix | 5 ++++- scripts/bin/handleScreenshot.ts | 12 +++++++----- scripts/bin/r2Upload.ts | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/config/qt5ct/qt5ct.conf b/config/qt5ct/qt5ct.conf index 822839e..91d8f4a 100644 --- a/config/qt5ct/qt5ct.conf +++ b/config/qt5ct/qt5ct.conf @@ -2,7 +2,7 @@ color_scheme_path=/home/ocbwoy3/.config/qt5ct/colors/catppuccin-mocha-blue.conf custom_palette=true icon_theme=Adwaita -standard_dialogs=xdgdesktopportal +standard_dialogs=default style=Lightly [Fonts] diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix index 0e12564..c67139b 100644 --- a/hosts/default/packages.nix +++ b/hosts/default/packages.nix @@ -34,7 +34,8 @@ catppuccin-catwalk catppuccin-whiskers libxkbcommon - ffmpeg + nvidia-video-sdk + ffmpeg-full gnupg nix-direnv htop diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index a00b06a..f749eb4 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -35,6 +35,7 @@ intel-vaapi-driver libvdpau-va-gl vulkan-validation-layers + nvidia-video-sdk ]; }; diff --git a/modules/nixos/programs.nix b/modules/nixos/programs.nix index 3692f41..27e14a2 100644 --- a/modules/nixos/programs.nix +++ b/modules/nixos/programs.nix @@ -46,7 +46,10 @@ %wheel ALL=(ALL) ALL ''; - services.dbus.packages = [ pkgs.gcr ]; + services.dbus = { + enable = true; + packages = [ pkgs.gcr ]; + }; services.pcscd.enable = true; programs.gnupg = { diff --git a/scripts/bin/handleScreenshot.ts b/scripts/bin/handleScreenshot.ts index e3f6520..f06e6d0 100755 --- a/scripts/bin/handleScreenshot.ts +++ b/scripts/bin/handleScreenshot.ts @@ -7,11 +7,13 @@ import { getRegretevatorState } from "../lib/RegretevatorUtil"; async function getFilename(): Promise { const _d = new Date(); const windowClass = await $`hyprctl activewindow -j`.json(); - const isRoblox = - windowClass.initialClass === "org.vinegarhq.Sober" ? true : false; + let ic = windowClass.initialClass || "Hyprland"; + const isRoblox = windowClass.initialClass === "org.vinegarhq.Sober"; + if (isRoblox) {ic = "Roblox"; }; const regretevatorState = isRoblox ? getRegretevatorState() : null; + if (!!regretevatorState) {ic = "Regretevator";}; // console.log(isRoblox, regretevatorState) - return `${isRoblox ? "Roblox" : (windowClass.initialClass || "Hyprland")}-${_d.getTime()}${ + return `${ic}-${_d.getTime()}${ !regretevatorState ? "" : `-regretevator${ @@ -36,8 +38,8 @@ async function transformImage(b: Buffer): Promise { const mask = Buffer.from( ` - - ` + + ` ); const maskedImage = image diff --git a/scripts/bin/r2Upload.ts b/scripts/bin/r2Upload.ts index 27dce1b..f46fa98 100644 --- a/scripts/bin/r2Upload.ts +++ b/scripts/bin/r2Upload.ts @@ -39,7 +39,7 @@ try { if (floorNum) { urlParams = `?floor=${floorNum}` } else { - urlParams = `?regretevator` + urlParams = `` } }