From 09a7977d3dd1a3a451e35a9b813ec90d1568590e Mon Sep 17 00:00:00 2001 From: OCbwoy3 Date: Sat, 17 May 2025 17:15:08 +0300 Subject: [PATCH] switch to firefox dev version --- .gitignore | 1 + config/hypr/config/display.conf | 6 ++++ config/waybar/config | 2 +- config/waybar/modules.json | 23 +++++++++----- config/waybar/style.css | 8 ++--- flake.lock | 54 ++++++++++++++++----------------- hosts/default/packages.nix | 4 ++- modules/nixos/bootloader.nix | 6 ++-- 8 files changed, 60 insertions(+), 44 deletions(-) diff --git a/.gitignore b/.gitignore index 171341d..5bec5f4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules .hyprfail.conf DotfilesFont.afm +private_assets diff --git a/config/hypr/config/display.conf b/config/hypr/config/display.conf index 9978d0d..a03bb97 100644 --- a/config/hypr/config/display.conf +++ b/config/hypr/config/display.conf @@ -106,5 +106,11 @@ windowrulev2 = center,class:^(nm-connection-editor)$ windowrule = maximize, class:steam_proton,title:^(Roblox Studio)$ +# dotfille settings +windowrulev2 = float,class:io.Astal.ocbwoy3-settings +windowrulev2 = size 900 500,class:io.Astal.ocbwoy3-settings +windowrulev2 = center,class:io.Astal.ocbwoy3-settings + + # windowrulev2 = immediate, class:^(sober)$ # windowrulev2 = fullscreen,title:^(Sober)$ diff --git a/config/waybar/config b/config/waybar/config index 7119e78..c1874dc 100644 --- a/config/waybar/config +++ b/config/waybar/config @@ -14,7 +14,7 @@ ], "modules-right": [ // "custom/regretevator_state", - "custom/music", + "mpris", "group/traygroup", "clock" ] diff --git a/config/waybar/modules.json b/config/waybar/modules.json index d477cea..ec63a09 100644 --- a/config/waybar/modules.json +++ b/config/waybar/modules.json @@ -8,15 +8,18 @@ "format": " " }, - "custom/music": { - "return-type": "json", - "exec": "bash ~/config/scripts/waybar-music-status.sh", - "restart-interval": 1, + "mpris": { + "player": "cider", + "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-", "on-click": "playerctl -p cider,OCbwoy3_s_iPhone play-pause", "on-click-right": "playerctl -p cider,OCbwoy3_s_iPhone next", "on-click-middle": "playerctl -p cider,OCbwoy3_s_iPhone previous", + "format": " {artist} — {title}", + "tooltip-format": "{album}", + "tooltip-format-stopped": "", + "format-stopped": "", "smooth-scrolling-treshold": 40, "max-length": 60 }, @@ -28,7 +31,10 @@ }, "hyprland/window": { + "format": "{}", "rewrite": { + "(.*) (- Roblox )?(— Mozilla Firefox( Private Browsing)?|(—|-) Brave)": "$1", + "(.*) - Roblox": "$1", "swappy": "Swappy", "Support Hyprland": "Hyprland", "MainPicker": "Hyprland", @@ -41,10 +47,9 @@ "Minecraft: Forge Loading...": "Minecraft", "gemini.google.com_/app": "Gemini", "PORTAL 2 - (OpenGL|Vulkan)": "Portal 2", - "HALF-LIFE 2 - (OpenGL|Vulkan)": "Half-Life 2", - "(.*) (— Mozilla Firefox( Private Browsing)?|(—|-) Brave)": "$1" + "HALF-LIFE 2 - (OpenGL|Vulkan)": "Half-Life 2" }, - "separate-outputs": true + "separate-outputs": false }, "hyprland/workspaces": { @@ -69,8 +74,10 @@ }, "clock": { + "timezone": "Europe/Riga", + "locale": "lv_LV.UTF-8", "format": "{:%H:%M}", - "tooltip-format": "{:%A %d %B %Y}", + "tooltip-format": "{:L%Y. gada %e. %B}", "format-alt": "{:%H:%M:%S}", "interval": 1 }, diff --git a/config/waybar/style.css b/config/waybar/style.css index 73f291f..47ee9b1 100644 --- a/config/waybar/style.css +++ b/config/waybar/style.css @@ -15,7 +15,7 @@ window#waybar { padding: 3px 5px 3px 5px; } -#workspaces, #custom-music, #traygroup, #clock, #window, #custom-regretevator_state { +#workspaces, #mpris, #traygroup, #clock, #window, #custom-regretevator_state { border-radius: 8px; padding: 2px 5px 2px 5px; border: 2px solid #89b4fa; @@ -25,7 +25,7 @@ window#waybar { font-family: "Geist Mono"; } -#traygroup, #custom-music, #window, #workspaces, #custom-regretevator_state { +#traygroup, #mpris, #window, #workspaces, #custom-regretevator_state { background-color: #1e1e2e; padding-left: 5px; padding-right: 5px; @@ -36,7 +36,7 @@ window#waybar { font-family: 'DotfilesFont', 'Symbols Nerd Font', 'Geist'; } -#custom-music, #clock, #window { +#mpris, #clock, #window { padding-left: 10px; padding-right: 10px; } @@ -106,7 +106,7 @@ window#waybar { -gtk-icon-effect: highlight; } -.invisible { +.invisible, #mpris.stopped { padding: 0px 0px 0px 0px; margin: 0px 0px 0px 0px; background-color: transparent; diff --git a/flake.lock b/flake.lock index c586023..0a74ed4 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1744289235, - "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=", + "lastModified": 1745357003, + "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a", + "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f", "type": "github" }, "original": { @@ -182,11 +182,11 @@ ] }, "locked": { - "lastModified": 1742215578, - "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", + "lastModified": 1745948457, + "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", + "rev": "ac903e80b33ba6a88df83d02232483d99f327573", "type": "github" }, "original": { @@ -240,11 +240,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1745328209, - "narHash": "sha256-eP3x+JNE1T6RjXhimaEnoc4GvNJcyzppW1vpAs287Zg=", + "lastModified": 1746825381, + "narHash": "sha256-q//4N6ZoN6eBelgzUheQ07Oj6UilDjAOld0eKjnXQd0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "241a4935a244f403fa7108259075b04c81ed258f", + "rev": "60cd5b7a48af4a23717201d70395161a3bb4ab24", "type": "github" }, "original": { @@ -359,11 +359,11 @@ ] }, "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", + "lastModified": 1745951494, + "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", + "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1744468525, - "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", + "lastModified": 1746655412, + "narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", + "rev": "557241780c179cf7ef224df392f8e67dab6cef83", "type": "github" }, "original": { @@ -462,11 +462,11 @@ ] }, "locked": { - "lastModified": 1743950287, - "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", + "lastModified": 1746635225, + "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", + "rev": "674ea57373f08b7609ce93baff131117a0dfe70d", "type": "github" }, "original": { @@ -636,11 +636,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -692,11 +692,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -790,11 +790,11 @@ ] }, "locked": { - "lastModified": 1744644585, - "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=", + "lastModified": 1745871725, + "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26", + "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", "type": "github" }, "original": { diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix index 3675430..f6045a0 100644 --- a/hosts/default/packages.nix +++ b/hosts/default/packages.nix @@ -125,7 +125,9 @@ (writeShellScriptBin "protonvpn" ''${pkgs.protonvpn-cli}/bin/protonvpn-cli "$@"'') (writeShellScriptBin "roblox-studio-patcher" ''${pkgs.bun}/bin/bun run /home/ocbwoy3/config/scripts/bin/patchInternalRobloxStudio.ts'') - firefox + (firefox.override { + channel = "dev-edition"; + }) ]; diff --git a/modules/nixos/bootloader.nix b/modules/nixos/bootloader.nix index 34c29fc..bbf4ae1 100644 --- a/modules/nixos/bootloader.nix +++ b/modules/nixos/bootloader.nix @@ -13,9 +13,9 @@ boot.supportedFilesystems = [ "ntfs" ]; - boot.plymouth = { - enable = true; - }; + # boot.plymouth = { + # enable = true; + # }; boot.initrd.verbose = true; boot.kernelParams = [