From f103e9342920952f80bc2f3185f084e03e85afd9 Mon Sep 17 00:00:00 2001 From: Poby <87608318+smg1024@users.noreply.github.com> Date: Fri, 17 Apr 2026 00:10:19 +0900 Subject: [PATCH] feat: flake update marksman and mise causing rebuild switch errors --- .codex/config.toml | 22 ++++--- flake.lock | 62 +++++++++---------- modules/aspects/_cli-tools/mise.nix | 2 +- .../_editor/nvf/lsp/languages/bash.nix | 2 +- .../_editor/nvf/lsp/languages/markdown.nix | 2 +- modules/aspects/desktop.nix | 5 ++ secrets/poby.yaml | 8 +-- 7 files changed, 58 insertions(+), 45 deletions(-) diff --git a/.codex/config.toml b/.codex/config.toml index 03f36da..771bbeb 100644 --- a/.codex/config.toml +++ b/.codex/config.toml @@ -9,9 +9,12 @@ web_search = "live" notify = [ "terminal-notifier", - "-title", "Codex CLI", - "-message", "Task completed!", - "-sound", "default", + "-title", + "Codex CLI", + "-message", + "Task completed!", + "-sound", + "default", ] [features] @@ -23,12 +26,17 @@ max_threads = 6 max_depth = 1 [tui] -status_line = ["model-with-reasoning", "context-remaining", "current-dir", "git-branch", "five-hour-limit"] +status_line = [ + "model-with-reasoning", + "context-remaining", + "current-dir", + "git-branch", + "five-hour-limit", +] [sandbox_workspace_write] network_access = true [mcp_servers.mcp-nixos] -command = "nix" -args = ["run", "github:utensils/mcp-nixos", "--"] - +command = "uvx" +args = ["mcp-nixos"] diff --git a/flake.lock b/flake.lock index 23cd2e9..8aa3ac1 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,16 @@ "brew-src": { "flake": false, "locked": { - "lastModified": 1769363988, - "narHash": "sha256-BiGPeulrDVetXP+tjxhMcGLUROZAtZIhU5m4MqawCfM=", + "lastModified": 1774235677, + "narHash": "sha256-0ryNYmzDAeRlrzPTAgmzGH/Cgc8iv/LBN6jWGUANvIk=", "owner": "Homebrew", "repo": "brew", - "rev": "d01011cac6d72032c75fd2cd9489909e95d9faf2", + "rev": "894a3d23ac0c8aaf561b9874b528b9cb2e839201", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "5.0.12", + "ref": "5.1.1", "repo": "brew", "type": "github" } @@ -59,11 +59,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -100,11 +100,11 @@ ] }, "locked": { - "lastModified": 1774274588, - "narHash": "sha256-dnHvv5EMUgTzGZmA+3diYjQU2O6BEpGLEOgJ1Qe9LaY=", + "lastModified": 1775425411, + "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "owner": "nix-community", "repo": "home-manager", - "rev": "cf9686ba26f5ef788226843bc31fda4cf72e373b", + "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "type": "github" }, "original": { @@ -117,11 +117,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1774526341, - "narHash": "sha256-RpY4dJbxSohozQUVpi8BERnX9IqSb+KsKjL2GhVCA9o=", + "lastModified": 1776349441, + "narHash": "sha256-sPW2azc9C0OVmljFhq7fD9U3VEleGpDDp5kLoeXeb98=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "69d1c7710119898fda5aae17a4604def7b41a282", + "rev": "b72ceb562b44d72ccdf03cb7f3880e8d12612fd2", "type": "github" }, "original": { @@ -133,11 +133,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1774526235, - "narHash": "sha256-34gbqdcSPWb/FS+J/Yw7REFxjovhIcpkDQg3A0XWuNU=", + "lastModified": 1776347370, + "narHash": "sha256-L7aOcWUBn4Jh67nPGMXKbwY0gZva9gj85ge4Rgp4F38=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "1d558d89502bb4ee36f4bc211f165937a3ece230", + "rev": "78157d31ba2c8d2319fd6ca1cebde6c3018fa06c", "type": "github" }, "original": { @@ -203,11 +203,11 @@ "brew-src": "brew-src" }, "locked": { - "lastModified": 1769437432, - "narHash": "sha256-8d7KnCpT2LweRvSzZYEGd9IM3eFX+A78opcnDM0+ndk=", + "lastModified": 1774720267, + "narHash": "sha256-YYftFe8jyfpQI649yfr0E+dqEXE2jznZNcYvy/lKV1U=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "a5409abd0d5013d79775d3419bcac10eacb9d8c5", + "rev": "a7760a3a83f7609f742861afb5732210fdc437ed", "type": "github" }, "original": { @@ -218,11 +218,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774216008, - "narHash": "sha256-Z/FO3AI2tL6pTJfGodMvNccEurAJJmWEbsv4psp90z4=", + "lastModified": 1776237196, + "narHash": "sha256-ZsBow5uHrhwW2UhqiVlO0DW3P07TtCy786mZvwzQj4M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "98bf8103e311377ca1d648c22f56332756d89bb2", + "rev": "817d1a3f570e604a3cad52c27eabc92af705db60", "type": "github" }, "original": { @@ -234,11 +234,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1772328832, - "narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=", + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", "type": "github" }, "original": { @@ -259,11 +259,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1774375131, - "narHash": "sha256-d22VIgsDXagQQWnAnebYeQWGHlmF81YRwuGCzAgNZAQ=", + "lastModified": 1776331518, + "narHash": "sha256-Hj6Rqmyv7f2CkQN4f3NLnK0VUJM/ypfHIrkGckA4WQA=", "owner": "notashelf", "repo": "nvf", - "rev": "d847d401bea4dcb1478d02a61a3209fa8512f71d", + "rev": "39416a521dbbc3b722de1bb3607cddaa1e698f4a", "type": "github" }, "original": { @@ -296,11 +296,11 @@ ] }, "locked": { - "lastModified": 1774303811, - "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=", + "lastModified": 1776119890, + "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042", + "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", "type": "github" }, "original": { diff --git a/modules/aspects/_cli-tools/mise.nix b/modules/aspects/_cli-tools/mise.nix index d5fa8ce..8e93786 100644 --- a/modules/aspects/_cli-tools/mise.nix +++ b/modules/aspects/_cli-tools/mise.nix @@ -1,6 +1,6 @@ { programs.mise = { - enable = true; + enable = false; globalConfig = { tools = { diff --git a/modules/aspects/_editor/nvf/lsp/languages/bash.nix b/modules/aspects/_editor/nvf/lsp/languages/bash.nix index 2205f03..888f90f 100755 --- a/modules/aspects/_editor/nvf/lsp/languages/bash.nix +++ b/modules/aspects/_editor/nvf/lsp/languages/bash.nix @@ -11,7 +11,7 @@ }; lsp = { enable = true; - servers = ["bash-ls"]; + servers = ["bash-language-server"]; }; treesitter.enable = true; } diff --git a/modules/aspects/_editor/nvf/lsp/languages/markdown.nix b/modules/aspects/_editor/nvf/lsp/languages/markdown.nix index 958bfff..9c6a5bf 100755 --- a/modules/aspects/_editor/nvf/lsp/languages/markdown.nix +++ b/modules/aspects/_editor/nvf/lsp/languages/markdown.nix @@ -24,7 +24,7 @@ }; lsp = { enable = true; - servers = ["marksman"]; + servers = ["markdown-oxide"]; # https://github.com/NotAShelf/nvf/discussions/1389 }; treesitter.enable = true; } diff --git a/modules/aspects/desktop.nix b/modules/aspects/desktop.nix index 3d74c66..0ebe2e6 100644 --- a/modules/aspects/desktop.nix +++ b/modules/aspects/desktop.nix @@ -115,6 +115,11 @@ check-further-callbacks = true; run = ["layout floating"]; } + { + "if".app-id = "cc.ffitch.shottr"; + check-further-callbacks = true; + run = ["layout floating"]; + } ]; }; }; diff --git a/secrets/poby.yaml b/secrets/poby.yaml index 57f8f7d..d1277db 100644 --- a/secrets/poby.yaml +++ b/secrets/poby.yaml @@ -1,5 +1,5 @@ -github_ssh_key: ENC[AES256_GCM,data:nlZoOfyEMRj2U+P2ANao+ATS90zr8h4c+mVCu1JVoNpC50DBjyMl3eZDCDERISLHf0JWbg0wAZZbPI0Xp2KvZ9D4g+59Dd+F2csgAxUbTL0QPNkgFzSWQNINPR+pabf8phfWKFBJpBD66R8CGY0g8qM9oCJVGM2sGevdAKlhEHk5qsKZ48N0XdSzwXDxYpAeSt0Lz5mcuu8ndUZq+VJs744pLNd6Br6X6wgYJ8HpOXnzyequRer/Tp/EiX5Wel+Nu4JnlXa74ziv/AVqVdZS+mLylT1Cr+fnT3rASMHtA3KFokKlnoBzmJKlqKOcC9hCg7JApLn9s/iyWaC9AbFqZzEolwB0C9TkY3UHD6f5Eph0jaZemsI8DA1+CB39La48snLy0FraQ2yBdjQB/SwcO34OwqZaNHy6FaK5vNSMnDmlhC+FZkdHt6XkUMv8EZewLSA4WxkTuDE2fgF+NVoBNiSe4G9Fpmrl4h6Adp5pIxivthJPVEmudkTB1Q8TNp2yS2NLlWarUrgELNbGBgG0KocF3F6CXJKC8KNwI3x5cgW8GOB02h3EQGOmazTBUAOwjkZZ0V/8jzbEhRyEcou0LyhY6Ls/ltLaAAo6mtBaOB0=,iv:PNdvBAlSLsW2SxoiajXD6nCgl9EXFzR2SRfo6Ynj4iQ=,tag:qGMtoaigw1iEMET99PVSbw==,type:str] -github_cli_token: ENC[AES256_GCM,data:yaJZb5MUeiyBu2LJIgfJ6nX0TL2XdPvZn0IuSMIaxdy5LMyg4NQZkg==,iv:Q+dGU0bPznY5cexiailAzPKgsm0YuOKpGXIAaPh3hNs=,tag:tZKAUVK3H04xD8FMZ2KBsA==,type:str] +github_ssh_key: ENC[AES256_GCM,data:3EPsAfo11u5p48B2myGkHmKcbj0jpFXbc1LxSzpRSFa4yBuRwBIne2hCcgpbqF3pMJml9FuhWtamVPsuhJoRHHonTdgPb5Y48uqegl4HAJefUBWPJEZ0q3F990wqpcF3P8PK5NjjwkZdzJlzXSucjISxEI65q43+/KAlxylu0DMwClZY1lF3DEwg2V9cycmgDWN4XWYQLp89aAXY2A6mC1nHQNI3UbI3VogEVooALSiWgNGZVAWbLNgpPN8qc2zqfPqVdC0Qna+ucRA5MEkvyhyWnjvzoKgFv8n0IHLd+Y676R9SaP56zxFdZUgyQ7nUNSWW8fWaHuL9EvvK4uTaJAGv2Je5AyehRKZ6Sw9/3O2hugCG8d1DhMcc7A1p2wiEScy/m3MDtMUv9ndk0rmk6/+7bH1Ha71tOsAjR08zOPBs5hrDOEXuA0yURqEV9HdNWSt1zQ0NrWsxOJTHeKw6jWG0shWpvLftqoLbhTYGIeNkxhSft7Vm9Cp23hCvG2J38BtRV108UITKvDg9U8utVVR/oCFIBuZkJ2j7,iv:t82G7RM7QybvOW008lZh6XNcmvP0XkBUbgjKMlq3Ov0=,tag:7Y1H0QPsA3k6NOiy3ock+Q==,type:str] +github_cli_token: ENC[AES256_GCM,data:8+IqQnxA/Qm7dsFVNYAVWfYVTNTbmW1bevGnF8e635wU2fBjPpnsZg==,iv:v0sV8Te6eIqKcu6lArU4OfHAP5ucfmPHLnqtFW8dZxk=,tag:VjVdJqIbYrNlcGyKSa3Fmg==,type:str] sops: age: - recipient: age1qeyrh6e40nek3da4mnj298cy2l3aswe7432us30d2p93akcvp9zqext63j @@ -11,7 +11,7 @@ sops: QXQ3YUkxWnk2U0hacjBMZDQ5WlNFQTAKzzzcoCZg7iNg5QoajxSpP1ka5qIIfaNE 5VMXcX4qL0OszsO3j3ShYIT02m3XqkSeaOMSz+uty2BWtPCDZoLHrg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-03-14T12:35:18Z" - mac: ENC[AES256_GCM,data:HUZRdHhmybKofm8xI44Q95b9oizFsvRO+SkJ742KO31rFfYhTp9/PYw3+7JxROY7mMyQKrEvRLYcWB97gv3zaDXhevIdBM+wEp9xvpLJ732G9jccarmYqHaAzPsyVUof/I6fyQMFLCcdCmniPR/UihOcmuQpMWjxJ5xr0rerRFA=,iv:o67tqpx4YfvwFNEuXK9ZWIp/b4GXuzWlRbbHw/kEQHQ=,tag:PZyk2G9reLy15yiw8LV/eA==,type:str] + lastmodified: "2026-04-16T13:40:02Z" + mac: ENC[AES256_GCM,data:u6uqpTdLRE8gB4WphelVhMRKouTZDlNqpa1R6ACXu1ek/9sVaZLxyAhY/xrKhYhGu7MHN0RDG0sHousRtdqCTGE/mDiCEj4hVufctpefpwS9amDRH2XW1kOcheEHvNjPTimKPsJJXutcofxm1LtBZkbkhflrsRQLyOvkc/674eI=,iv:bHtn8yrudQnwH2rPzfUEU25Mar4uwPZK3beU0uLgxY4=,tag:6Fwl6ZeM83w6eTfxBNiqtw==,type:str] unencrypted_suffix: _unencrypted version: 3.12.1