From a6e15b71cdf5835c99fdfd5bb8e6db967a856597 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sat, 15 Nov 2025 21:04:48 -0500 Subject: [PATCH] update packages and fix helix language --- flake.lock | 56 +++++++++---------- flake.nix | 2 +- .../modules/nmasur/presets/programs/helix.nix | 7 ++- .../modules/nmasur/profiles/power-user.nix | 2 +- .../modules/nmasur/profiles/work.nix | 2 +- 5 files changed, 35 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index a97cacb..1b7f808 100644 --- a/flake.lock +++ b/flake.lock @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1763136804, - "narHash": "sha256-6p2ljK42s0S8zS0UU59EsEqupz0GVCaBYRylpUadeBM=", + "lastModified": 1763505477, + "narHash": "sha256-nJRd4LY2kT3OELfHqdgWjvToNZ4w+zKCMzS2R6z4sXE=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "973db96394513fd90270ea5a1211a82a4a0ba47f", + "rev": "3bda9f6b14161becbd07b3c56411f1670e19b9b5", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1762276996, - "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", + "lastModified": 1763651264, + "narHash": "sha256-8vvwZbw0s7YvBMJeyPVpWke6lg6ROgtts5N2/SMCcv4=", "owner": "nix-community", "repo": "disko", - "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", + "rev": "e86a89079587497174ccab6d0d142a65811a4fd9", "type": "github" }, "original": { @@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { @@ -269,27 +269,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", + "lastModified": 1763622513, + "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", + "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1763178083, - "narHash": "sha256-J2anD4lJGnsnbZeSVRjY8b9UdQueQnbrjEuHoUtwb40=", + "lastModified": 1763739770, + "narHash": "sha256-h2SZiOwmR/IG5om+/5v1mu/4w9dTGqA/naTm4bUFn/Y=", "owner": "nix-community", "repo": "nur", - "rev": "cb44dde82a279a626f8b3283fdcf52849d3ab3d4", + "rev": "9cfdb9c199ebf780c36a9998d27547563c7b2aaf", "type": "github" }, "original": { @@ -358,11 +358,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1763174172, - "narHash": "sha256-u6dcvXk2K6eYVYhmfiN3xmhIf3yUo5KPwm79UOD37Jo=", + "lastModified": 1763692705, + "narHash": "sha256-tCKCyMYU0Vy+ph/xswlNsYXXjnFVweWBV+ew/5FS9tA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "89af6762b01409edbb595888a69311e8e5954110", + "rev": "6fbf5d328dce1828d887b8ee7d44a785196a34e7", "type": "github" }, "original": { @@ -442,11 +442,11 @@ ] }, "locked": { - "lastModified": 1762908663, - "narHash": "sha256-HqdYfzBaidYX+EYAcXDFCggXJPZBv2fusMwhc7/4+cI=", + "lastModified": 1763738061, + "narHash": "sha256-VpNRcInaj1MOya8NmcqhFmdO7KGO7SSZelJQmPl6HoQ=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "debc562c48c445f9f08778ecb9fc6b35197623ad", + "rev": "3bcc267c4e0efa023b98b9c5cfbe11b88ec2dc8f", "type": "github" }, "original": { @@ -482,11 +482,11 @@ "zenyd-mpv-scripts": { "flake": false, "locked": { - "lastModified": 1707704915, - "narHash": "sha256-9P/8q/OZXfaJMS08acQP4h3/zUA5mKRQee0JmkXcz1w=", + "lastModified": 1763726510, + "narHash": "sha256-lyzcUgo46eGqI563RfmkXZGoQ5fERCpn2zc+VE/mDgY=", "owner": "zenyd", "repo": "mpv-scripts", - "rev": "9bdce0050144cb24f92475f7bdd77180e0e4c26b", + "rev": "a1470f01cae24f06365fbe05e5295d906d7438fe", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cb94512..fd10463 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Used for specific stable packages - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; # Used for MacOS system config darwin = { diff --git a/platforms/home-manager/modules/nmasur/presets/programs/helix.nix b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix index fa44c91..2367c30 100644 --- a/platforms/home-manager/modules/nmasur/presets/programs/helix.nix +++ b/platforms/home-manager/modules/nmasur/presets/programs/helix.nix @@ -14,7 +14,7 @@ let # If the line isn’t committed yet, it shows the working-tree diff for THIS file only. # The script writes the diff to /tmp and prints the absolute path to stdout # Adjust `context` to see more/fewer unchanged lines around the change (default: 3). - # + # # usage: git-file_pretty.sh [context_lines] # Helix mapping example: # B = ':open %sh{ ~/.config/helix/utils/git-blame-commit.sh "%{buffer_name}" %{cursor_line} 3 }' @@ -45,7 +45,7 @@ let # Source: https://gist.github.com/gloaysa/828707f067e3bb20da18d72fa5d4963a # Utility for Helix: pretty-print blame info for the line under the cursor. # Quite basic. - # + # # usage: blame_line_pretty # Helix mapping example: # b = ":run-shell-command ~/.config/helix/utils/blame_line_pretty.sh %{buffer_name} %{cursor_line}" @@ -170,6 +170,7 @@ in } { name = "terraform"; + scope = "source.tf"; auto-format = true; language-servers = [ "terraform-ls" ]; file-types = [ @@ -320,7 +321,7 @@ in completion-replace = true; # Replace whole word with completion trim-trailing-whitespace = true; - rainbow-brackets = true; # Make it easier to match parentheses + # rainbow-brackets = true; # Make it easier to match parentheses # Show whitespace visible to the user # Waiting for trailing whitespace option ideally diff --git a/platforms/home-manager/modules/nmasur/profiles/power-user.nix b/platforms/home-manager/modules/nmasur/profiles/power-user.nix index fc65242..a44f643 100644 --- a/platforms/home-manager/modules/nmasur/profiles/power-user.nix +++ b/platforms/home-manager/modules/nmasur/profiles/power-user.nix @@ -34,7 +34,7 @@ in pkgs.pandoc # Convert text documents pkgs.qrencode # Generate qr codes pkgs.spacer # Output lines in terminal - pkgs.tealdeer # Cheatsheets + pkgs.stable.tealdeer # Cheatsheets pkgs.tree # Print tree in terminal pkgs.vimv-rs # Batch rename files pkgs.yazi # TUI file explorer diff --git a/platforms/home-manager/modules/nmasur/profiles/work.nix b/platforms/home-manager/modules/nmasur/profiles/work.nix index 7282259..6e8453f 100644 --- a/platforms/home-manager/modules/nmasur/profiles/work.nix +++ b/platforms/home-manager/modules/nmasur/profiles/work.nix @@ -21,7 +21,7 @@ in ]; home.packages = [ - pkgs.visidata # CSV inspector + pkgs.stable.visidata # CSV inspector pkgs.dos2unix # Convert Windows text files pkgs.inetutils # Includes telnet pkgs.gnupg # Encryption