latest updates and comment out wezterm for now due to bug

This commit is contained in:
Salar Rahmanian 2023-04-29 23:28:16 -07:00
parent 22ce600524
commit cdc210994a
3 changed files with 19 additions and 32 deletions

View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680266963, "lastModified": 1682773107,
"narHash": "sha256-IW/lzbUCOcldLHWHjNSg1YoViDnZOmz0ZJL7EH9OkV8=", "narHash": "sha256-+h94XeJnG3uk5imJlBi/1lVmcfCbxHpwZp5u7n3Krwg=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "99d4187d11be86b49baa3a1aec0530004072374f", "rev": "379d42fad6bc5c28f79d5f7ff2fa5f1c90cb7bf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -25,15 +25,14 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1680667162, "lastModified": 1682779989,
"narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=", "narHash": "sha256-H8AjcIBYFYrlRobYJ+n1B+ZJ6TsaaeZpuLn4iRqVvr4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d", "rev": "3144311f31194b537808ae6848f86f3dbf977d59",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -44,11 +43,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1680758185, "lastModified": 1682692304,
"narHash": "sha256-sCVWwfnk7zEX8Z+OItiH+pcSklrlsLZ4TJTtnxAYREw=", "narHash": "sha256-9/lyXN2BpHw+1xE+D2ySBSLMCHWqiWu5tPHBMRDib8M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0e19daa510e47a40e06257e205965f3b96ce0ac9", "rev": "937a9d1ee7b1351d8c55fff6611a8edf6e7c1c37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +59,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1680925189, "lastModified": 1682820334,
"narHash": "sha256-fvUnUetVs+rd3UJUwbz7iJR4FOCKKacZ+jr62QHN7Rg=", "narHash": "sha256-dE9vVSJZei3fqZDTbDYU35/N7XCpHoEPdS8LBid1tb4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "37873ea3385b62c9ab795fcd0aaa68863bd0c887", "rev": "119de5f27fc96b9dc56406050b764b9a1016a061",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -80,21 +79,6 @@
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nur": "nur" "nur": "nur"
} }
},
"utils": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -147,7 +147,7 @@
copy_on_select = true; copy_on_select = true;
enabled_layouts = "*"; enabled_layouts = "*";
macos_quit_when_last_window_closed = true; macos_quit_when_last_window_closed = true;
scrollback_lines = 10000; scrollback_lines = 50000;
}; };
}; };
@ -269,6 +269,7 @@
interactiveShellInit = '' interactiveShellInit = ''
eval (direnv hook fish) eval (direnv hook fish)
any-nix-shell fish --info-right | source any-nix-shell fish --info-right | source
ssh-add ~/.ssh/id_ed25519 --apple-use-keychain --apple-load-keychain
''; '';
shellAliases = { shellAliases = {
@ -287,6 +288,8 @@
gws="git status"; gws="git status";
gu="gitui"; gu="gitui";
ghauth="gh auth login --with-token < ~/.ghauth"; ghauth="gh auth login --with-token < ~/.ghauth";
gitpurgemain=''git branch --merged | grep -v "\*" | grep -v "main" | xargs -n 1 git branch -d'';
gitpurgemaster=''git branch --merged | grep -v "\*" | grep -v "master" | xargs -n 1 git branch -d'';
giscala="gitignore scala,vim,java,sbt > .gitignore"; giscala="gitignore scala,vim,java,sbt > .gitignore";
gforksync="git fetch upstream && git merge upstream/master && git push origin master"; gforksync="git fetch upstream && git merge upstream/master && git push origin master";
grep="grep --color=auto"; grep="grep --color=auto";
@ -318,7 +321,7 @@
# Neovim Configuration # Neovim Configuration
xdg.configFile."nvim".source = builtins.fetchGit { xdg.configFile."nvim".source = builtins.fetchGit {
url = "https://git.softinio.com/softinio/nvim-config.git"; url = "https://git.softinio.com/nvim-config.git";
rev = "3c5cdb2304a76e942cfb126e5ad0c93076626c7a"; rev = "3c5cdb2304a76e942cfb126e5ad0c93076626c7a";
}; };
} }

View file

@ -1,5 +1,5 @@
[ [
./git ./git
./tmux ./tmux
./wezterm # ./wezterm
] ]