From 6a12a52f8dab82b50e720652632d4a6e24aa72de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Niemier?= <~@hauleth.dev> Date: Thu, 25 Sep 2025 18:24:06 +0200 Subject: [PATCH] Update Nix Flakes This also disables broken packages --- flake.lock | 50 ++++++++++++++++----------------- hosts/modules/environment.nix | 2 +- modules/ghostty.nix | 4 +-- modules/jj.nix | 21 +++++++++++++- modules/nvim/fnl/langclient.fnl | 4 +++ 5 files changed, 52 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 1b3d4c4..396c35d 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1758102940, - "narHash": "sha256-wwqf3+A8EiqwWpcAaPN20QXJLlpGPpwtLTrzgnngI2o=", + "lastModified": 1758805352, + "narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "ebd0bfc11fc2b5cff37401e9b3703881ad5fabbd", + "rev": "c48e963a5558eb1c3827d59d21c5193622a1477c", "type": "github" }, "original": { @@ -43,11 +43,11 @@ }, "darwin-stable": { "locked": { - "lastModified": 1758235313, - "narHash": "sha256-OGnmMaDFlg/6TcF/MUns9WGGGKXgbZi+kIT2xrWP0zM=", + "lastModified": 1759829640, + "narHash": "sha256-+JzTuQct41bA8+ggQU/gOGwa6T5fRt0bEN5OZYtumX8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "660ccb4ded7a6a715a79fdee58f064e8beecb65a", + "rev": "037b75c96038e4b2da1bf38291436896a7ac5317", "type": "github" }, "original": { @@ -94,11 +94,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -228,11 +228,11 @@ ] }, "locked": { - "lastModified": 1758250706, - "narHash": "sha256-Jv/V+PNi5RyqCUK2V6YJ0iCqdLPutU69LZas85EBUaU=", + "lastModified": 1760005512, + "narHash": "sha256-xJ/pn6d9aYa9Eco+zjX7OoxSmaFf82q22u1Rjii9Bp0=", "owner": "nix-community", "repo": "home-manager", - "rev": "363007f12930caf8b0ea59c0bf5be109c52ad0ef", + "rev": "685d8d85d051820164c809fbbc4c67474ee93d67", "type": "github" }, "original": { @@ -264,11 +264,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1757791921, - "narHash": "sha256-83qbJckLOLrAsKO88UI9N4QRatNEc3gUFtLMiAPwK0g=", - "rev": "b7c2f17e9133e8b85d41c58b52f9d4e3254f41da", + "lastModified": 1759842985, + "narHash": "sha256-/mpSKcHQdQ2zXXcmOhhlA39pz4Eh4s8Q0ROwdE7Xlmg=", + "rev": "9bfef6a06c806c813b2c6ebcea9c8c4abc7c5298", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b7c2f17e9133e8b85d41c58b52f9d4e3254f41da.tar.gz?rev=b7c2f17e9133e8b85d41c58b52f9d4e3254f41da" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/9bfef6a06c806c813b2c6ebcea9c8c4abc7c5298.tar.gz?rev=9bfef6a06c806c813b2c6ebcea9c8c4abc7c5298" }, "original": { "type": "tarball", @@ -301,11 +301,11 @@ "neorg": { "flake": false, "locked": { - "lastModified": 1757505607, - "narHash": "sha256-FwxvApfOcnHH1kWYDccaKRGObLhT4zx/FzjrvasefVI=", + "lastModified": 1758674675, + "narHash": "sha256-DFpbdBfyW32d4QhH59+melM7cHK9tzm9awKjTDPJOvs=", "owner": "nvim-neorg", "repo": "neorg", - "rev": "91db472c7f65a1a8f7fdc461e0fb040f565a95c4", + "rev": "4da2159b3f3420d43613f43e159f4253b8544474", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1758277139, - "narHash": "sha256-x6IhcmQI6JpM3G4kRhSA3ZSdB09l5prYPE2hK+Eb3Uw=", + "lastModified": 1759972722, + "narHash": "sha256-kq3jIt1oeiG57/nNnfep5XVicLGXoESCgDYj6E5HVBg=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "0bb8d5b94424dacd788a71f3f1da68eafdf175de", + "rev": "cae63debfba88f262a1cffe98dc8fb326e07cdc5", "type": "github" }, "original": { @@ -430,11 +430,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758213207, - "narHash": "sha256-rqoqF0LEi+6ZT59tr+hTQlxVwrzQsET01U4uUdmqRtM=", + "lastModified": 1759917807, + "narHash": "sha256-WoSazth5EXIJmveWf0zbTMycrgpbLYOth6KhmltMuv0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f4b140d5b253f5e2a1ff4e5506edbf8267724bde", + "rev": "fb5cf53218b987f2703a5bbc292a030c0fe33443", "type": "github" }, "original": { diff --git a/hosts/modules/environment.nix b/hosts/modules/environment.nix index 146d8fe..d94a533 100644 --- a/hosts/modules/environment.nix +++ b/hosts/modules/environment.nix @@ -20,7 +20,7 @@ neovim-remote noti pinentry_mac - qmk + # qmk rage ripgrep ]; diff --git a/modules/ghostty.nix b/modules/ghostty.nix index 6a18580..58a1c8c 100644 --- a/modules/ghostty.nix +++ b/modules/ghostty.nix @@ -14,12 +14,12 @@ in { settings = { font-family = "Hosevka Term"; window-title-font-family = "Hosevka Term"; - font-size = 13.5; + font-size = 14; font-feature = ["-dlig" "-liga"]; window-inherit-working-directory = false; - macos-titlebar-style = "tabs"; + # macos-titlebar-style = "tabs"; auto-update = "download"; diff --git a/modules/jj.nix b/modules/jj.nix index 5a5bff8..02e3845 100644 --- a/modules/jj.nix +++ b/modules/jj.nix @@ -12,6 +12,24 @@ conflict-marker-style = "git"; }; + merge-tools = { + difft.program = "${pkgs.difftastic}/bin/difft"; + diffsitter.program = "${pkgs.diffsitter}/bin/diffsitter"; + mergiraf.program = "${pkgs.mergiraf}/bin/mergiraf"; + ai-desc.program = pkgs.writeShellScript "ai-diff" '' + diffout=`diff -Nur "$1" "$2"` + + llm <<-PROMPT | fold -s - + Here is a diff from a git commit: + + $diffout + + Here is a summary (in no more than five sentences) of what this + commit implements: + PROMPT + ''; + }; + aliases = { tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"]; pull = ["git" "fetch"]; @@ -76,6 +94,7 @@ colocate = true; write-change-id-header = true; push-new-bookmarks = true; + sign-on-push = true; }; colors = { @@ -84,7 +103,7 @@ }; signing = { - behavior = "own"; + behavior = "drop"; backend = "ssh"; key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7q0wm7C+EX0ORpRxeyhvWTT2BMPjSRQIZmbzPLIiHC"; diff --git a/modules/nvim/fnl/langclient.fnl b/modules/nvim/fnl/langclient.fnl index d704ea9..8c47a12 100644 --- a/modules/nvim/fnl/langclient.fnl +++ b/modules/nvim/fnl/langclient.fnl @@ -56,4 +56,8 @@ :autostart true :cmd [vim.g.lsp_paths.typos_lsp]}) +; (setup :taplo { +; :filetypes [ "toml" ] +; :cmd [vim.g.lsm_paths.taplo :lsp :stdio]}) + ; (augroup lsp-direnv (on User :DirenvLoaded (cmd.LspStart))) -- 2.51.2