From e18516161d1de762b3ebe227d2d4a90ed17080bf Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Sun, 4 May 2025 21:40:00 -0700 Subject: [PATCH 1/6] nvim update --- home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home.nix b/home.nix index 319e4cc..646f7d3 100644 --- a/home.nix +++ b/home.nix @@ -218,6 +218,6 @@ # Neovim Configuration xdg.configFile."nvim".source = builtins.fetchGit { url = "https://code.softinio.com/softinio/nvim-config"; - rev = "e609be92393f89856d850e9cc3aa23c7badf0bee"; + rev = "ba28bef49a6ec11692d5bdb4949fc484139c8fa5"; }; } From 8ac93a2368020a11f0a7e412d9be6c70f73162a4 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Fri, 23 May 2025 20:10:29 -0700 Subject: [PATCH 2/6] flake update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index a97ff16..e192a5e 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1744735751, - "narHash": "sha256-OPpfgL3qUIbQdbmp1/ZwnlsuTLooHN4or0EABnZTFRY=", + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "db7738e67a101ad945abbcb447e1310147afaf1b", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", + "lastModified": 1748004251, + "narHash": "sha256-XodjkVWTth3A2JpBqGBkdLD9kkWn94rnv98l3xwKukg=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", + "rev": "33220d4791784e4dd4739edd3f6c028020082f91", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", + "lastModified": 1747958103, + "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", "owner": "nixos", "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744779422, - "narHash": "sha256-CQDbwo7yYV5q0iVJ+h8+jrHmAdES2pEQyL5UeQkProE=", + "lastModified": 1748054583, + "narHash": "sha256-l8WbE4TC4FPzfhQ/42A4Dc66AzBtLEa6eOKSbPif+/g=", "owner": "nix-community", "repo": "nur", - "rev": "d4312945f8ea7252952fcf694f0c6324acac5334", + "rev": "5443a0f6823b22dc72fee8aa078af8c712ed6140", "type": "github" }, "original": { From e2b05c0dd8ba1bcd3d080681134150e6b8cee362 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Sun, 25 May 2025 16:00:49 -0700 Subject: [PATCH 3/6] flake update and add resurrect tmux plugin --- flake.lock | 30 +++++++++++++++--------------- programs/tmux/default.nix | 11 +++++++++++ 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index e192a5e..ee1d955 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1747978958, - "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", + "lastModified": 1748182899, + "narHash": "sha256-r6MHSalDFydlUmjorVTSsyhLjIt8VWNtGc5+mffXvFQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", + "rev": "901f8fef7f349cf8a8e97b3230b22fd592df9160", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1748004251, - "narHash": "sha256-XodjkVWTth3A2JpBqGBkdLD9kkWn94rnv98l3xwKukg=", + "lastModified": 1748149228, + "narHash": "sha256-mmonYFesFo42UUS49Hd0bcbVJRWX/aHBCDYUkkvylf4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "33220d4791784e4dd4739edd3f6c028020082f91", + "rev": "a9939228f661df370c4094fe85f683e45d761dbe", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747958103, - "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", + "lastModified": 1748123162, + "narHash": "sha256-1fROmP+xlRkSiZ2bTH9JM6b4NUREhCerESEKQBKBkEw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", + "rev": "edb3633f9100d9277d1c9af245a4e9337a980c07", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748054583, - "narHash": "sha256-l8WbE4TC4FPzfhQ/42A4Dc66AzBtLEa6eOKSbPif+/g=", + "lastModified": 1748213329, + "narHash": "sha256-l1SFLYHdA78lYMHJsTneYChey+RTM7IxYy9CcDs71+o=", "owner": "nix-community", "repo": "nur", - "rev": "5443a0f6823b22dc72fee8aa078af8c712ed6140", + "rev": "77bf8fcf8ea307b0247159ab62319c5733bacfd7", "type": "github" }, "original": { diff --git a/programs/tmux/default.nix b/programs/tmux/default.nix index 0fba6c6..e630d77 100644 --- a/programs/tmux/default.nix +++ b/programs/tmux/default.nix @@ -30,6 +30,17 @@ in bind -r ')' switch-client -n\; refresh-client -S ''; } + { + plugin = resurrect; + extraConfig = "set -g @resurrect-strategy-nvim 'session'"; + } + { + plugin = continuum; + extraConfig = '' + set -g @continuum-restore 'on' + set -g @continuum-save-interval '60' # minutes + ''; + } ]; }; } From 9f6f683c6df4ab67485229d04a35ed9b853ccf2e Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Sun, 25 May 2025 18:48:28 -0700 Subject: [PATCH 4/6] increase tmux pane resize steps --- programs/tmux/tmux.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/tmux/tmux.conf b/programs/tmux/tmux.conf index cfdfa5b..9aef545 100644 --- a/programs/tmux/tmux.conf +++ b/programs/tmux/tmux.conf @@ -73,10 +73,10 @@ bind -r C-h select-window -t :- bind -r C-l select-window -t :+ # resize panes -bind -r H resize-pane -L 5 -bind -r J resize-pane -D 5 -bind -r K resize-pane -U 5 -bind -r L resize-pane -R 5 +bind -r H resize-pane -L 10 +bind -r J resize-pane -D 10 +bind -r K resize-pane -U 10 +bind -r L resize-pane -R 10 ## Quickly switch panes unbind ^J From 75bd4e07adc0f11f9c985d505086aeed5c2b0a8b Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Mon, 26 May 2025 21:56:46 -0700 Subject: [PATCH 5/6] flake update and add jjui --- flake.lock | 30 +++++++++++++++--------------- home.nix | 1 + 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index ee1d955..9d58ee2 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1748182899, - "narHash": "sha256-r6MHSalDFydlUmjorVTSsyhLjIt8VWNtGc5+mffXvFQ=", + "lastModified": 1748668774, + "narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=", "owner": "nix-community", "repo": "home-manager", - "rev": "901f8fef7f349cf8a8e97b3230b22fd592df9160", + "rev": "60e4624302d956fe94d3f7d96a560d14d70591b9", "type": "github" }, "original": { @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1748149228, - "narHash": "sha256-mmonYFesFo42UUS49Hd0bcbVJRWX/aHBCDYUkkvylf4=", + "lastModified": 1748352827, + "narHash": "sha256-sNUUP6qxGkK9hXgJ+p362dtWLgnIWwOCmiq72LAWtYo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "a9939228f661df370c4094fe85f683e45d761dbe", + "rev": "44a7d0e687a87b73facfe94fba78d323a6686a90", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748123162, - "narHash": "sha256-1fROmP+xlRkSiZ2bTH9JM6b4NUREhCerESEKQBKBkEw=", + "lastModified": 1748568828, + "narHash": "sha256-5O6tAGsPwQyh+0TjqxLRGQ3g0IrF8pTKa8M/W6hwWt0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "edb3633f9100d9277d1c9af245a4e9337a980c07", + "rev": "6bfd7663660ecf5336c1054e9e877824a4f84954", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1748213329, - "narHash": "sha256-l1SFLYHdA78lYMHJsTneYChey+RTM7IxYy9CcDs71+o=", + "lastModified": 1748708306, + "narHash": "sha256-wi+7mfLA0IQBtklOF/OC7Zhh3Riv6MH5zYtATlWDjTQ=", "owner": "nix-community", "repo": "nur", - "rev": "77bf8fcf8ea307b0247159ab62319c5733bacfd7", + "rev": "7ef9c6546269642f3a8645bd273388d5761c42da", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 646f7d3..b42ca39 100644 --- a/home.nix +++ b/home.nix @@ -50,6 +50,7 @@ go graphviz jetbrains-mono + jjui jq-lsp luajit lua-language-server From 9bac51f807118aad6fbde0efd93fd18964169107 Mon Sep 17 00:00:00 2001 From: Salar Rahmanian Date: Sun, 1 Jun 2025 19:41:01 -0700 Subject: [PATCH 6/6] add repo line count alias and update global git ignore list --- programs/fish/default.nix | 1 + programs/git/default.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/fish/default.nix b/programs/fish/default.nix index 6227bc3..39f56c3 100644 --- a/programs/fish/default.nix +++ b/programs/fish/default.nix @@ -69,6 +69,7 @@ bf = "broot"; cat = "bat"; du = "dua i"; + linesofcode = "git ls-files | xargs wc -l"; fzfp = "fzf --preview 'bat --style=numbers --color=always --line-range :500 {}'"; ping = "prettyping"; ".." = "cd .."; diff --git a/programs/git/default.nix b/programs/git/default.nix index 2d8bf5d..1cc8c45 100644 --- a/programs/git/default.nix +++ b/programs/git/default.nix @@ -64,9 +64,7 @@ let "*metals.sbt" "*.envrc" # there is lorri, nix-direnv & simple direnv; let people decide "*hie.yaml" # ghcide files - "*.mill-version" # used by metals "*.vscode" - "*.python-version" "result" ]; in