diff --git a/config/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini index 9215562..55491d3 100644 --- a/config/gtk-3.0/settings.ini +++ b/config/gtk-3.0/settings.ini @@ -2,7 +2,7 @@ gtk-theme-name=catppuccin-mocha-blue-standard gtk-icon-theme-name=Adwaita gtk-font-name=Adwaita Sans 11 -gtk-cursor-theme-name=catppuccin-mocha-blue-cursors +gtk-cursor-theme-name=RalseiCursors gtk-cursor-theme-size=24 gtk-toolbar-style=GTK_TOOLBAR_ICONS gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR diff --git a/config/hypr/config/variables.conf b/config/hypr/config/variables.conf index f7e69e4..1dca1af 100644 --- a/config/hypr/config/variables.conf +++ b/config/hypr/config/variables.conf @@ -12,11 +12,11 @@ $browser = zen # Cursor -exec = hyprctl setcursor catppuccin-mocha-blue-cursors 24 +exec = hyprctl setcursor RalseiCursors 24 -env = HYPRCURSOR_THEME,catppuccin-mocha-blue-cursors +env = HYPRCURSOR_THEME,RalseiCursors env = HYPRCURSOR_SIZE,24 -env = XCURSOR_THEME,catppuccin-mocha-blue-cursors +env = XCURSOR_THEME,RalseiCursors env = XCURSOR_SIZE,24 # Toolkit Env diff --git a/config/qt5ct/qt5ct.conf b/config/qt5ct/qt5ct.conf index e182dea..115f869 100644 --- a/config/qt5ct/qt5ct.conf +++ b/config/qt5ct/qt5ct.conf @@ -25,7 +25,7 @@ underline_shortcut=1 wheel_scroll_lines=3 [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\xa2\0\0\x3\xee\0\0\0\0\0\0\0\0\0\0\x3\xbf\0\0\x4\x1a\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x3\xa2\0\0\x3\xee) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x4\xee\0\0\x3q\0\0\0\0\0\0\0\0\0\0\x3\xbf\0\0\x4\x1a\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x4\xee\0\0\x3q) [Troubleshooting] force_raster_widgets=1 diff --git a/etc/SoberAssetOverlay/content/textures/Cursors/KeyboardMouse/ArrowCursor.png b/etc/SoberAssetOverlay/content/textures/Cursors/KeyboardMouse/ArrowCursor.png index 4dc0bba..e8a509c 100644 Binary files a/etc/SoberAssetOverlay/content/textures/Cursors/KeyboardMouse/ArrowCursor.png and b/etc/SoberAssetOverlay/content/textures/Cursors/KeyboardMouse/ArrowCursor.png differ diff --git a/etc/SoberAssetOverlay/content/textures/Cursors/KeyboardMouse/ArrowFarCursor.png b/etc/SoberAssetOverlay/content/textures/Cursors/KeyboardMouse/ArrowFarCursor.png index cfe6caf..12380f3 100644 Binary files a/etc/SoberAssetOverlay/content/textures/Cursors/KeyboardMouse/ArrowFarCursor.png and b/etc/SoberAssetOverlay/content/textures/Cursors/KeyboardMouse/ArrowFarCursor.png differ diff --git a/etc/SoberAssetOverlay/content/textures/Cursors/KeyboardMouse/IBeamCursor.png b/etc/SoberAssetOverlay/content/textures/Cursors/KeyboardMouse/IBeamCursor.png index 642f6e9..4f52688 100644 Binary files a/etc/SoberAssetOverlay/content/textures/Cursors/KeyboardMouse/IBeamCursor.png and b/etc/SoberAssetOverlay/content/textures/Cursors/KeyboardMouse/IBeamCursor.png differ diff --git a/flake.nix b/flake.nix index 56de6a7..ee2fe6e 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; catppuccin.url = "github:catppuccin/nix"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; hyprland = { @@ -44,6 +45,10 @@ inputs.home-manager.nixosModules.default inputs.catppuccin.nixosModules.catppuccin inputs.nix-flatpak.nixosModules.nix-flatpak + inputs.chaotic.nixosModules.default + inputs.chaotic.nixosModules.nyx-cache + inputs.chaotic.nixosModules.nyx-overlay + inputs.chaotic.nixosModules.nyx-registry # ./hosts/default/hardware-configuration.nix # lil hack to not use --impure when rebuilding nixos >:3 diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index 2092c26..4066b56 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -166,7 +166,7 @@ # home-manager.services.mpris-proxy.enable = true; - home-manager.backupFileExtension = "hmbackup"; + home-manager.backupFileExtension = "home-manager-backup"; catppuccin = { enable = true; diff --git a/hosts/default/packages/ocbwoy3-icons/default.nix b/hosts/default/packages/ocbwoy3-icons/default.nix index 8b8ab54..7a5e03d 100644 --- a/hosts/default/packages/ocbwoy3-icons/default.nix +++ b/hosts/default/packages/ocbwoy3-icons/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { for size in 128x128 256x256 512x512; do cp ./system/gay-boykisser.png $out/share/icons/arashi/$size/apps/gay-boykisser.png cp ./system/boykisser.png $out/share/icons/arashi/$size/apps/boykisser.png - cp ./games/deltarune.png $out/share/icons/arashi/$size/apps/steam_icon_1690940.png # ralsei + cp ./games/deltarune.png $out/share/icons/arashi/$size/apps/steam_icon_1690940.png + cp ./games/cs2.png $out/share/icons/arashi/$size/apps/steam_icon_730.png done ''; diff --git a/hosts/default/packages/ocbwoy3-icons/games/cs2.png b/hosts/default/packages/ocbwoy3-icons/games/cs2.png new file mode 100644 index 0000000..5abfb9c Binary files /dev/null and b/hosts/default/packages/ocbwoy3-icons/games/cs2.png differ diff --git a/modules/nixos/bootloader.nix b/modules/nixos/bootloader.nix index c0ac105..4d5d19a 100644 --- a/modules/nixos/bootloader.nix +++ b/modules/nixos/bootloader.nix @@ -24,6 +24,8 @@ "boot.shell_on_fail" ]; + boot.kernelPackages = pkgs.linuxPackages_cachyos-lto; # some guy in roblox told me to do this + boot.loader = { efi = { # canTouchEfiVariables = true; diff --git a/scripts/bin/handleScreenshot.ts b/scripts/bin/handleScreenshot.ts index c5e1e34..0691024 100755 --- a/scripts/bin/handleScreenshot.ts +++ b/scripts/bin/handleScreenshot.ts @@ -48,10 +48,15 @@ import { getRegretevatorState } from "../lib/RegretevatorUtil"; */ +const windowcClassFriendyName: {[windowClass: string]: string} = { + "org.vinegarhq.Sober": "Roblox", + "steam_app_1690940": "Deltarune" +} + async function getFilename(): Promise { const _d = new Date(); const windowClass = await $`hyprctl activewindow -j`.json(); - let ic = windowClass.initialClass || "Hyprland"; + let ic = (windowClass.initialClass && windowcClassFriendyName[windowClass.initialClass]) || windowClass.windowClass || "Hyprland"; const isRoblox = windowClass.initialClass === "org.vinegarhq.Sober"; if (isRoblox) {ic = "Roblox"; }; const regretevatorState = isRoblox ? getRegretevatorState() : null; @@ -123,7 +128,7 @@ async function transformImage(b: Buffer): Promise { console.log("/tmp/woah"); process.exit(0); } - const _BUF = await $`grim -t png -l 0 -g ${selection.stdout + const _BUF = await $`grim -c -t png -l 0 -g ${selection.stdout .toString() .trim()} -`.arrayBuffer(); let BUF = Buffer.from(_BUF) as Buffer; @@ -147,7 +152,7 @@ async function transformImage(b: Buffer): Promise { .text(); const _BUF = - await $`grim -t png -l 0 -o ${selection.trim()} -`.arrayBuffer(); + await $`grim -c -t png -l 0 -o ${selection.trim()} -`.arrayBuffer(); let BUF = Buffer.from(_BUF) as Buffer; const FILENAME = `${SCREENSHOT_PATH}/${await getFilename()}.png`;