From 1070efe5f16e37929ab51875103307183675cde6 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sun, 12 Jul 2026 12:46:36 -0700 Subject: [PATCH] Update Nix flake inputs --- dotfiles/config/hypr/hyprland/settings.lua | 3 ++ dotfiles/config/xmonad/flake.lock | 14 +++--- nix-darwin/flake.lock | 42 +++++++++--------- nixos/flake.lock | 51 ++++++++++++++++------ nixos/flake.nix | 9 +++- nixos/flake/hyprland-stuff.nix | 4 -- nixos/hyprland.nix | 4 -- 7 files changed, 75 insertions(+), 52 deletions(-) diff --git a/dotfiles/config/hypr/hyprland/settings.lua b/dotfiles/config/hypr/hyprland/settings.lua index b93192fa..26e4fcdc 100644 --- a/dotfiles/config/hypr/hyprland/settings.lua +++ b/dotfiles/config/hypr/hyprland/settings.lua @@ -324,6 +324,9 @@ function M.setup(ctx) border_size = 3, exit_on_hovered = false, close_overview_on_reload = false, + jump = { + enabled = true, + }, grid = { rows = 3, cols = 3, diff --git a/dotfiles/config/xmonad/flake.lock b/dotfiles/config/xmonad/flake.lock index 0652a22f..96f83e6b 100644 --- a/dotfiles/config/xmonad/flake.lock +++ b/dotfiles/config/xmonad/flake.lock @@ -126,11 +126,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1783754472, - "narHash": "sha256-UxGo/Aie7iPC23LgEmGl2FN0XZhZMzy6APCXVzvbcoI=", - "rev": "770b9bbb84018993c8f009d437fff6c2e3077037", + "lastModified": 1783816212, + "narHash": "sha256-M2X3JTJp7ktX73uVDEAm0Rws2A/xljf4Cu1ojd/o8pU=", + "rev": "3b32825de172d0bc85664f495edb096b10862524", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1032759.770b9bbb8401/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1033157.3b32825de172/nixexprs.tar.xz" }, "original": { "id": "nixpkgs", @@ -221,11 +221,11 @@ }, "unstable": { "locked": { - "lastModified": 1783522502, - "narHash": "sha256-iffAls3iaNTyJC2faYcUXSI+Gp02cDjYl+MygxKl2GI=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bb7ec54c8483066ec9d7720e780a5caa71f8612", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { diff --git a/nix-darwin/flake.lock b/nix-darwin/flake.lock index 644a8f48..00ff4013 100644 --- a/nix-darwin/flake.lock +++ b/nix-darwin/flake.lock @@ -89,11 +89,11 @@ ] }, "locked": { - "lastModified": 1783733469, - "narHash": "sha256-GPPbut5HTEfSwCFf6f7RagCHz2BMHvRQSFkESHOwjB0=", + "lastModified": 1783864910, + "narHash": "sha256-+4Lomkyt8BbFXbS6ZBRvYLowaNNvZAcwFk03uXXs4yY=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "b8106a2893d7b1c5b116bebbcf17df80ead302b1", + "rev": "a2e4509a5afffc697f4e3074e29a34436c01bbf3", "type": "github" }, "original": { @@ -377,11 +377,11 @@ ] }, "locked": { - "lastModified": 1783800036, - "narHash": "sha256-jncDHDD8REkePWvQmfH+ScPHxLL8LN4Hd/KjCdlLgD0=", + "lastModified": 1783823409, + "narHash": "sha256-OI4IkRjRXa1e7hYmCGJDPDq5H/kPwhsyoS80cNUF9fI=", "owner": "nix-community", "repo": "home-manager", - "rev": "0992a2948749a61d54065e96df26d75d1b1da50f", + "rev": "7566825d4652a1b885bd4ce65bd9e8def432fec9", "type": "github" }, "original": { @@ -415,11 +415,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1783809127, - "narHash": "sha256-bJrCm3RSsBsbcgWiVYPpYz7Ren4i7erLA5SP/hT/eug=", + "lastModified": 1783875185, + "narHash": "sha256-AZWrzOFhXHxqeQn0NwWGiMEiAnf9Yf3ykiGskwYiZ+o=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "85c11b99381551b2695fb0201dbe19ab640c58f5", + "rev": "dc8cf60557d7721bde7e0b280be137a0cf507bb4", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1783810915, - "narHash": "sha256-4LDFLpnsXSQ60gZX4okBaUXetItCka95DvlncaKaFGo=", + "lastModified": 1783873924, + "narHash": "sha256-jbAErXmffXQILyd63M/JVp/I+vtPdhUXRvvA3+95xxI=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "cc74b789733255479897923c661a2b8780c3bf22", + "rev": "29642fae38457ae283af1b73017c7a85fe1b1ea5", "type": "github" }, "original": { @@ -455,11 +455,11 @@ ] }, "locked": { - "lastModified": 1783748403, - "narHash": "sha256-q+GrnWK5GO4vaTsOrCMQR2Cze7nrgUnGyF8V6x3hGr0=", + "lastModified": 1783816713, + "narHash": "sha256-nGSDzvcf6j00HYGWr59u2arE2eBzV5dm099yL24jr10=", "owner": "colonelpanic8", "repo": "keepbook", - "rev": "d2d666e967048b2478476aeb9e3f6f8b0c034a36", + "rev": "365358638c0e9e39cb4556c1220cc83ab6d99a63", "type": "github" }, "original": { @@ -479,11 +479,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1783808941, - "narHash": "sha256-o6uKwYhdCBj83X1jJm5ZZibYIDlh7lS8Osc4//HffkU=", + "lastModified": 1783872813, + "narHash": "sha256-iZj8e+a5p/ML9cbATZTaj/H9SEc6vjCcvNpGVeLTSEQ=", "owner": "colonelpanic8", "repo": "lastfm-edit", - "rev": "111cd94335cbbb33f549970dedba73a95adc7a5e", + "rev": "cb00aadb357efdf17c5b0bf81db7d0647835d359", "type": "github" }, "original": { @@ -564,11 +564,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1783754472, - "narHash": "sha256-jS1cnt9j6OkoDoHlURQEDYtJcUHOSwuYGexSvx9aDd4=", + "lastModified": 1783816212, + "narHash": "sha256-2aZisVTVGSFEk3MYcOiWQp3zvwyzbqpktB69Rcfp150=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "770b9bbb84018993c8f009d437fff6c2e3077037", + "rev": "3b32825de172d0bc85664f495edb096b10862524", "type": "github" }, "original": { diff --git a/nixos/flake.lock b/nixos/flake.lock index 614440f2..068a6bc9 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1783733469, - "narHash": "sha256-GPPbut5HTEfSwCFf6f7RagCHz2BMHvRQSFkESHOwjB0=", + "lastModified": 1783864910, + "narHash": "sha256-+4Lomkyt8BbFXbS6ZBRvYLowaNNvZAcwFk03uXXs4yY=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "b8106a2893d7b1c5b116bebbcf17df80ead302b1", + "rev": "a2e4509a5afffc697f4e3074e29a34436c01bbf3", "type": "github" }, "original": { @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1783798242, - "narHash": "sha256-CsWHcV6UHlQkZWMlv6dWa41E900XrOB6fHYfkHPVz30=", + "lastModified": 1783856671, + "narHash": "sha256-8txLTCk/dqJsxMYJTLmacIUrHnDBeXMME72t+jtYG6g=", "owner": "aaddrick", "repo": "claude-desktop-debian", - "rev": "8a0c3b31fab2d2fb342501cd2062991c859d3b04", + "rev": "78c8e983e169c09fb9d21e25771cacd4cb10c0cc", "type": "github" }, "original": { @@ -178,11 +178,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1783881409, - "narHash": "sha256-7lPTQdUxtN1PCbNzOA05asQz6spwkatT8JlSAHWkvvU=", + "lastModified": 1783884256, + "narHash": "sha256-h1PvrMre89NQBrxocyAQiJAzvlH2mjOVnP7czM6/kdA=", "owner": "ilysenko", "repo": "codex-desktop-linux", - "rev": "d8365b009cbed745ca4e69a3caad704424e7a5e1", + "rev": "c9c5ee35368ddd6f4bc90d6669b0542c6dce6337", "type": "github" }, "original": { @@ -713,6 +713,27 @@ "type": "github" } }, + "gmcli": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1783885426, + "narHash": "sha256-Wr34V4owfA67LR33IfgzOfGXZi/uEbg5Uj5XoHHiW+M=", + "owner": "colonelpanic8", + "repo": "gmcli", + "rev": "37ff52aab15d1a7b0164bd363b8dc0efdc6f644e", + "type": "github" + }, + "original": { + "owner": "colonelpanic8", + "ref": "colonelpanic/gaia-account-pairing", + "repo": "gmcli", + "type": "github" + } + }, "grub2-themes": { "inputs": { "nixpkgs": [ @@ -1163,15 +1184,16 @@ ] }, "locked": { - "lastModified": 1782607986, - "narHash": "sha256-7CvSvTEk6rAX/K56QoPbWe7tr+9KGBAugXYJGc6eOEg=", - "owner": "raybbian", + "lastModified": 1783637291, + "narHash": "sha256-MtRmQ8WGiIBViZHdfqdFyGTWSRXGMnunXw4jRUdTpfc=", + "owner": "colonelpanic8", "repo": "hyprtasking", - "rev": "765575445ce34989575a99f304d0b279e6a980b6", + "rev": "e53b9bd0440a0f85d64d86762fd84111d4de2e3d", "type": "github" }, "original": { - "owner": "raybbian", + "owner": "colonelpanic8", + "ref": "colonelpanic/workspace-jump-labels", "repo": "hyprtasking", "type": "github" } @@ -2024,6 +2046,7 @@ "git-blame-rank": "git-blame-rank", "git-ignore-nix": "git-ignore-nix", "git-sync-rs": "git-sync-rs", + "gmcli": "gmcli", "grub2-themes": "grub2-themes", "heroic-games-launcher": "heroic-games-launcher", "home-manager": "home-manager", diff --git a/nixos/flake.nix b/nixos/flake.nix index 0d839d98..51ab0308 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -85,6 +85,11 @@ }; }; + gmcli = { + url = "github:colonelpanic8/gmcli/colonelpanic/gaia-account-pairing"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + coqui-tts-streamer = { # Keep the default install reproducible across machines. # For local development, use `just switch --override-input coqui-tts-streamer path:/home/imalison/Projects/coqui-tts-streamer`. @@ -152,8 +157,8 @@ }; hyprtasking = { - # Upstream default branch; the Hyprland 0.55 support PR has been merged. - url = "github:raybbian/hyprtasking"; + # Pending upstream PR #119: keyboard workspace jump labels. + url = "github:colonelpanic8/hyprtasking?ref=colonelpanic/workspace-jump-labels"; inputs = { hyprland.follows = "hyprland"; nixpkgs.follows = "nixpkgs"; diff --git a/nixos/flake/hyprland-stuff.nix b/nixos/flake/hyprland-stuff.nix index 9d92aa7c..0b6e273d 100644 --- a/nixos/flake/hyprland-stuff.nix +++ b/nixos/flake/hyprland-stuff.nix @@ -200,10 +200,6 @@ src = inputs.hyprtasking; strictDeps = true; - postPatch = '' - substituteInPlace src/layout/layout_base.cpp \ - --replace-fail 'e.element->passName()' 'e->element->passName()' - ''; nativeBuildInputs = [ pkgs.pkg-config diff --git a/nixos/hyprland.nix b/nixos/hyprland.nix index a0e095d9..1001d09f 100644 --- a/nixos/hyprland.nix +++ b/nixos/hyprland.nix @@ -208,10 +208,6 @@ src = inputs.hyprtasking; strictDeps = true; - postPatch = '' - substituteInPlace src/layout/layout_base.cpp \ - --replace-fail 'e.element->passName()' 'e->element->passName()' - ''; nativeBuildInputs = [ pkgs.pkg-config