From 22ce600524500470bc3530157b551022372f758e Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Sat, 8 Apr 2023 16:32:46 -0700 Subject: [PATCH] flake update and wezterm ssh config --- flake.lock | 30 +++++++++++++++--------------- home.nix | 10 ++++++---- programs/wezterm/wezterm.lua | 8 ++++++++ 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index cae993a..91f8bbd 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1680266963, + "narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "99d4187d11be86b49baa3a1aec0530004072374f", "type": "github" }, "original": { @@ -29,11 +29,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1677104801, - "narHash": "sha256-2V5nKOYVFMYlseYdDKiEaww2xqcE0GtS1ax3SoUX99I=", + "lastModified": 1680667162, + "narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=", "owner": "nix-community", "repo": "home-manager", - "rev": "4295fdfa6b0005c32f2e1f0b732faf5810c1bc7f", + "rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677063315, - "narHash": "sha256-qiB4ajTeAOVnVSAwCNEEkoybrAlA+cpeiBxLobHndE8=", + "lastModified": 1680758185, + "narHash": "sha256-sCVWwfnk7zEX8Z+OItiH+pcSklrlsLZ4TJTtnxAYREw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "988cc958c57ce4350ec248d2d53087777f9e1949", + "rev": "0e19daa510e47a40e06257e205965f3b96ce0ac9", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nur": { "locked": { - "lastModified": 1677204696, - "narHash": "sha256-AWCrT5BEl3Jgr9dhDj0Bj8VRdTYaCHXTnR/NVnyh/Cg=", + "lastModified": 1680925189, + "narHash": "sha256-fvUnUetVs+rd3UJUwbz7iJR4FOCKKacZ+jr62QHN7Rg=", "owner": "nix-community", "repo": "nur", - "rev": "2f0a94085df4764f360350d944a9124f79476f9c", + "rev": "37873ea3385b62c9ab795fcd0aaa68863bd0c887", "type": "github" }, "original": { @@ -83,11 +83,11 @@ }, "utils": { "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 6e0fc0a..d3b224a 100644 --- a/home.nix +++ b/home.nix @@ -42,7 +42,6 @@ gitAndTools.diff-so-fancy ghc ghcid - glow gnupg go graphviz @@ -51,12 +50,11 @@ luajit luajitPackages.luarocks luajitPackages.luasocket - lorri marksman maven multimarkdown mypy - # ncdu + ncdu neofetch neovim niv @@ -104,6 +102,10 @@ enable = true; }; + programs.btop = { + enable = true; + }; + programs.direnv = { enable = true; nix-direnv.enable = true; @@ -272,7 +274,7 @@ shellAliases = { addsshmac="ssh-add ~/.ssh/id_ed25519 --apple-use-keychain --apple-load-keychain"; cat="bat"; - # du="ncdu --color dark -rr -x"; + du="ncdu --color dark -rr -x"; fzfp="fzf --preview 'bat --style=numbers --color=always --line-range :500 {}'"; ping="prettyping"; ".." = "cd .."; diff --git a/programs/wezterm/wezterm.lua b/programs/wezterm/wezterm.lua index 6056403..e71b2fc 100644 --- a/programs/wezterm/wezterm.lua +++ b/programs/wezterm/wezterm.lua @@ -16,6 +16,14 @@ return { initial_rows = 80, leader = { key="b", mods="SUPER", timeout_milliseconds = 1000 }, default_prog = { "/Users/salar/.nix-profile/bin/fish" }, + ssh_domains = { + { + name = "hcloud1", + remote_address = "hcloud1.softinio.net", + username = "salar", + remote_wezterm_path = "/run/current-system/sw/bin/wezterm" + } + }, keys = { { key = "-", mods = "LEADER", action=wezterm.action{SplitVertical={domain="CurrentPaneDomain"}}}, { key = "'", mods = "LEADER", action=wezterm.action{SplitHorizontal={domain="CurrentPaneDomain"}}},