diff --git a/Cargo.lock b/Cargo.lock index 3771aa5..75bcca3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -538,7 +538,7 @@ dependencies = [ [[package]] name = "niri-tag" -version = "0.1.1" +version = "0.1.0" dependencies = [ "anyhow", "clap", diff --git a/Cargo.toml b/Cargo.toml index 14c996e..b9dce92 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,7 @@ [package] name = "niri-tag" -version = "0.1.1" +version = "0.1.0" edition = "2024" -authors = [ "atagen " ] -description = "Tag-based window management for the Niri compositor" -readme = "README.md" -license = "EUPL-1.2" -keywords = ["niri", "ipc", "window management"] -repository = "https://git.atagen.co/atagen/niri-tag" [lib] crate-type = [ "lib" ] diff --git a/LICENSE b/LICENSE deleted file mode 100644 index dacd3ae..0000000 --- a/LICENSE +++ /dev/null @@ -1,288 +0,0 @@ - - EUROPEAN UNION PUBLIC LICENCE v. 1.2 - EUPL © the European Union 2007, 2016 - -This European Union Public Licence (the ‘EUPL’) applies to the Work (as defined -below) which is provided under the terms of this Licence. Any use of the Work, -other than as authorised under this Licence is prohibited (to the extent such -use is covered by a right of the copyright holder of the Work). - -The Work is provided under the terms of this Licence when the Licensor (as -defined below) has placed the following notice immediately following the -copyright notice for the Work: - - Licensed under the EUPL - -or has expressed by any other means his willingness to license under the EUPL. - -1. Definitions - -In this Licence, the following terms have the following meaning: - -- ‘The Licence’: this Licence. - -- ‘The Original Work’: the work or software distributed or communicated by the - Licensor under this Licence, available as Source Code and also as Executable - Code as the case may be. - -- ‘Derivative Works’: the works or software that could be created by the - Licensee, based upon the Original Work or modifications thereof. This Licence - does not define the extent of modification or dependence on the Original Work - required in order to classify a work as a Derivative Work; this extent is - determined by copyright law applicable in the country mentioned in Article 15. - -- ‘The Work’: the Original Work or its Derivative Works. - -- ‘The Source Code’: the human-readable form of the Work which is the most - convenient for people to study and modify. - -- ‘The Executable Code’: any code which has generally been compiled and which is - meant to be interpreted by a computer as a program. - -- ‘The Licensor’: the natural or legal person that distributes or communicates - the Work under the Licence. - -- ‘Contributor(s)’: any natural or legal person who modifies the Work under the - Licence, or otherwise contributes to the creation of a Derivative Work. - -- ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of - the Work under the terms of the Licence. - -- ‘Distribution’ or ‘Communication’: any act of selling, giving, lending, - renting, distributing, communicating, transmitting, or otherwise making - available, online or offline, copies of the Work or providing access to its - essential functionalities at the disposal of any other natural or legal - person. - -2. Scope of the rights granted by the Licence - -The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, -sublicensable licence to do the following, for the duration of copyright vested -in the Original Work: - -- use the Work in any circumstance and for all usage, -- reproduce the Work, -- modify the Work, and make Derivative Works based upon the Work, -- communicate to the public, including the right to make available or display - the Work or copies thereof to the public and perform publicly, as the case may - be, the Work, -- distribute the Work or copies thereof, -- lend and rent the Work or copies thereof, -- sublicense rights in the Work or copies thereof. - -Those rights can be exercised on any media, supports and formats, whether now -known or later invented, as far as the applicable law permits so. - -In the countries where moral rights apply, the Licensor waives his right to -exercise his moral right to the extent allowed by law in order to make effective -the licence of the economic rights here above listed. - -The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to -any patents held by the Licensor, to the extent necessary to make use of the -rights granted on the Work under this Licence. - -3. Communication of the Source Code - -The Licensor may provide the Work either in its Source Code form, or as -Executable Code. If the Work is provided as Executable Code, the Licensor -provides in addition a machine-readable copy of the Source Code of the Work -along with each copy of the Work that the Licensor distributes or indicates, in -a notice following the copyright notice attached to the Work, a repository where -the Source Code is easily and freely accessible for as long as the Licensor -continues to distribute or communicate the Work. - -4. Limitations on copyright - -Nothing in this Licence is intended to deprive the Licensee of the benefits from -any exception or limitation to the exclusive rights of the rights owners in the -Work, of the exhaustion of those rights or of other applicable limitations -thereto. - -5. Obligations of the Licensee - -The grant of the rights mentioned above is subject to some restrictions and -obligations imposed on the Licensee. Those obligations are the following: - -Attribution right: The Licensee shall keep intact all copyright, patent or -trademarks notices and all notices that refer to the Licence and to the -disclaimer of warranties. The Licensee must include a copy of such notices and a -copy of the Licence with every copy of the Work he/she distributes or -communicates. The Licensee must cause any Derivative Work to carry prominent -notices stating that the Work has been modified and the date of modification. - -Copyleft clause: If the Licensee distributes or communicates copies of the -Original Works or Derivative Works, this Distribution or Communication will be -done under the terms of this Licence or of a later version of this Licence -unless the Original Work is expressly distributed only under this version of the -Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee -(becoming Licensor) cannot offer or impose any additional terms or conditions on -the Work or Derivative Work that alter or restrict the terms of the Licence. - -Compatibility clause: If the Licensee Distributes or Communicates Derivative -Works or copies thereof based upon both the Work and another work licensed under -a Compatible Licence, this Distribution or Communication can be done under the -terms of this Compatible Licence. For the sake of this clause, ‘Compatible -Licence’ refers to the licences listed in the appendix attached to this Licence. -Should the Licensee's obligations under the Compatible Licence conflict with -his/her obligations under this Licence, the obligations of the Compatible -Licence shall prevail. - -Provision of Source Code: When distributing or communicating copies of the Work, -the Licensee will provide a machine-readable copy of the Source Code or indicate -a repository where this Source will be easily and freely available for as long -as the Licensee continues to distribute or communicate the Work. - -Legal Protection: This Licence does not grant permission to use the trade names, -trademarks, service marks, or names of the Licensor, except as required for -reasonable and customary use in describing the origin of the Work and -reproducing the content of the copyright notice. - -6. Chain of Authorship - -The original Licensor warrants that the copyright in the Original Work granted -hereunder is owned by him/her or licensed to him/her and that he/she has the -power and authority to grant the Licence. - -Each Contributor warrants that the copyright in the modifications he/she brings -to the Work are owned by him/her or licensed to him/her and that he/she has the -power and authority to grant the Licence. - -Each time You accept the Licence, the original Licensor and subsequent -Contributors grant You a licence to their contributions to the Work, under the -terms of this Licence. - -7. Disclaimer of Warranty - -The Work is a work in progress, which is continuously improved by numerous -Contributors. It is not a finished work and may therefore contain defects or -‘bugs’ inherent to this type of development. - -For the above reason, the Work is provided under the Licence on an ‘as is’ basis -and without warranties of any kind concerning the Work, including without -limitation merchantability, fitness for a particular purpose, absence of defects -or errors, accuracy, non-infringement of intellectual property rights other than -copyright as stated in Article 6 of this Licence. - -This disclaimer of warranty is an essential part of the Licence and a condition -for the grant of any rights to the Work. - -8. Disclaimer of Liability - -Except in the cases of wilful misconduct or damages directly caused to natural -persons, the Licensor will in no event be liable for any direct or indirect, -material or moral, damages of any kind, arising out of the Licence or of the use -of the Work, including without limitation, damages for loss of goodwill, work -stoppage, computer failure or malfunction, loss of data or any commercial -damage, even if the Licensor has been advised of the possibility of such damage. -However, the Licensor will be liable under statutory product liability laws as -far such laws apply to the Work. - -9. Additional agreements - -While distributing the Work, You may choose to conclude an additional agreement, -defining obligations or services consistent with this Licence. However, if -accepting obligations, You may act only on your own behalf and on your sole -responsibility, not on behalf of the original Licensor or any other Contributor, -and only if You agree to indemnify, defend, and hold each Contributor harmless -for any liability incurred by, or claims asserted against such Contributor by -the fact You have accepted any warranty or additional liability. - -10. Acceptance of the Licence - -The provisions of this Licence can be accepted by clicking on an icon ‘I agree’ -placed under the bottom of a window displaying the text of this Licence or by -affirming consent in any other similar way, in accordance with the rules of -applicable law. Clicking on that icon indicates your clear and irrevocable -acceptance of this Licence and all of its terms and conditions. - -Similarly, you irrevocably accept this Licence and all of its terms and -conditions by exercising any rights granted to You by Article 2 of this Licence, -such as the use of the Work, the creation by You of a Derivative Work or the -Distribution or Communication by You of the Work or copies thereof. - -11. Information to the public - -In case of any Distribution or Communication of the Work by means of electronic -communication by You (for example, by offering to download the Work from a -remote location) the distribution channel or media (for example, a website) must -at least provide to the public the information requested by the applicable law -regarding the Licensor, the Licence and the way it may be accessible, concluded, -stored and reproduced by the Licensee. - -12. Termination of the Licence - -The Licence and the rights granted hereunder will terminate automatically upon -any breach by the Licensee of the terms of the Licence. - -Such a termination will not terminate the licences of any person who has -received the Work from the Licensee under the Licence, provided such persons -remain in full compliance with the Licence. - -13. Miscellaneous - -Without prejudice of Article 9 above, the Licence represents the complete -agreement between the Parties as to the Work. - -If any provision of the Licence is invalid or unenforceable under applicable -law, this will not affect the validity or enforceability of the Licence as a -whole. Such provision will be construed or reformed so as necessary to make it -valid and enforceable. - -The European Commission may publish other linguistic versions or new versions of -this Licence or updated versions of the Appendix, so far this is required and -reasonable, without reducing the scope of the rights granted by the Licence. New -versions of the Licence will be published with a unique version number. - -All linguistic versions of this Licence, approved by the European Commission, -have identical value. Parties can take advantage of the linguistic version of -their choice. - -14. Jurisdiction - -Without prejudice to specific agreement between parties, - -- any litigation resulting from the interpretation of this License, arising - between the European Union institutions, bodies, offices or agencies, as a - Licensor, and any Licensee, will be subject to the jurisdiction of the Court - of Justice of the European Union, as laid down in article 272 of the Treaty on - the Functioning of the European Union, - -- any litigation arising between other parties and resulting from the - interpretation of this License, will be subject to the exclusive jurisdiction - of the competent court where the Licensor resides or conducts its primary - business. - -15. Applicable Law - -Without prejudice to specific agreement between parties, - -- this Licence shall be governed by the law of the European Union Member State - where the Licensor has his seat, resides or has his registered office, - -- this licence shall be governed by Belgian law if the Licensor has no seat, - residence or registered office inside a European Union Member State. - -Appendix - -‘Compatible Licences’ according to Article 5 EUPL are: - -- GNU General Public License (GPL) v. 2, v. 3 -- GNU Affero General Public License (AGPL) v. 3 -- Open Software License (OSL) v. 2.1, v. 3.0 -- Eclipse Public License (EPL) v. 1.0 -- CeCILL v. 2.0, v. 2.1 -- Mozilla Public Licence (MPL) v. 2 -- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 -- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for - works other than software -- European Union Public Licence (EUPL) v. 1.1, v. 1.2 -- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong - Reciprocity (LiLiQ-R+). - -The European Commission may update this Appendix to later versions of the above -licences without producing a new version of the EUPL, as long as they provide -the rights granted in Article 2 of this Licence and protect the covered Source -Code from exclusive appropriation. - -All other changes or additions to this Appendix require the production of a new -EUPL version. diff --git a/README.md b/README.md index c9e404b..a17d68c 100644 --- a/README.md +++ b/README.md @@ -113,10 +113,6 @@ prepopulate = 3 # paradigm, or get your desktop stuck in a weird state. strict = true -# activation on fill -# this will auto-activate an empty + disabled tags if you send a window to it -activation_on_fill = true - ```` ## ipc diff --git a/daemon/manager.rs b/daemon/manager.rs index 6a21416..7332485 100644 --- a/daemon/manager.rs +++ b/daemon/manager.rs @@ -135,7 +135,7 @@ impl NiriTag { } } - async fn do_actions(&mut self, actions: &[TagAction]) -> Result<()> { + async fn do_action(&mut self, action: TagAction) -> Result<()> { use TagAction::*; let (active, inactive): (HashMap<_, _>, HashMap<_, _>) = self .state @@ -144,103 +144,102 @@ impl NiriTag { .clone() .into_iter() .partition(|(_, ws)| ws.is_active); - for action in actions { - match action { - Window(wid) => { - let current_tag = *self.windows.entry(*wid).or_insert(0); - let tag_visible = self.tags.entry(current_tag).or_default().enabled; - let win = self - .state - .windows - .windows - .get(wid) - .ok_or(anyhow!("Failed to retrieve window {} from niri state", wid))?; - let wsid: u64 = win - .workspace_id - .ok_or(anyhow!("Retrieving workspace id of a changed window"))?; - let win_visible = active.contains_key(&wsid); - match (win_visible, tag_visible) { - (true, false) => { - let inactive_same_output = self.same_output(wsid, &inactive)?; - tell( - &mut self.socket, - Request::Action(Action::MoveWindowToWorkspace { - window_id: Some(*wid), - reference: WorkspaceReferenceArg::Id(inactive_same_output.id), - focus: false, - }), - ) - .await? - } - (false, true) => { - let active_same_output = self.same_output(wsid, &active)?; - tell( - &mut self.socket, - Request::Action(Action::MoveWindowToWorkspace { - window_id: Some(*wid), - reference: WorkspaceReferenceArg::Id(active_same_output.id), - focus: true, - }), - ) - .await? - } - _ => (), - } - } - Tag(tag) => { - tracing::debug!("Changing tag {}", tag); - let tag_visible = self.tags.entry(*tag).or_default().enabled; - let affected_windows: Vec = self - .windows - .iter() - .filter(|(_, t)| *tag == **t) - .map(|(wid, _)| *wid) - .collect(); - tracing::debug!( - "{} affected windows of tag {}: {:?}", - affected_windows.len(), - tag, - affected_windows - ); - let focus = affected_windows.last().cloned(); - self.move_windows( - if tag_visible { &active } else { &inactive }, - affected_windows, - ) - .await; - if let Some(focus) = focus { - if tag_visible { - tell( - &mut self.socket, - Request::Action(Action::FocusWindow { id: focus }), - ) - .await?; - } - } - } - TagExclusive(t) => { - tracing::debug!("Changing all tags"); - let (active_wid, inactive_wid): (HashMap, HashMap) = self - .windows - .iter() - .filter(|(_, it)| **it != 0) - .partition(|(_, it)| **it == *t); - let focus = active_wid.keys().last(); - self.move_windows(&inactive, inactive_wid.keys().cloned().collect()) - .await; - self.move_windows(&active, active_wid.keys().cloned().collect()) - .await; - if let Some(f) = focus { + match action { + Window(wid) => { + let current_tag = *self.windows.entry(wid).or_insert(0); + let tag_visible = self.tags.entry(current_tag).or_default().enabled; + let win = self + .state + .windows + .windows + .get(&wid) + .ok_or(anyhow!("Failed to retrieve window {} from niri state", wid))?; + let wsid: u64 = win + .workspace_id + .ok_or(anyhow!("Retrieving workspace id of a changed window"))?; + let win_visible = active.contains_key(&wsid); + match (win_visible, tag_visible) { + (true, false) => { + let inactive_same_output = self.same_output(wsid, &inactive)?; tell( &mut self.socket, - Request::Action(Action::FocusWindow { id: *f }), + Request::Action(Action::MoveWindowToWorkspace { + window_id: Some(wid), + reference: WorkspaceReferenceArg::Id(inactive_same_output.id), + focus: false, + }), + ) + .await + } + (false, true) => { + let active_same_output = self.same_output(wsid, &active)?; + tell( + &mut self.socket, + Request::Action(Action::MoveWindowToWorkspace { + window_id: Some(wid), + reference: WorkspaceReferenceArg::Id(active_same_output.id), + focus: true, + }), + ) + .await + } + _ => Ok(()), + } + } + Tag(tag) => { + tracing::debug!("Changing tag {}", tag); + let tag_visible = self.tags.entry(tag).or_default().enabled; + let affected_windows: Vec = self + .windows + .iter() + .filter(|(_, t)| tag == **t) + .map(|(wid, _)| *wid) + .collect(); + tracing::debug!( + "{} affected windows of tag {}: {:?}", + affected_windows.len(), + tag, + affected_windows + ); + let focus = affected_windows.last().cloned(); + self.move_windows( + if tag_visible { &active } else { &inactive }, + affected_windows, + ) + .await; + if let Some(focus) = focus { + if tag_visible { + tell( + &mut self.socket, + Request::Action(Action::FocusWindow { id: focus }), ) .await?; } } + Ok(()) + } + TagExclusive(t) => { + tracing::debug!("Changing all tags"); + let (active_wid, inactive_wid): (HashMap, HashMap) = self + .windows + .iter() + .filter(|(_, it)| **it != 0) + .partition(|(_, it)| **it == t); + let focus = active_wid.keys().last(); + self.move_windows(&inactive, inactive_wid.keys().cloned().collect()) + .await; + self.move_windows(&active, active_wid.keys().cloned().collect()) + .await; + if let Some(f) = focus { + tell( + &mut self.socket, + Request::Action(Action::FocusWindow { id: *f }), + ) + .await?; + } + Ok(()) } } - Ok(()) } async fn get_focused_window(&mut self) -> Result { @@ -276,7 +275,7 @@ impl NiriTag { async fn handle_recvd(&mut self, recvd: Receivable) -> Result<()> { use TagAction::*; // first do any local mutations - let actions: &[TagAction] = match recvd { + let action: TagAction = match recvd { Receivable::Event(ev) => { let _ = self.state.apply(ev.clone()); return self.handle_event(ev).await; @@ -295,19 +294,12 @@ impl NiriTag { TagCmd::AddTagToWin(t) => { let wid = self.get_focused_window().await?.id; self.change_window_tag(wid, Some(t)).await?; - let entry = self.tags.entry(t).or_default(); - if entry.windows.len() == 1 && self.config.activation_on_fill { - entry.enabled = true; - self.fire_event(TagEvent::TagEnabled(t)).await; - &[Tag(t), Window(wid)] - } else { - &[Window(wid)] - } + Window(wid) } TagCmd::RemoveTagFromWin(_) => { let wid = self.get_focused_window().await?.id; self.change_window_tag(wid, None).await?; - &[Window(wid)] + Window(wid) } TagCmd::ToggleTagOnWin(t) => { let wid = self.get_focused_window().await?.id; @@ -318,14 +310,7 @@ impl NiriTag { }; self.change_window_tag(wid, Some(new_tag)).await?; tracing::debug!("toggling {} to tag {}", wid, new_tag); - let entry = self.tags.entry(new_tag).or_default(); - if new_tag != 0 && entry.windows.len() == 1 && self.config.activation_on_fill { - entry.enabled = true; - self.fire_event(TagEvent::TagEnabled(t)).await; - &[Tag(t), Window(wid)] - } else { - &[Window(wid)] - } + Window(wid) } TagCmd::EnableTag(t) => { @@ -334,7 +319,7 @@ impl NiriTag { .and_modify(|ts| ts.enabled = true) .or_default(); self.fire_event(TagEvent::TagEnabled(t)).await; - &[Tag(t)] + Tag(t) } TagCmd::DisableTag(t) => { self.tags @@ -342,7 +327,7 @@ impl NiriTag { .and_modify(|ts| ts.enabled = false) .or_default(); self.fire_event(TagEvent::TagDisabled(t)).await; - &[Tag(t)] + Tag(t) } TagCmd::ToggleTag(t) => { let new_state = self @@ -357,7 +342,7 @@ impl NiriTag { TagEvent::TagDisabled(t) }) .await; - &[Tag(t)] + Tag(t) } TagCmd::ExclusiveTag(t) => { self.tags @@ -369,12 +354,12 @@ impl NiriTag { .filter(|(it, _)| **it != 0) .for_each(|(it, ts)| ts.enabled = *it == t); self.fire_event(TagEvent::TagExclusive(t)).await; - &[TagExclusive(t)] + TagExclusive(t) } }, }; // then arrange corresponding state in the compositor - self.do_actions(actions).await?; + self.do_action(action).await?; tell( &mut self.socket, Request::Action(Action::CenterVisibleColumns {}), @@ -446,7 +431,7 @@ impl NiriTag { WindowsChanged { windows } => { for w in windows { self.change_window_tag(w.id, None).await?; - let action = self.do_actions(&[TagAction::Window(w.id)]).await; + let action = self.do_action(TagAction::Window(w.id)).await; if let Err(e) = action { tracing::warn!("Failed to ChangeWindow on {}: {}", w.id, e); } diff --git a/flake.lock b/flake.lock index 662329a..bd00d62 100644 --- a/flake.lock +++ b/flake.lock @@ -1,38 +1,15 @@ { "nodes": { - "fenix": { - "inputs": { - "nixpkgs": [ - "naersk", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1752475459, - "narHash": "sha256-z6QEu4ZFuHiqdOPbYss4/Q8B0BFhacR8ts6jO/F/aOU=", - "owner": "nix-community", - "repo": "fenix", - "rev": "bf0d6f70f4c9a9cf8845f992105652173f4b617f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "naersk": { "inputs": { - "fenix": "fenix", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1752689277, - "narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=", + "lastModified": 1745925850, + "narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=", "owner": "nix-community", "repo": "naersk", - "rev": "0e72363d0938b0208d6c646d10649164c43f4d64", + "rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f", "type": "github" }, "original": { @@ -51,11 +28,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1753374784, - "narHash": "sha256-R6vHaUJiehdXSnzZqCOxmtmAnHA4GBOpS/UKydzAI38=", + "lastModified": 1749890123, + "narHash": "sha256-pRkyWFytGAMaHlrOJIYYEur8NRDe0kTfMIhRdTeasRQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "da95771a65821bc98118cf3478eb2fc6fbfe035a", + "rev": "8f39eb82488525728eda222b34e79b1ecf6d3f96", "type": "github" }, "original": { @@ -67,16 +44,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1748151941, - "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", "owner": "YaLTeR", "repo": "niri", - "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.05.1", + "ref": "v25.02", "repo": "niri", "type": "github" } @@ -84,11 +61,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752870529, - "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=", + "lastModified": 1749797708, + "narHash": "sha256-P5x0U6AW5Zn20bARv4D83d8XlNaWK1st9QwBfSe+Vfg=", "owner": "YaLTeR", "repo": "niri", - "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2", + "rev": "f3f6e79eeca8924ff9cfea4b30006e5b782bc93e", "type": "github" }, "original": { @@ -99,11 +76,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752077645, - "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=", + "lastModified": 1749871736, + "narHash": "sha256-K9yBph93OLTNw02Q6e9CYFGrUhvEXnh45vrZqIRWfvQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6", + "rev": "6afe187897bef7933475e6af374c893f4c84a293", "type": "github" }, "original": { @@ -115,11 +92,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "lastModified": 1749727998, + "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "github" }, "original": { @@ -131,11 +108,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753250450, - "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc02ee70efb805d3b2865908a13ddd4474557ecf", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -147,11 +124,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1753369216, - "narHash": "sha256-Jx2i6loWL755GD+GlCXESMhIiO0aFc/pDo82N16fEiw=", + "lastModified": 1749213349, + "narHash": "sha256-UAaWOyQhdp7nXzsbmLVC67fo+QetzoTm9hsPf9X3yr4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b74a30dbc0a72e20df07d43109339f780b439291", + "rev": "a4ff0e3c64846abea89662bfbacf037ef4b34207", "type": "github" }, "original": { @@ -169,23 +146,6 @@ "systems": "systems" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1752428706, - "narHash": "sha256-EJcdxw3aXfP8Ex1Nm3s0awyH9egQvB2Gu+QEnJn2Sfg=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "591e3b7624be97e4443ea7b5542c191311aa141d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1689347949, @@ -204,16 +164,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1748488455, - "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.6", + "ref": "v0.5.1", "repo": "xwayland-satellite", "type": "github" } @@ -221,11 +181,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1752338000, - "narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=", + "lastModified": 1749315541, + "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ba78881a68182ce338041846164cbfed0d70935c", + "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba", "type": "github" }, "original": { diff --git a/lib/main.rs b/lib/main.rs index fd38a01..c1bfa66 100644 --- a/lib/main.rs +++ b/lib/main.rs @@ -44,22 +44,10 @@ impl Default for TagState { } } -fn default_true() -> bool { - true -} - -fn default_3() -> u8 { - 3 -} - #[derive(Deserialize)] pub struct Config { - #[serde(default = "default_3")] pub prepopulate: u8, - #[serde(default = "default_true")] pub strict: bool, - #[serde(default = "default_true")] - pub activation_on_fill: bool, } impl Default for Config { @@ -67,7 +55,6 @@ impl Default for Config { Self { prepopulate: 3, strict: true, - activation_on_fill: true, } } }