diff --git a/config/waybar/modules.json b/config/waybar/modules.json index 50d0239..97b0403 100644 --- a/config/waybar/modules.json +++ b/config/waybar/modules.json @@ -44,12 +44,13 @@ "Sober": "Roblox", "vinegar": "Vinegar", "RobloxStudio": "Roblox Studio", - "Minecraft: Forge Loading...": "Minecraft", + // "Minecraft NeoForge%*? 1%.2[0-9](%.[0-9]+)?": "Minecraft", "gemini.google.com_/app": "Gemini", "PORTAL 2 - (OpenGL|Vulkan)": "Portal 2", "HALF-LIFE 2 - (OpenGL|Vulkan)": "Half-Life 2", "(.*) — Firefox( Developer Edition)?": "$1", - "(.*) - Google( Search| meklēšana)?": "$1" + "(.*) - Google( Search| meklēšana)?": "$1", + "Minecraft NeoForge%*(.+)": "Minecraft" }, "separate-outputs": false }, diff --git a/hosts/default/other/activate.nix b/hosts/default/other/activate.nix index 441e310..1f98bde 100644 --- a/hosts/default/other/activate.nix +++ b/hosts/default/other/activate.nix @@ -2,21 +2,26 @@ { - # system.nixos = { - # distroName = "OCbwoy3"; - # extraOSReleaseArgs = { - # HOME_URL="https://ocbwoy3.dev/"; - # VERSION_CODENAME=""; - # NAME="OCbwoy3"; - # PRETTY_NAME="OCbwoy3"; - # }; - # }; + environment.systemPackages = [ + (pkgs.callPackage ./../packages/ocbwoy3-icons/default.nix {}) + ]; + + system.nixos = { + extraOSReleaseArgs = { + LOGO="ocbwoy3-system"; + }; + }; + + system.name = "ocbwoy3"; + system.nixos.label = "ocbwoy3-config-main"; + boot.loader.grub.configurationName = lib.mkDefault "ocbwoy3/config:main"; system.activationScripts.installRoblox = { text = '' # install roblox manually from flathub 😍 if [ ! -d "/home/ocbwoy3/.var/app/org.vinegarhq.Sober" ]; then - echo "Please Install Roblox - https://flathub.org/apps/org.vinegarhq.Sober" + echo "Please Install Roblox" + # echo "flathub.org/apps/org.vinegarhq.Sober" echo "$ flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo" echo "$ flatpak install --user flathub org.vinegarhq.Sober" fi diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix index d7f1051..cb22071 100644 --- a/hosts/default/packages.nix +++ b/hosts/default/packages.nix @@ -125,6 +125,8 @@ protonvpn-gui (writeShellScriptBin "protonvpn" ''${pkgs.protonvpn-cli}/bin/protonvpn-cli "$@"'') + kdePackages.kdialog + (writeShellScriptBin "roblox-studio-patcher" ''${pkgs.bun}/bin/bun run /home/ocbwoy3/config/scripts/bin/patchInternalRobloxStudio.ts'') firefox-devedition diff --git a/hosts/default/packages/ocbwoy3-icons/default.nix b/hosts/default/packages/ocbwoy3-icons/default.nix new file mode 100644 index 0000000..90db1b2 --- /dev/null +++ b/hosts/default/packages/ocbwoy3-icons/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchgit, pkg-config, wayland, wayland-protocols, wlr-protocols, wayland-scanner, libspng, pkgs }: + +stdenv.mkDerivation rec { + pname = "ocbwoy3-system-icons"; + version = "1.0.0"; + src = ./.; + + nativeBuildInputs = [ ]; + + buildInputs = [ ]; + + installPhase = '' + mkdir -p $out/share/icons/hicolor/{128x128,256x256,512x512}/apps + for size in 128x128 256x256 512x512; do + cp ./logo.png $out/share/icons/hicolor/$size/apps/ocbwoy3-system.png + done + ''; + + meta = with lib; { + description = "OCbwoy3's custom icons for NixOS"; + homepage = "https://github.com/ocbwoy3/config"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/hosts/default/packages/ocbwoy3-icons/logo.png b/hosts/default/packages/ocbwoy3-icons/logo.png new file mode 100644 index 0000000..81aabf8 Binary files /dev/null and b/hosts/default/packages/ocbwoy3-icons/logo.png differ