diff --git a/config/qt5ct/qt5ct.conf b/config/qt5ct/qt5ct.conf index 4d6be43..6c57735 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\x4r\0\0\x2\xfb\0\0\0\0\0\0\0\0\0\0\x3\xbf\0\0\x4\x18\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x4r\0\0\x2\xfb) +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\xec\0\0\0\0\0\0\0\0\0\0\x3\xbf\0\0\x4\x18\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\xec) [Troubleshooting] force_raster_widgets=1 diff --git a/config/waybar/modules.json b/config/waybar/modules.json index 76482ec..a3286e2 100644 --- a/config/waybar/modules.json +++ b/config/waybar/modules.json @@ -9,7 +9,7 @@ }, "mpris": { - "player": "cider", + "player": ["cider", "OCbwoy3_s_iPhone"], "interval": 1, "on-scroll-up": "playerctl -p cider,OCbwoy3_s_iPhone volume 0.05+", "on-scroll-down": "playerctl -p cider,OCbwoy3_s_iPhone volume 0.05-", @@ -77,9 +77,9 @@ "clock": { "timezone": "Europe/Riga", - "locale": "lv_LV.UTF-8", + "locale": "en_US.UTF-8", "format": "{:%H:%M}", - "tooltip-format": "{:L%Y. gada %e. %B}", + "tooltip-format": "{:%A, %B %e, %Y}", "format-alt": "{:%H:%M:%S}", "interval": 1 }, diff --git a/flake.lock b/flake.lock index 6d69594..f9882e5 100644 --- a/flake.lock +++ b/flake.lock @@ -83,6 +83,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -101,6 +122,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "ghostty": { "inputs": { "flake-compat": "flake-compat", @@ -575,6 +614,34 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.8", + "repo": "ixx", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1711997201, @@ -719,6 +786,52 @@ "type": "github" } }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ], + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_5" + }, + "locked": { + "lastModified": 1749635064, + "narHash": "sha256-jgn9AZmwaTJxXeOamOY7QNGw1GYoFP1K1Xm7+UCqqJY=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "46ad5ec05c7e224c85096f5bac8344883b255e79", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils_2", + "ixx": "ixx", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749531675, + "narHash": "sha256-UB8Mc88rW9frjpJ1Fj2ro7f07Gg8dX3uVXvMXnFR4CE=", + "owner": "NuschtOS", + "repo": "search", + "rev": "4029d450d0266909ee52775849b7da54e79b328e", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -742,6 +855,26 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749533342, + "narHash": "sha256-cQzKzqsPQmDBRDjcX4UFEQKNeAyibLIKkF+BBhE2JnI=", + "ref": "refs/heads/master", + "rev": "2b01a75679a03bd6557cf11c20b1588f436d6b94", + "revCount": 571, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, "root": { "inputs": { "catppuccin": "catppuccin", @@ -752,6 +885,8 @@ "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_4", + "nixvim": "nixvim", + "quickshell": "quickshell", "zen-browser": "zen-browser" } }, @@ -800,6 +935,36 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index 04a9d32..3b78a51 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,17 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; + + quickshell = { + url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; # Required by NixOS: diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index c652451..e17971a 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -133,6 +133,7 @@ inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.ghostty ]; + qt.enable = true; qt.platformTheme = "qt5ct"; xdg.terminal-exec.enable = true; @@ -194,6 +195,12 @@ home-manager.users.ocbwoy3 = { config, pkgs, ... }: { + programs.neovim = { + defaultEditor = true; + viAlias = true; + vimAlias = true; + }; + imports = [ inputs.catppuccin.homeModules.catppuccin inputs.zen-browser.homeModules.beta diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix index cb22071..2bd409e 100644 --- a/hosts/default/packages.nix +++ b/hosts/default/packages.nix @@ -1,7 +1,7 @@ { inputs, config, pkgs, ... }: { - + fonts.packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans @@ -34,6 +34,9 @@ (callPackage ./apps/wl-shimeji.nix {}) (writeShellScriptBin "stop-shimejis" ''${inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland}/bin/hyprctl dispatch exec "shimejictl stop"'') # (writeShellScriptBin "partynoob" ''shimejictl summon PartyNoob'') + + inputs.quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default + kdePackages.qtdeclarative catppuccin-gtk catppuccin catppuccin-qt5ct @@ -54,7 +57,6 @@ imagemagick alacritty libimobiledevice - vim direnv nautilus kdePackages.dolphin diff --git a/modules/nixos/hardware.nix b/modules/nixos/hardware.nix index 13c2147..091a8de 100644 --- a/modules/nixos/hardware.nix +++ b/modules/nixos/hardware.nix @@ -37,7 +37,7 @@ }; }; - services.getty.enable = false; + # services.getty.enable = false; systemd.services."getty@tty1".enable = false; systemd.services."getty@tty2".enable = false; systemd.services."getty@tty3".enable = false; diff --git a/scripts/bin/handleScreenshot.ts b/scripts/bin/handleScreenshot.ts index f06e6d0..0bd3693 100755 --- a/scripts/bin/handleScreenshot.ts +++ b/scripts/bin/handleScreenshot.ts @@ -4,6 +4,50 @@ import sharp from "sharp"; import { writeFileSync } from "fs"; import { getRegretevatorState } from "../lib/RegretevatorUtil"; +/* + + yeucc i swear to fucking god... + + {"text":"ý 999","tooltip":"Regretevator: Floor streak 999"} + + NOTE: ý turns into the regretevator icon when using DotfilesFont + + ==== + + [BloxstrapRPC] {"command":"SetRichPresence","data":{"details":"REGRETEVATOR","smallImage":{"hoverText":"The Axolotl Sun","assetId":14648053922},"state":"","largeImage":{"hoverText":"THE REGRET ELEVATOR"}}} + + IsIngame | details === "REGRETEVATOR"; smallImage?.hoverText === "The Axolotl Sun"; + + ==== + + [BloxstrapRPC] {"command":"SetRichPresence","data":{"state":"Lounging in the lobby","timeStart":0,"timeEnd":0}} + + IsIngame[Lobby] | state === "Lounging in the lobby"; + + ==== + + [BloxstrapRPC] {"command":"SetRichPresence","data":{"state":"Currently spectating ELEVATOR_CAM"}} + + InGame[Spectating] | state matches regex /$Currently spectating (.*)$/, if so, SpectateName=$1; + + ==== + + [BloxstrapRPC] {"command":"SetRichPresence","data":{"details":"Going up!","state":"Floor streak 348","timeStart":1749325817,"timeEnd":1749325839}} + + InGame[GoingUp] | details === "Going up!"; state matches regex /^Floor streak ([0-9]+)$/, if so, FloorStreak=$1; + + ==== + + [BloxstrapRPC] {"command":"SetRichPresence","data":{"details":"At Funny Maze","state":"Floor streak 348","timeStart":0,"timeEnd":0}} + + InGame[AtFloor] | details match regex /^At (.+)$/, if so, FloorName=$1; state matches regex /^Floor streak ([0-9]+)$/, if so, FloorStreak=$1; + + ==== + + TODO: Bring back `features/RegretevatorWaybar.ts` to TuxStrap + +*/ + async function getFilename(): Promise { const _d = new Date(); const windowClass = await $`hyprctl activewindow -j`.json(); diff --git a/scripts/shell/Bar.qml b/scripts/shell/Bar.qml new file mode 100644 index 0000000..e878e05 --- /dev/null +++ b/scripts/shell/Bar.qml @@ -0,0 +1,20 @@ +import Quickshell // for PanelWindow +import QtQuick // for Text +import Quickshell.Services.Mpris + +PanelWindow { + anchors { + top: true + left: true + right: true + } + + implicitHeight: 30 + + Text { + // center the bar in its parent component (the window) + anchors.centerIn: parent + + text: "hello world" + } +} diff --git a/scripts/shell/shell.qml b/scripts/shell/shell.qml new file mode 100644 index 0000000..9d093ad --- /dev/null +++ b/scripts/shell/shell.qml @@ -0,0 +1,5 @@ +import Quickshell + +Scope { + Bar {} +}