From 996217b767d1431081a92350dae525da8c51294b Mon Sep 17 00:00:00 2001 From: Kulvir Singh Date: Sat, 1 Feb 2025 23:49:03 +0530 Subject: [PATCH] tmux qol dir --- flake.lock | 24 ++++++++++++------------ hosts/mba/home.nix | 5 ++--- hosts/mba/mac-apps.nix | 1 - modules/shell.nix | 7 +++++++ modules/tmux.nix | 12 ++++++------ 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index aaddb66..3214b66 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1737575492, - "narHash": "sha256-qa/D3NC1JoApnUuLrq1gseBmIxeg6icm/ojPgggMDVQ=", + "lastModified": 1738428726, + "narHash": "sha256-OUoEgorFHBVnqQ2lITqs6MGN7MH4t/8hLEO29OKu6CM=", "owner": "nix-community", "repo": "home-manager", - "rev": "cefb1889b96ddd1dac3dd4734e894f4cadab7802", + "rev": "dae6d3460c8bab3ac9f38a86affe45b32818e764", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1737504076, - "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", + "lastModified": 1738277753, + "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", + "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737525964, - "narHash": "sha256-3wFonKmNRWKq1himW9N3TllbeGIHFACI5vmLpk6moF8=", + "lastModified": 1738297584, + "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5757bbb8bd7c0630a0cc4bb19c47e588db30b97c", + "rev": "9189ac18287c599860e878e905da550aa6dec1cd", "type": "github" }, "original": { @@ -58,11 +58,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737569578, - "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", + "lastModified": 1738433464, + "narHash": "sha256-7FY9FFafS1NMyhL8d/SwLgLglU9vDJqWm83grbnLD2A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "47addd76727f42d351590c905d9d1905ca895b82", + "rev": "0ab13642a5960f31c54ea25747deac406c447093", "type": "github" }, "original": { diff --git a/hosts/mba/home.nix b/hosts/mba/home.nix index 264b3eb..82adbd3 100644 --- a/hosts/mba/home.nix +++ b/hosts/mba/home.nix @@ -19,11 +19,10 @@ home.packages = [ pkgs.air - pkgs.awsebcli - pkgs.bun + # pkgs.bun pkgs.go pkgs.nodejs_23 - pkgs.python314 # coz awsebcli requires python in $PATH + # pkgs.python314 # coz awsebcli requires python in $PATH pkgs.pnpm pkgs.discord # nigga ain't working properly diff --git a/hosts/mba/mac-apps.nix b/hosts/mba/mac-apps.nix index 1357d05..bd40aa3 100644 --- a/hosts/mba/mac-apps.nix +++ b/hosts/mba/mac-apps.nix @@ -37,7 +37,6 @@ "zen-browser" # not me using em :( - "mongodb-compass" "postman" "slack" "zoom" diff --git a/modules/shell.nix b/modules/shell.nix index 3156832..e01ad33 100644 --- a/modules/shell.nix +++ b/modules/shell.nix @@ -2,6 +2,13 @@ programs = { zsh = { enable = true; + envExtra = '' + eval "$(/opt/homebrew/bin/brew shellenv)" + export PATH="/opt/homebrew/bin:$PATH" + + export BUN_INSTALL="$HOME/.bun" + export PATH="$BUN_INSTALL/bin:$PATH" + ''; shellAliases = { ls = "lsd"; lg = "lazygit"; diff --git a/modules/tmux.nix b/modules/tmux.nix index 3c594ba..4b1d499 100644 --- a/modules/tmux.nix +++ b/modules/tmux.nix @@ -17,21 +17,21 @@ } ]; - extraConfig = " - set-option -sa terminal-overrides \",xterm*:Tc\" + extraConfig = '' + set-option -sa terminal-overrides ",xterm*:Tc" set -s escape-time 0 # split panes using | and - - unbind '\"' + unbind '"' unbind % - bind _ split-window -h - bind - split-window -v + bind - split-window -v -c "#{pane_current_path}" + bind _ split-window -h -c "#{pane_current_path}" bind -r k select-pane -U bind -r j select-pane -D bind -r h select-pane -L bind -r l select-pane -R - "; + ''; }; }