From f86394e5908762008c17f5c0679124734359b613 Mon Sep 17 00:00:00 2001 From: Natalie Marks Date: Thu, 8 Jan 2026 19:30:55 -0800 Subject: [PATCH] feat (natalie): change hyprland multimonitor package --- flake.lock | 212 +++++++++----------- flake.nix | 6 +- lib/mkSystem.nix | 1 - modules/nixos/nvidia.nix | 2 +- modules/shared/nix.nix | 4 - users/natalie/home/hyprland/binds.nix | 46 ++--- users/natalie/home/hyprland/exec-once.nix | 2 +- users/natalie/home/hyprland/plugins.nix | 7 +- users/natalie/home/hyprland/windowrules.nix | 32 +-- users/natalie/home/vicinae.nix | 3 +- users/natalie/home/waybar/settings.nix | 2 +- 11 files changed, 138 insertions(+), 179 deletions(-) diff --git a/flake.lock b/flake.lock index 5a4b7f887b3e7d6b2bf939e0c4949f441c3cd629..4e9587077e83ebb081bdca0f235d0b4d04d68790 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ ] }, "locked": { - "lastModified": 1764714051, - "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", + "lastModified": 1765900596, + "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a43bedcceced5c21ad36578ed823e6099af78214", + "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1765065051, - "narHash": "sha256-b7W9WsvyMOkUScNxbzS45KEJp0iiqRPyJ1I3JBE+oEE=", + "lastModified": 1766038392, + "narHash": "sha256-ht/GuKaw5NT3M12xM+mkUtkSBVtzjJ8IHIy6R/ncv9g=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "7e22bf538aa3e0937effcb1cee73d5f1bcc26f79", + "rev": "5fb45ece6129bd7ad8f7310df0ae9c00bae7c562", "type": "github" }, "original": { @@ -249,7 +249,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1705309234, @@ -267,7 +267,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -285,7 +285,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1705309234, @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", + "lastModified": 1766171975, + "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", "type": "github" }, "original": { @@ -456,11 +456,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1765104552, - "narHash": "sha256-oaYLaXFEOHrS67UBWUcG8S8lFNTmLo65x8CmT++iLug=", + "lastModified": 1766257984, + "narHash": "sha256-qsrSpSPvOD8RWGdE+dqzQhmJRndG4gSc1Pyli74CYIY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "76ac655c9e624069cf17f470773e37d8172ee290", + "rev": "70f54a1e1ba3478a56faf82431b2770bd727431d", "type": "github" }, "original": { @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1764812575, - "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=", + "lastModified": 1765643131, + "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "fd321368a40c782cfa299991e5584ca338e36ebe", + "rev": "e50ae912813bdfa8372d62daf454f48d6df02297", "type": "github" }, "original": { @@ -527,11 +527,11 @@ ] }, "locked": { - "lastModified": 1759610243, - "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=", + "lastModified": 1765214753, + "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622", + "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab", "type": "github" }, "original": { @@ -569,6 +569,26 @@ "type": "github" } }, + "hyprsplit": { + "inputs": { + "hyprland": [ + "hyprland" + ] + }, + "locked": { + "lastModified": 1766100188, + "narHash": "sha256-Hi9USQQ+FkouYs4gJ+H0YSrluanjnGrGrhopjssFqOo=", + "owner": "shezdy", + "repo": "hyprsplit", + "rev": "131a2bc5daba1e9cc4845456b44b311ca54f6316", + "type": "github" + }, + "original": { + "owner": "shezdy", + "repo": "hyprsplit", + "type": "github" + } + }, "hyprtoolkit": { "inputs": { "aquamarine": [ @@ -633,11 +653,11 @@ ] }, "locked": { - "lastModified": 1764962281, - "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", + "lastModified": 1766160771, + "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", + "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f", "type": "github" }, "original": { @@ -687,11 +707,11 @@ ] }, "locked": { - "lastModified": 1764872015, - "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=", + "lastModified": 1766253200, + "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=", "owner": "hyprwm", "repo": "hyprwire", - "rev": "7997451dcaab7b9d9d442f18985d514ec5891608", + "rev": "1079777525b30a947c8d657fac158e00ae85de9d", "type": "github" }, "original": { @@ -734,11 +754,11 @@ ] }, "locked": { - "lastModified": 1764208378, - "narHash": "sha256-Qur5AWl4Vx+It65DX+I+sc4lViz52OmXqvg+fL2t9I4=", + "lastModified": 1765916709, + "narHash": "sha256-qc4m7v8hGOMb9BVLuiQZAbgzHoKfVwEY7HUl9fsY/hE=", "owner": "moonlight-mod", "repo": "moonlight", - "rev": "059476af87f7335c05424b805833864d6d9ed0e3", + "rev": "d0ad754cf0b9c5a34d7f69595f407c8199f988ce", "type": "github" }, "original": { @@ -747,18 +767,21 @@ "type": "github" } }, - "nix-filter": { + "ndg": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, "locked": { - "lastModified": 1693833173, - "narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "ac030bd9ba98e318e1f4c4328d60766ade8ebe8b", + "lastModified": 1765435293, + "narHash": "sha256-HRp4g6qBCb8vpJ17s2FacMRXRszM73uBiR56aILMELA=", + "owner": "feel-co", + "repo": "ndg", + "rev": "65bf834b332d5f8b28d95ea14c7974be7c272971", "type": "github" }, "original": { - "owner": "numtide", - "repo": "nix-filter", + "owner": "feel-co", + "repo": "ndg", "type": "github" } }, @@ -769,11 +792,11 @@ ] }, "locked": { - "lastModified": 1765080594, - "narHash": "sha256-5t3d655GqLblE+p5xN5ntkeRfZBesN7vehOWcRcU88M=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "4194c582d0a3f440382ee00b729ea5cc5ef59754", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -789,11 +812,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1764771319, - "narHash": "sha256-SllXl+Void1CIMk2jkKJXp7PL/31JeWir/Q8GAsuvEM=", + "lastModified": 1765642879, + "narHash": "sha256-LIKEZW++qgg8FSpJtAayv6yfIF3CO42GpryyeJ4pk7M=", "owner": "madsbv", "repo": "nix-options-search", - "rev": "cccbb97d813c462bd85012740bc1c02c9c267808", + "rev": "b91e3ad2b4f3afbf0ceadb140fb9a0d342733b2e", "type": "github" }, "original": { @@ -804,11 +827,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -836,11 +859,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764947035, - "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=", + "lastModified": 1766125104, + "narHash": "sha256-l/YGrEpLromL4viUo5GmFH3K5M1j0Mb9O+LiaeCPWEM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a672be65651c80d3f592a89b3945466584a22069", + "rev": "7d853e518814cca2a657b72eeba67ae20ebf7059", "type": "github" }, "original": { @@ -851,11 +874,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -902,17 +925,18 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "mnw": "mnw", + "ndg": "ndg", "nixpkgs": [ "nixpkgs" ], "systems": "systems_4" }, "locked": { - "lastModified": 1764871278, - "narHash": "sha256-ezKJwZeAtZSO9EA3aLl5bmjjAVUoLE69IC+yX/KSqDM=", + "lastModified": 1765537745, + "narHash": "sha256-EaFYxx2aSuM2xx+l+E55YNMCJOoQBl2tJybxyF0pPqw=", "owner": "notashelf", "repo": "nvf", - "rev": "43b48909a3d0c96f5c3d9a9e50d6faabbeccc9dd", + "rev": "8e031476d0d7f326b63c9c5522f840e2f8b724c0", "type": "github" }, "original": { @@ -944,11 +968,11 @@ ] }, "locked": { - "lastModified": 1765016596, - "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", "type": "github" }, "original": { @@ -964,14 +988,13 @@ "darwin": "darwin", "home-manager": "home-manager", "hyprland": "hyprland", + "hyprsplit": "hyprsplit", "moonlight": "moonlight", "nix-index-database": "nix-index-database", "nix-options-search": "nix-options-search", "nixpkgs": "nixpkgs_3", "nvf": "nvf", "rust-overlay": "rust-overlay", - "split-monitor-workspaces": "split-monitor-workspaces", - "vicinae": "vicinae", "zen-browser": "zen-browser", "zig": "zig", "zls": "zls" @@ -984,11 +1007,11 @@ ] }, "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", + "lastModified": 1766198367, + "narHash": "sha256-f1L1rCEu2Zew6zdiZ38jJDZd65ktE7UN+Gqn2LHPiFI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", + "rev": "66bb33fdfb50b1ee724381c3f5d6012dac6c89b3", "type": "github" }, "original": { @@ -1081,27 +1104,6 @@ "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" } }, - "split-monitor-workspaces": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "nix-filter": "nix-filter" - }, - "locked": { - "lastModified": 1764873455, - "narHash": "sha256-ehm3Y0xCUkJnbDwM0wwu9DBj7f3lLTwFW9GBxH93w2s=", - "owner": "Duckonaut", - "repo": "split-monitor-workspaces", - "rev": "34d1ce459b4f13e77d8f2a0851475497abee2c98", - "type": "github" - }, - "original": { - "owner": "Duckonaut", - "repo": "split-monitor-workspaces", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -1207,40 +1209,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "vicinae": { - "inputs": { - "nixpkgs": "nixpkgs_4", - "systems": "systems_5" - }, - "locked": { - "lastModified": 1764939234, - "narHash": "sha256-o/0emFrTtNzfxQis6U1onAJMR63APCigiZNmqLxVM1E=", - "owner": "vicinaehq", - "repo": "vicinae", - "rev": "d50101fc04c76a9acc3785da5459f6884fc6984b", - "type": "github" - }, - "original": { - "owner": "vicinaehq", - "repo": "vicinae", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1289,11 +1257,11 @@ ] }, "locked": { - "lastModified": 1764648680, - "narHash": "sha256-B/nmawJ75/951Xs9ludSxDVd/txFY+odmcbinySqMQo=", + "lastModified": 1765772419, + "narHash": "sha256-1mQ1K4fqebT54nz13rcRNjd6a+IbNLwLvYyR62EcyE8=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "897df2f2ad4880563ce801fa29f348a4e98f0a20", + "rev": "227e836e43fe7985b4c4f8b0076446a6d66f3343", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ffbf73ebbc250227200823d2e60c2cc4139855db..91c6063db024d6e7d3046c65ef662db793ffd4ff 100644 --- a/flake.nix +++ b/flake.nix @@ -25,13 +25,11 @@ moonlight.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "github:hyprwm/Hyprland"; - split-monitor-workspaces = { - url = "github:Duckonaut/split-monitor-workspaces"; + hyprsplit = { + url = "github:shezdy/hyprsplit"; inputs.hyprland.follows = "hyprland"; }; - vicinae.url = "github:vicinaehq/vicinae"; - zen-browser = { url = "github:youwen5/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix index e8f6a0ce18544893f6ecffe87e6e86b065885c44..9e3a13c459d7382e0c7d888d249f7ccb23a00fff 100644 --- a/lib/mkSystem.nix +++ b/lib/mkSystem.nix @@ -76,7 +76,6 @@ let ) inputs.nvf.homeManagerModules.default inputs.android-nixpkgs.hmModule - inputs.vicinae.homeManagerModules.default ]; in systemFunc { diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index 07da1ea6a0b00b9d2454cfce62b531447bbae0a1..70718b5dd8815a83696b806b9d67a14279224192 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -76,7 +76,7 @@ in # #Fixes a glitch # nvidiaPersistenced = true; }; - nvidia-container-toolkit.enable = true; + nvidia-container-toolkit.enable = false; graphics = { enable = true; diff --git a/modules/shared/nix.nix b/modules/shared/nix.nix index d07ba84632ced91604678563ceaaa68c313fdc20..7997bf0f9cf8b0613f98f2a09d69e8929a9fe821 100644 --- a/modules/shared/nix.nix +++ b/modules/shared/nix.nix @@ -28,15 +28,11 @@ "https://nix-community.cachix.org" # For haskell "https://cache.iog.io" - #vicinae - "https://vicinae.cachix.org" ]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" # For haskell "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" - #vicinae - "vicinae.cachix.org-1:1kDrfienkGHPYbkpNj1mWTr7Fm1+zcenzgTizIcI3oc=" ]; }; gc = { diff --git a/users/natalie/home/hyprland/binds.nix b/users/natalie/home/hyprland/binds.nix index 139396467a12283c9eac0839dfed3080b3712384..331a96ce2df08e24f65c323b02e9db86397f5335 100644 --- a/users/natalie/home/hyprland/binds.nix +++ b/users/natalie/home/hyprland/binds.nix @@ -72,29 +72,29 @@ "CTRL ALT, down, exec, hyprctl dispatch focuswindow tiled" # switch workspace - "$mainMod, 1, split-workspace, 1" - "$mainMod, 2, split-workspace, 2" - "$mainMod, 3, split-workspace, 3" - "$mainMod, 4, split-workspace, 4" - "$mainMod, 5, split-workspace, 5" - "$mainMod, 6, split-workspace, 6" - "$mainMod, 7, split-workspace, 7" - "$mainMod, 8, split-workspace, 8" - "$mainMod, 9, split-workspace, 9" - "$mainMod, 0, split-workspace, 10" + "$mainMod, 1, workspace, 1" + "$mainMod, 2, workspace, 2" + "$mainMod, 3, workspace, 3" + "$mainMod, 4, workspace, 4" + "$mainMod, 5, workspace, 5" + "$mainMod, 6, workspace, 6" + "$mainMod, 7, workspace, 7" + "$mainMod, 8, workspace, 8" + "$mainMod, 9, workspace, 9" + "$mainMod, 0, workspace, 10" # same as above, but switch to the workspace - "$mainMod SHIFT, 1, split-movetoworkspacesilent, 1" # movetoworkspacesilent - "$mainMod SHIFT, 2, split-movetoworkspacesilent, 2" - "$mainMod SHIFT, 3, split-movetoworkspacesilent, 3" - "$mainMod SHIFT, 4, split-movetoworkspacesilent, 4" - "$mainMod SHIFT, 5, split-movetoworkspacesilent, 5" - "$mainMod SHIFT, 6, split-movetoworkspacesilent, 6" - "$mainMod SHIFT, 7, split-movetoworkspacesilent, 7" - "$mainMod SHIFT, 8, split-movetoworkspacesilent, 8" - "$mainMod SHIFT, 9, split-movetoworkspacesilent, 9" - "$mainMod SHIFT, 0, split-movetoworkspacesilent, 10" - "$mainMod CTRL, c, split-movetoworkspace, empty" + "$mainMod SHIFT, 1, movetoworkspacesilent, 1" # movetoworkspacesilent + "$mainMod SHIFT, 2, movetoworkspacesilent, 2" + "$mainMod SHIFT, 3, movetoworkspacesilent, 3" + "$mainMod SHIFT, 4, movetoworkspacesilent, 4" + "$mainMod SHIFT, 5, movetoworkspacesilent, 5" + "$mainMod SHIFT, 6, movetoworkspacesilent, 6" + "$mainMod SHIFT, 7, movetoworkspacesilent, 7" + "$mainMod SHIFT, 8, movetoworkspacesilent, 8" + "$mainMod SHIFT, 9, movetoworkspacesilent, 9" + "$mainMod SHIFT, 0, movetoworkspacesilent, 10" + "$mainMod CTRL, c, movetoworkspace, empty" # window control "$mainMod SHIFT, left, movewindow, l" @@ -131,8 +131,8 @@ ",XF86AudioPrev,exec, playerctl previous" ",XF86AudioStop,exec, playerctl stop" - "$mainMod, mouse_down, split-workspace, e-1" - "$mainMod, mouse_up, split-workspace, e+1" + "$mainMod, mouse_down, workspace, e-1" + "$mainMod, mouse_up, workspace, e+1" # clipboard manager "$mainMod, V, exec, vicinae vicinae://extensions/vicinae/clipboard/history" diff --git a/users/natalie/home/hyprland/exec-once.nix b/users/natalie/home/hyprland/exec-once.nix index 947de457ba8c0b7d42dbd3245fb63264244fed9b..ed8e42349e677086fc831ee06fc6ba60377df180 100644 --- a/users/natalie/home/hyprland/exec-once.nix +++ b/users/natalie/home/hyprland/exec-once.nix @@ -17,7 +17,7 @@ "${pkgs.wl-clipboard}/bin/wl-paste --watch cliphist store &" # "${pkgs.waybar}/bin/waybar &" "${pkgs.swaynotificationcenter}/bin/swaync &" - "${inputs.vicinae.packages.${currentSystem}.default}/bin/vicinae server &" + "${pkgs.vicinae}/bin/vicinae server &" "${pkgs.udiskie}/bin/udiskie --automount --notify --smart-tray &" "${pkgs.hyprland}/bin/hyprctl setcursor Bibata-Modern-Ice 24 &" "${pkgs.tmux}/bin/tmux setenv -g HYPRLAND_INSTANCE_SIGNATURE '$HYPRLAND_INSTANCE_SIGNATURE'" diff --git a/users/natalie/home/hyprland/plugins.nix b/users/natalie/home/hyprland/plugins.nix index f1f97902c264ee65fca3a95a5d1ad7d16293cba6..3b11db0ee0d0c57ee5622d80e7c6d6289bf3ea51 100644 --- a/users/natalie/home/hyprland/plugins.nix +++ b/users/natalie/home/hyprland/plugins.nix @@ -2,13 +2,12 @@ { wayland.windowManager.hyprland = { plugins = [ - inputs.split-monitor-workspaces.packages.${pkgs.stdenv.hostPlatform.system}.split-monitor-workspaces + inputs.hyprsplit.packages.${pkgs.stdenv.hostPlatform.system}.hyprsplit ]; settings = { plugin = { - split-monitor-workspaces = { - count = 5; - keep_focused = 0; + hyprsplit = { + num_workspaces = 5; }; }; }; diff --git a/users/natalie/home/hyprland/windowrules.nix b/users/natalie/home/hyprland/windowrules.nix index 9c9a2d248838f16e84f98e73bcf82c86dd046d94..f06d04f98c6413a1da9bab51b14e4ecba7370a78 100644 --- a/users/natalie/home/hyprland/windowrules.nix +++ b/users/natalie/home/hyprland/windowrules.nix @@ -10,22 +10,22 @@ #awakened-poe-trade # https://github.com/SnosMe/awakened-poe-trade/issues/1137#issuecomment-2992606569 - "tag +apt, class:^(awakened-poe-trade)$" - "tag +apt, title:(Awakened PoE Trade)" - "float, tag:apt" - "noblur, tag:apt" - "nofocus, tag:apt" - "noshadow, tag:apt" - "noborder, tag:apt" - "pin, tag:apt" - "renderunfocused, tag:apt" - "size 100% 100%, tag:apt" - "center, tag:apt" - - #POE - "tag +poe, title:(Path of Exile)" - "tag +poe class:(steam_app_238960)" - "fullscreen, tag:poe$" + # "tag +apt, class:^(awakened-poe-trade)$" + # "tag +apt, title:(Awakened PoE Trade)" + # "float, tag:apt" + # "noblur, tag:apt" + # "nofocus, tag:apt" + # "noshadow, tag:apt" + # "noborder, tag:apt" + # "pin, tag:apt" + # "renderunfocused, tag:apt" + # "size 100% 100%, tag:apt" + # "center, tag:apt" + # + # #POE + # "tag +poe, title:(Path of Exile)" + # "tag +poe class:(steam_app_238960)" + # "fullscreen, tag:poe$" # https://github.com/SnosMe/awakened-poe-trade/issues/1137#issuecomment-3037816727 # "tag +fakefullscreen, title:(Path of Exile),class:(steam_app_238960)" # "tile, tag:fakefullscreen" diff --git a/users/natalie/home/vicinae.nix b/users/natalie/home/vicinae.nix index eda114a97d7e2c327fab1dc87700f53efda0a2b0..301a7a6583d68cd7e2fb2b7921400e2726e15e43 100644 --- a/users/natalie/home/vicinae.nix +++ b/users/natalie/home/vicinae.nix @@ -1,8 +1,7 @@ { inputs, pkgs, ... }: { - services.vicinae = { + programs.vicinae = { enable = true; - autoStart = false; settings = { faviconService = "twenty"; # twenty | google | none font.size = 11; diff --git a/users/natalie/home/waybar/settings.nix b/users/natalie/home/waybar/settings.nix index 1a883448d70aaff7517c8e629760bab53e4ae430..2d0498d356b9ac6477c229e5174a1751b20b3a0a 100644 --- a/users/natalie/home/waybar/settings.nix +++ b/users/natalie/home/waybar/settings.nix @@ -145,7 +145,7 @@ in "custom/launcher" = { format = ""; on-click = "random-wallpaper"; - on-click-right = "${inputs.vicinae.packages.${currentSystem}.default}vicinae vicinae://toggle"; + on-click-right = "${pkgs.vicinae}/bin/vicinae vicinae://toggle"; tooltip = "true"; tooltip-format = "Random Wallpaper"; }; -- 2.54.0