From 5321d701a26823166c076fe8b60ec1617c149af0 Mon Sep 17 00:00:00 2001 From: Kieran Klukas Date: Sun, 23 Aug 2026 08:30:10 -0400 Subject: [PATCH] bump flake; move zsh patina to nixpkgs --- flake.lock | 113 +++++++++++++------------------- flake.nix | 5 -- machines/terebithia/default.nix | 2 +- modules/home/system/shell.nix | 6 +- 4 files changed, 49 insertions(+), 77 deletions(-) diff --git a/flake.lock b/flake.lock index 22fd79d..0526bb8 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1775275421, - "narHash": "sha256-UP05DCVavCyi9nsFdoEk7lCe0kZFGt6v62DPeslMibY=", + "lastModified": 1787073845, + "narHash": "sha256-0KTQaLoSrLdbQkwJOsXj9KiiUKjyIWf92DaMpLrAIAU=", "owner": "taciturnaxolotl", "repo": "CedarLogic", - "rev": "b2a59839e0fd7fe1fb6a32957e049daedfecbc11", + "rev": "d2fa1de8ba17c7fdfe7a0720a122d89b99978bda", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1781627888, - "narHash": "sha256-5yHuAh9k7rT7rtf3uRaXkiUyYvQE9oaCgzhprLm2mr8=", + "lastModified": 1786361680, + "narHash": "sha256-IxaZkb9rCGEZ+yGndxKXONeIEcKMzoFUsvLTB5G/caw=", "owner": "serokell", "repo": "deploy-rs", - "rev": "6d3087eedff75a715b40c0e124ba15d2dd7bec28", + "rev": "16901271e5b30b591e56f7a84f25f186fb20f3e1", "type": "github" }, "original": { @@ -490,11 +490,11 @@ ] }, "locked": { - "lastModified": 1780163740, - "narHash": "sha256-lv9glKM9uzuwejxLxym4WHVbQUCxqeWzbv7DDTWNrDE=", + "lastModified": 1786401920, + "narHash": "sha256-8bjsqUO9E2kz+ARrqW01Tf7MPtIdgxU34vwODi2Xavk=", "owner": "frc4451", "repo": "frc-nix", - "rev": "b8330150ee7b85e182d535fbd894b48122ba0e0d", + "rev": "86d75758ac9ca0a648506a00d9d3b27cef4877e8", "type": "github" }, "original": { @@ -573,11 +573,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1784723954, - "narHash": "sha256-1CfD8ZUjCkTgjsneLZ/lxCHhgDfqxxE7/GX0MmsgiqA=", + "lastModified": 1787144466, + "narHash": "sha256-HHfv2/HkNSKbbSyU9iD/g8lbP6r4tl33sSw1W4rXCk0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a017f5b72210026af5b3ac5949f08d94380a6fbd", + "rev": "0471accf8d0a8210b31d947497d179ecc99e0021", "type": "github" }, "original": { @@ -647,11 +647,11 @@ ] }, "locked": { - "lastModified": 1784350909, - "narHash": "sha256-ZWyzLbS1yKUTeFJLmdVuWNnHttL333/ldJbEE+KzCrM=", + "lastModified": 1787377438, + "narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ce190229c73d44536caa7072f6308fb2d8feeb3", + "rev": "65258d5c65a250189fde2e35f490d15e064c4c62", "type": "github" }, "original": { @@ -692,11 +692,11 @@ ] }, "locked": { - "lastModified": 1782811467, - "narHash": "sha256-JP0D8r8o9+jnYk0/B5O722La+oZeC5iNQ3lonKFTmbQ=", + "lastModified": 1787301232, + "narHash": "sha256-qSzrIIqQUtEVeVZxQLj/L4p7+xKBEtPhgMTzFW2c6P8=", "owner": "hyprwm", "repo": "contrib", - "rev": "3dcbce715ae8b93107fa8632db15bf976862a573", + "rev": "57baf317e5196a8286b80976771ef55febad8660", "type": "github" }, "original": { @@ -814,11 +814,11 @@ ] }, "locked": { - "lastModified": 1786593514, - "narHash": "sha256-pynAhDuQ7cupnisaIF3ZbDKZd6DdTJzzffxkfcsPQ2o=", + "lastModified": 1786651990, + "narHash": "sha256-OjdC98kpXaqQcby736qOdQstVGTwrQuLur2xtz4YXCU=", "owner": "taciturnaxolotl", "repo": "lard", - "rev": "cecd7021688f8f7e3d4b24f4a6f074fdce4b93b8", + "rev": "4162a04e6e8343a449b6cbb58608e296796be2f2", "type": "github" }, "original": { @@ -933,11 +933,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1784715123, - "narHash": "sha256-84rMK/x9fY83wjeI6GpGAYvmcsyDqffJqJSxCe3Ta9E=", + "lastModified": 1787449828, + "narHash": "sha256-wyaotmjCE/HcAjXJ6+Pxn3fzrrIO7r/QrIza7h1ZtSg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "c4c2a4e9060b8ca156a40b19729fa3f6ee4889fc", + "rev": "95b3cd9ae6526964fe9d5b01fb28cbe4cca16cca", "type": "github" }, "original": { @@ -956,11 +956,11 @@ "website-builder": "website-builder" }, "locked": { - "lastModified": 1781774207, - "narHash": "sha256-pUHOn5uRbY1yOdeBgfm/UpkVkN9YrLUxl7jZnN1emyo=", + "lastModified": 1784997863, + "narHash": "sha256-oTMag4I9MW3bstuOKqzc0F1OqxO49lLa9jkSkRe3EqA=", "owner": "nix-media-server", "repo": "nixarr", - "rev": "67952a6e79a298396e909d35f7ee35b23f754c43", + "rev": "282ce99b31d52d72cca281e3d26d3dd267946800", "type": "github" }, "original": { @@ -1017,11 +1017,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1785454630, - "narHash": "sha256-LQy14TZp77TwbQf40gg1V3jo8FwJG0jGDkAH+zRHqg8=", + "lastModified": 1787360063, + "narHash": "sha256-dt4WdcvsA8/RCe+VZZwqU0X+XMM3wBbGCWA0/sFWzGo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1559d3daa3ecc813a650b79375ea61b6741b8746", + "rev": "2c423e03bbafcff28bfadc6781a4a8257f205cb5", "type": "github" }, "original": { @@ -1033,11 +1033,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1784730354, - "narHash": "sha256-K9yMlQyAUf9T1BVcmfJRqOgdpfLABojXWUIt+qZ/2TU=", + "lastModified": 1787441254, + "narHash": "sha256-/7oA/UPfrk0ubngvJjDleROuiNdA7y4d+5qNcDeQuCA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b281be14dde2d2a8ce3870f450da3d5637ad67b6", + "rev": "ae9396d21aa0dcfe9419f6bdc3bf415eba30a8b7", "type": "github" }, "original": { @@ -1094,11 +1094,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1784432872, - "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=", + "lastModified": 1787204541, + "narHash": "sha256-OURZPknrTjQrlNyxPdqzyqmU/81Wes1CUP/Ft1Rv/YI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870", + "rev": "5880666fd9eb563038431edb35c2d0aa595884e6", "type": "github" }, "original": { @@ -1220,11 +1220,11 @@ ] }, "locked": { - "lastModified": 1784756493, - "narHash": "sha256-kQTPcpDZDEvnaYgWbKqqppvo5hLvI65X6X1Kx/8pEyY=", + "lastModified": 1787487241, + "narHash": "sha256-2vwa1akgtikyZkIR0GxRXQOuvDMDG04bprUNQyX6Zyg=", "owner": "nix-community", "repo": "NUR", - "rev": "6ce5c59b9cfd2b464ce08d5e8b6c8d6f7bff7a60", + "rev": "7c281dd92d790f4a6f9bc84d322237e0400c0562", "type": "github" }, "original": { @@ -1353,8 +1353,7 @@ "tangled": "tangled", "terminal-wakatime": "terminal-wakatime", "wakatime-ls": "wakatime-ls", - "zmx": "zmx", - "zsh-patina": "zsh-patina" + "zmx": "zmx" } }, "rust-analyzer-src": { @@ -1439,11 +1438,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1784481035, - "narHash": "sha256-nC0QN+GPTnA5i+WBx8S2rG8+VFh+EeBnEe5mU3hlAcQ=", + "lastModified": 1787460061, + "narHash": "sha256-r2FJY01jRVhrZIKPdhQ3QFYsAz3wjilWTMSSH7VMOeo=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "a6baa7464f9b21a106dcfabb0bdcfe96fb434409", + "rev": "a8adfd6f9f341dd586d5c06dda3bbfa21c6014e7", "type": "github" }, "original": { @@ -1798,11 +1797,11 @@ "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1784731876, - "narHash": "sha256-b8Fo5qhw2ufX1LGYAXWBqBrRh9sqKW3D9OFKL0QR+eY=", + "lastModified": 1787232985, + "narHash": "sha256-R+p1OQygRo/gW3owi09hEVXnyS5oX3xbUIQgaxGMpuo=", "owner": "neurosnap", "repo": "zmx", - "rev": "fa80e7abc1aab4d0fcc48f784a110f0d077fbcf4", + "rev": "ea45749278bac648ab13a4280a6035012854d717", "type": "github" }, "original": { @@ -1810,26 +1809,6 @@ "repo": "zmx", "type": "github" } - }, - "zsh-patina": { - "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1784731649, - "narHash": "sha256-RHikS+8bsCJnJfEr8BbgNzxjANI08cH/Ib4hx4NqDVU=", - "owner": "michel-kraemer", - "repo": "zsh-patina", - "rev": "bda9d1e3573166494efcfcfb75e119e442f2fcd1", - "type": "github" - }, - "original": { - "owner": "michel-kraemer", - "repo": "zsh-patina", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 0c3f51e..229b1c1 100644 --- a/flake.nix +++ b/flake.nix @@ -134,11 +134,6 @@ url = "github:taciturnaxolotl/impure"; }; - zsh-patina = { - url = "github:michel-kraemer/zsh-patina"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; - tangle-of-trust = { url = "github:taciturnaxolotl/tangle-of-trust"; inputs.nixpkgs.follows = "nixpkgs-unstable"; diff --git a/machines/terebithia/default.nix b/machines/terebithia/default.nix index 8185ea6..175d812 100644 --- a/machines/terebithia/default.nix +++ b/machines/terebithia/default.nix @@ -302,7 +302,7 @@ "github.com/caddy-dns/cloudflare@v0.2.2" "github.com/mholt/caddy-ratelimit@v0.1.0" ]; - hash = "sha256-5d+U7sdSIUuwj6OK8WutZGsfvshtDj0FKRjkMDNfbxU="; + hash = "sha256-Jt+TYOvhRW9dW1muXgFKmtdRkAKei9m4e+eNx1ec1nE="; }; email = "kieran@dunkirk.sh"; # No global acme_dns: every vhost sets its own "dns cloudflare" inline (see diff --git a/modules/home/system/shell.nix b/modules/home/system/shell.nix index af914ba..1f59b8f 100644 --- a/modules/home/system/shell.nix +++ b/modules/home/system/shell.nix @@ -758,9 +758,7 @@ in add-zsh-hook chpwd auto_venv # zsh-patina: Rust-based syntax highlighting (must be last) - eval "$(${ - inputs.zsh-patina.packages.${pkgs.stdenv.hostPlatform.system}.default - }/bin/zsh-patina activate)" + eval "$(${pkgs.unstable.zsh-patina}/bin/zsh-patina activate)" ''; history = { @@ -847,7 +845,7 @@ in ghostty-setup pkgs.unstable.wakatime-cli inputs.terminal-wakatime.packages.${pkgs.stdenv.hostPlatform.system}.default - inputs.zsh-patina.packages.${pkgs.stdenv.hostPlatform.system}.default + pkgs.unstable.zsh-patina pkgs.gitstatus unzip dog -- 2.51.2