From e12258477af20dbde41c5d6bb2059216a098c4e0 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Tue, 1 Jul 2025 23:06:50 -0500 Subject: [PATCH] add naviterm --- flake.lock | 83 +++++++++++++-------------- home/common/default.nix | 1 + home/common/files/bash/bash_aliases | 2 +- home/common/files/naviterm/config.ini | 13 +++++ home/common/naviterm.nix | 9 +++ home/common/tmux.nix | 1 + 6 files changed, 66 insertions(+), 43 deletions(-) create mode 100644 home/common/files/naviterm/config.ini create mode 100644 home/common/naviterm.nix diff --git a/flake.lock b/flake.lock index da3ba5c..13a6d30 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1748611268, - "narHash": "sha256-c4tmqz/22nG52B7ojitZUjNMK88RRnz2OPVzNEeN74M=", + "lastModified": 1750955917, + "narHash": "sha256-45GhE9DyPkEUbUGUCZDFkXuk3emAHbJbd6IoQ2i/Nsc=", "owner": "e-tho", "repo": "bzmenu", - "rev": "90d0da3fce6e2c9c7fde307624a24dbcf16b1e0c", + "rev": "edf70ebea9e2d429723d1c589872b0d1b7863598", "type": "github" }, "original": { @@ -25,11 +25,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1749223974, - "narHash": "sha256-/GAQYRW1duU81KG//2wI9ax8EkHVG/e1UOD97NdwLOY=", + "lastModified": 1751021896, + "narHash": "sha256-L9u68mNPPiuW7+OV5BKbXaj/AENTiiuEx8+QnMBjRlU=", "owner": "catppuccin", "repo": "nix", - "rev": "3a42cd79c647360ee8742659e42aeec0947dd3b4", + "rev": "a6b0e34d083c79f08efabb1fd6ccf12b882daae6", "type": "github" }, "original": { @@ -49,11 +49,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1749739748, - "narHash": "sha256-csQQPoCA5iv+Nd9yCOCQNKflP7qUKEe7D27wsz+LPKM=", + "lastModified": 1751144689, + "narHash": "sha256-cgIntaqhcm62V1KU6GmrAGpHpahT4UExEWW2ryS02ZU=", "owner": "zhaofengli", "repo": "colmena", - "rev": "c61641b156dfa3e82fc0671e77fccf7d7ccfaa3b", + "rev": "3ceec72cfb396a8a8de5fe96a9d75a9ce88cc18e", "type": "github" }, "original": { @@ -69,11 +69,11 @@ ] }, "locked": { - "lastModified": 1749436314, - "narHash": "sha256-CqmqU5FRg5AadtIkxwu8ulDSOSoIisUMZRLlcED3Q5w=", + "lastModified": 1750903843, + "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=", "owner": "nix-community", "repo": "disko", - "rev": "dfa4d1b9c39c0342ef133795127a3af14598017a", + "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae", "type": "github" }, "original": { @@ -263,16 +263,15 @@ ] }, "locked": { - "lastModified": 1749821119, - "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=", + "lastModified": 1751411489, + "narHash": "sha256-x+AJyQ5+4EPDU3NnQ1OPP/KuoG0C6UrbgptEW6PSLQ8=", "owner": "nix-community", "repo": "home-manager", - "rev": "79dfd9aa295e53773aad45480b44c131da29f35b", + "rev": "e96a8a325cf23538a7f58b9335b4c4c0b393bacf", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", "repo": "home-manager", "type": "github" } @@ -311,11 +310,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1749198891, - "narHash": "sha256-bUaOG1uQ7Jpm6H//PzT71U+RillehMA1gPoXPeE/BL8=", + "lastModified": 1751361791, + "narHash": "sha256-chH/ZGLnKefSYbiu80qkqrmlXUWQh6b5dh5jp+ZtnCQ=", "owner": "detoxify92", "repo": "naviterm", - "rev": "8848eb5a3637c93fc9cbad0828f94fcb5c2bdc6a", + "rev": "3069a389d42ff4f362e825f107e0e2d5ef2358b6", "type": "gitlab" }, "original": { @@ -334,11 +333,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1749859265, - "narHash": "sha256-Ys7lDA03X+iJuprkukFqNfOKSs6BmaPAeXxAvpXLG3w=", + "lastModified": 1751391295, + "narHash": "sha256-0vMwBjalzDqhFHpQf7/z1LHyIyN7vy5XEfTy4vlE87M=", "owner": "NixOS", "repo": "nix", - "rev": "46853c467db0662ac209b473bebc839a8fad067d", + "rev": "5879ab15771ee04fa963603373767d312fcde6cb", "type": "github" }, "original": { @@ -369,11 +368,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749832440, - "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=", + "lastModified": 1751393906, + "narHash": "sha256-I1x6K61ZcdFlqc07weRBy3erCAB0lVkX10i0c9eXjDI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "db030f62a449568345372bd62ed8c5be4824fa49", + "rev": "f49bb3b4107a0917ee144337bb02d311033ee1ba", "type": "github" }, "original": { @@ -433,16 +432,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1749668643, - "narHash": "sha256-gaWJEWGBW/g1u6o5IM4Un0vluv86cigLuBnjsKILffc=", + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1965fd20a39c8e441746bee66d550af78f0c0a7b", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -529,11 +528,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -553,11 +552,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1749761870, - "narHash": "sha256-y+rCuxTylur4k2MbL8cJwOR3pHIamCxp8xG9Vuhwvgw=", + "lastModified": 1751144320, + "narHash": "sha256-KJsKiGfkfXFB23V26NQ1p+UPsexI6NKtivnrwSlWWdQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "18d838e88945b554d059db5f1fff1daed4b7bf8f", + "rev": "ceb52aece5d571b37096945c2815604195a04eb4", "type": "github" }, "original": { @@ -576,11 +575,11 @@ ] }, "locked": { - "lastModified": 1749531675, - "narHash": "sha256-UB8Mc88rW9frjpJ1Fj2ro7f07Gg8dX3uVXvMXnFR4CE=", + "lastModified": 1749730855, + "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=", "owner": "NuschtOS", "repo": "search", - "rev": "4029d450d0266909ee52775849b7da54e79b328e", + "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742", "type": "github" }, "original": { @@ -625,16 +624,16 @@ }, "stable": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1750133334, + "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "36ab78dab7da2e4e27911007033713bab534187b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/home/common/default.nix b/home/common/default.nix index ccb2e3b..0df88fc 100644 --- a/home/common/default.nix +++ b/home/common/default.nix @@ -14,6 +14,7 @@ ./listadmin.nix ./mail.nix ./mopidy.nix + ./naviterm.nix ./neovim.nix ./newsboat.nix ./ssh.nix diff --git a/home/common/files/bash/bash_aliases b/home/common/files/bash/bash_aliases index b9af518..ff2bcf6 100755 --- a/home/common/files/bash/bash_aliases +++ b/home/common/files/bash/bash_aliases @@ -1,4 +1,4 @@ -alias build="notify-send -u critical 'Build complete' || notify-send -u critical 'Build failed'" +alias build="notify-send -u critical \"Build complete at $(date)\" || notify-send -u critical \"Build failed at $(date)\"" # alias mroe=more # alias moer=more alias ls="ls -hCF" diff --git a/home/common/files/naviterm/config.ini b/home/common/files/naviterm/config.ini new file mode 100644 index 0000000..5380252 --- /dev/null +++ b/home/common/files/naviterm/config.ini @@ -0,0 +1,13 @@ +server_address=https://music.trex-halfbeak.ts.net +user=don +password=D4u5c3k +server_auth=token +replay_gain=auto +primary_accent=yellow +secondary_accent=gray +home_list_size=30 +follow_cursor_queue=true +draw_while_unfocused=false +save_player_status=true +use_dbus=true +reorder_random_queue=true diff --git a/home/common/naviterm.nix b/home/common/naviterm.nix new file mode 100644 index 0000000..0c4b141 --- /dev/null +++ b/home/common/naviterm.nix @@ -0,0 +1,9 @@ +{ pkgs, inputs, ... }: { + home.packages = with pkgs; + [ inputs.naviterm.packages.${pkgs.system}.default ]; + xdg.configFile."naviterm" = { + source = ./files/naviterm; + recursive = true; + target = "naviterm"; + }; +} diff --git a/home/common/tmux.nix b/home/common/tmux.nix index c0e3ed1..7b37d6b 100644 --- a/home/common/tmux.nix +++ b/home/common/tmux.nix @@ -94,6 +94,7 @@ bind I display-popup -w 90% -h 90% -E "ikhal" bind K split-window -h "exec ikhal" bind S split-window -v -l 5 + bind T display-popup -d "#{pane_current_path}" -w 90% -h 90% -E "bash" bind Tab choose-window bind ^b last-window bind e setw synchronize-panes