Merge pull request 'push-yoywpxxruzxy' (#20) from push-yoywpxxruzxy into main

Reviewed-on: #20
This commit is contained in:
Salar Rahmanian 2025-06-01 19:47:38 -07:00
commit 1dfa3b33b6
6 changed files with 33 additions and 22 deletions

30
flake.lock generated
View file

@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744735751, "lastModified": 1748668774,
"narHash": "sha256-OPpfgL3qUIbQdbmp1/ZwnlsuTLooHN4or0EABnZTFRY=", "narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "db7738e67a101ad945abbcb447e1310147afaf1b", "rev": "60e4624302d956fe94d3f7d96a560d14d70591b9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -48,11 +48,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1744478979, "lastModified": 1748352827,
"narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "narHash": "sha256-sNUUP6qxGkK9hXgJ+p362dtWLgnIWwOCmiq72LAWtYo=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "43975d782b418ebf4969e9ccba82466728c2851b", "rev": "44a7d0e687a87b73facfe94fba78d323a6686a90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -63,11 +63,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1744536153, "lastModified": 1748568828,
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "narHash": "sha256-5O6tAGsPwQyh+0TjqxLRGQ3g0IrF8pTKa8M/W6hwWt0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "rev": "6bfd7663660ecf5336c1054e9e877824a4f84954",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,11 +79,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1744463964, "lastModified": 1748460289,
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -100,11 +100,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1744779422, "lastModified": 1748708306,
"narHash": "sha256-CQDbwo7yYV5q0iVJ+h8+jrHmAdES2pEQyL5UeQkProE=", "narHash": "sha256-wi+7mfLA0IQBtklOF/OC7Zhh3Riv6MH5zYtATlWDjTQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "d4312945f8ea7252952fcf694f0c6324acac5334", "rev": "7ef9c6546269642f3a8645bd273388d5761c42da",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -50,6 +50,7 @@
go go
graphviz graphviz
jetbrains-mono jetbrains-mono
jjui
jq-lsp jq-lsp
luajit luajit
lua-language-server lua-language-server
@ -218,6 +219,6 @@
# Neovim Configuration # Neovim Configuration
xdg.configFile."nvim".source = builtins.fetchGit { xdg.configFile."nvim".source = builtins.fetchGit {
url = "https://code.softinio.com/softinio/nvim-config"; url = "https://code.softinio.com/softinio/nvim-config";
rev = "e609be92393f89856d850e9cc3aa23c7badf0bee"; rev = "ba28bef49a6ec11692d5bdb4949fc484139c8fa5";
}; };
} }

View file

@ -69,6 +69,7 @@
bf = "broot"; bf = "broot";
cat = "bat"; cat = "bat";
du = "dua i"; du = "dua i";
linesofcode = "git ls-files | xargs wc -l";
fzfp = "fzf --preview 'bat --style=numbers --color=always --line-range :500 {}'"; fzfp = "fzf --preview 'bat --style=numbers --color=always --line-range :500 {}'";
ping = "prettyping"; ping = "prettyping";
".." = "cd .."; ".." = "cd ..";

View file

@ -64,9 +64,7 @@ let
"*metals.sbt" "*metals.sbt"
"*.envrc" # there is lorri, nix-direnv & simple direnv; let people decide "*.envrc" # there is lorri, nix-direnv & simple direnv; let people decide
"*hie.yaml" # ghcide files "*hie.yaml" # ghcide files
"*.mill-version" # used by metals
"*.vscode" "*.vscode"
"*.python-version"
"result" "result"
]; ];
in in

View file

@ -30,6 +30,17 @@ in
bind -r ')' switch-client -n\; refresh-client -S 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
'';
}
]; ];
}; };
} }

View file

@ -73,10 +73,10 @@ bind -r C-h select-window -t :-
bind -r C-l select-window -t :+ bind -r C-l select-window -t :+
# resize panes # resize panes
bind -r H resize-pane -L 5 bind -r H resize-pane -L 10
bind -r J resize-pane -D 5 bind -r J resize-pane -D 10
bind -r K resize-pane -U 5 bind -r K resize-pane -U 10
bind -r L resize-pane -R 5 bind -r L resize-pane -R 10
## Quickly switch panes ## Quickly switch panes
unbind ^J unbind ^J