Compare commits

...

4 commits

Author SHA1 Message Date
Anish Lakhwara 9376c314f1
signing git commits 2025-09-16 09:32:39 -07:00
Anish Lakhwara bdbf702929 darwin: 25.05 update 2025-05-20 15:20:16 -07:00
Anish Lakhwara e40fe3d663 update tmuxrc and add zk, diffnav 2025-05-17 23:25:03 -07:00
Anish Lakhwara 09ed31e612 update drawin 2025-05-10 14:53:22 -07:00
10 changed files with 96 additions and 34 deletions

30
.aider.chat.history.md Normal file
View file

@ -0,0 +1,30 @@
# aider chat started at 2025-02-07 16:38:26
> Newer aider version v0.74.1 is available.
> python3.11 -m pip install --upgrade --upgrade-strategy only-if-needed aider-chat
> Run pip install? (Y)es/(N)o [Yes]: y
> /nix/store/8hkpwrgr7h06di861vhx612xfkrjzpak-python3-3.11.11/bin/python3.11: No module named pip
> Add .aider*, .env to .gitignore (recommended)? (Y)es/(N)o [Yes]: n
> /nix/store/cyihi1p1d92g2zg1frmppbm97h893adk-aider-chat-0.62.0/bin/aider
> Warning: gpt-4o-2024-08-06 expects these environment variables
> - OPENAI_API_KEY: Not set
> If you just set these environment variables using `setx` you may need to restart your terminal or command prompt for the changes to take effect.
> Warning: gpt-4o-mini expects these environment variables
> - OPENAI_API_KEY: Not set
> If you just set these environment variables using `setx` you may need to restart your terminal or command prompt for the changes to take effect.
> You can skip this check with --no-show-model-warnings
> https://aider.chat/docs/llms/warnings.html
> Open documentation url for more info? (Y)es/(N)o [Yes]: n
> Aider v0.62.0
> Main model: gpt-4o-2024-08-06 with diff edit format
> Weak model: gpt-4o-mini
> Git repo: .git with 293 files
> Repo-map: using 1024 tokens, auto refresh
> Use /help <question> for help, run "aider --help" to see cmd line args
>
>
> ^C again to exit
>
>
> ^C KeyboardInterrupt

6
.aider.input.history Normal file
View file

@ -0,0 +1,6 @@
# 2025-02-10 16:27:55.065630
+y
# 2025-02-10 16:28:04.851326
+n

Binary file not shown.

View file

@ -110,16 +110,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724561770, "lastModified": 1747752302,
"narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", "narHash": "sha256-XqNAcEFfe5tJZGlx+Su0G67ZwRwZmHNWwiMK0fji0Hw=",
"owner": "LnL7", "owner": "nix-darwin",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", "rev": "74ecd01d2c122f8a4a48066ab1d48f3e01671671",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "LnL7", "owner": "nix-darwin",
"ref": "master", "ref": "nix-darwin-25.05",
"repo": "nix-darwin", "repo": "nix-darwin",
"type": "github" "type": "github"
} }
@ -496,16 +496,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736373539, "lastModified": 1747556831,
"narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bd65bc3cde04c16755955630b344bc9e35272c56", "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11", "ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -770,16 +770,16 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1738702386, "lastModified": 1747610100,
"narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -1208,11 +1208,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1738680400, "lastModified": 1747542820,
"narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "799ba5bffed04ced7067a91798353d360788b30d", "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -3,12 +3,12 @@
inputs = { inputs = {
# Nixpkgs # Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
# Home manager # Home manager
home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.url = "github:nix-community/home-manager/release-25.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
hardware.url = "github:nixos/nixos-hardware"; hardware.url = "github:nixos/nixos-hardware";
@ -36,7 +36,7 @@
# OSX # OSX
darwin = { darwin = {
url = "github:LnL7/nix-darwin/master"; url = "github:nix-darwin/nix-darwin/nix-darwin-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-homebrew = { nix-homebrew = {
@ -124,13 +124,22 @@
nixpkgsFor = forAllSystems (system: import nixpkgs { nixpkgsFor = forAllSystems (system: import nixpkgs {
inherit system; inherit system;
config.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ # This doesn't work...
"ripcord" # on darwin, I need to export ALLOW_NIXPKGS_UNFREE=1
"VCV-Rack" # and pass --impure (have to manually copy the `nrd` command, it gets passed to the cd)
"SunVox" config = {
"renoise" allowUnfree = true;
"graphite-cli" allowUnfreePredicate = _: true;
]; };
# config.allowUnfree = true;
#config.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [
# "ripcord"
# "VCV-Rack"
# "SunVox"
# "renoise"
# "graphite-cli"
# "claude-code"
#];
# config.permittedInsecurePackages = [ # config.permittedInsecurePackages = [
# "python3.10-django-3.1.14" # Needed for archivebox deployments on curve # "python3.10-django-3.1.14" # Needed for archivebox deployments on curve
# # Check when archive box updates it's dependeny # # Check when archive box updates it's dependeny

View file

@ -14,7 +14,7 @@
home.homeDirectory = "/Users/anishlakhwara"; home.homeDirectory = "/Users/anishlakhwara";
home.stateVersion = "22.05"; home.stateVersion = "22.05";
programs.zsh.initExtra = '' programs.zsh.initContent = ''
PATH=/Users/anishlakhwara/.sourcegraph/bin:/Users/anishlakhwara/.sourcegraph/sg.zsh_autocomplete:/Users/anishlakhwara/google-cloud-sdk/bin:/Users/anishlakhwara/google-cloud-sdk/completion.zsh.inc:/Users/anishlakhwara/google-cloud-sdk/path.zsh.inc:/Users/anishlakhwara/.sg:/opt/homebrew/bin:$PATH PATH=/Users/anishlakhwara/.sourcegraph/bin:/Users/anishlakhwara/.sourcegraph/sg.zsh_autocomplete:/Users/anishlakhwara/google-cloud-sdk/bin:/Users/anishlakhwara/google-cloud-sdk/completion.zsh.inc:/Users/anishlakhwara/google-cloud-sdk/path.zsh.inc:/Users/anishlakhwara/.sg:/opt/homebrew/bin:$PATH
''; '';

View file

@ -13,6 +13,14 @@ set-option -g mouse on
bind | split-window -h -c "#{pane_current_path}" bind | split-window -h -c "#{pane_current_path}"
bind - split-window -v -c "#{pane_current_path}" bind - split-window -v -c "#{pane_current_path}"
# move between tabs using vim commands
bind-key -n C-h previous-window
bind-key -n C-l next-window
# hide and restore panes
bind-key ! break-pane -d -n _hidden_pane
bind-key @ join-pane -s $.0
# don't rename windows automatically # don't rename windows automatically
set-option -g allow-rename off set-option -g allow-rename off

View file

@ -1,6 +1,7 @@
{ lib, pkgs, config, ... }: { lib, pkgs, config, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
#unstable.claude-code
binutils binutils
# coreutils # coreutils
dnsutils dnsutils
@ -62,6 +63,10 @@
# ssb-patchwork # ssb-patchwork
pandoc pandoc
taskwarrior-tui taskwarrior-tui
zk
diffnav
jujutsu
git-spice
# llms (needs 24.11) # llms (needs 24.11)
aider-chat aider-chat
@ -134,7 +139,7 @@
enableCompletion = true; enableCompletion = true;
autosuggestion.enable = false; autosuggestion.enable = false;
initExtra = '' initContent = ''
bindkey -v bindkey -v
autopair-init autopair-init
''; '';
@ -279,7 +284,7 @@
srch = "ns nixpkgs"; srch = "ns nixpkgs";
orch = "ns override"; orch = "ns override";
nrb = "cd /tmp; sudo nixos-rebuild switch --flake '/home/anish/usr/helm#curve'; cd $OLDPWD"; nrb = "cd /tmp; sudo nixos-rebuild switch --flake '/home/anish/usr/helm#curve'; cd $OLDPWD";
nrd = "cd /tmp; darwin-rebuild switch --flake /Users/anishlakhwara/usr/helm#Anishs-MacBook-Pro; cd $OLDPWD"; nrd = "cd /tmp; NIXPKGS_ALLOW_UNFREE=1 sudo darwin-rebuild switch --flake /Users/anishlakhwara/usr/helm#Anishs-MacBook-Pro --impure; cd $OLDPWD";
nrt = "cd /tmp; sudo nixos-rebuild test --flake '/home/anish/usr/helm#curve'; cd $OLDPWD"; nrt = "cd /tmp; sudo nixos-rebuild test --flake '/home/anish/usr/helm#curve'; cd $OLDPWD";
ned = "cd /home/anish/usr/helm; vim; cd $OLDPWD"; ned = "cd /home/anish/usr/helm; vim; cd $OLDPWD";
ncd = "cd /home/anish/usr/helm"; ncd = "cd /home/anish/usr/helm";

View file

@ -12,7 +12,10 @@
userName = "Anish Lakhwara"; userName = "Anish Lakhwara";
userEmail = "anish+git@lakhwara.com"; userEmail = "anish+git@lakhwara.com";
delta.enable = true; delta.enable = true;
# TODO enable signing signing = {
signByDefault = true;
key = "7FC5DF072EF7B716";
};
ignores = [ ignores = [
"*~" "*~"

View file

@ -44,8 +44,8 @@
}; };
}; };
system.primaryUser = "anishlakhwara";
# Auto upgrade nix package and the daemon service. # Auto upgrade nix package and the daemon service.
services.nix-daemon.enable = true;
nixpkgs.hostPlatform = "aarch64-darwin"; nixpkgs.hostPlatform = "aarch64-darwin";
programs.zsh.enable = true; programs.zsh.enable = true;
@ -55,7 +55,6 @@
settings.trusted-users = [ "@admin" "anishlakhwara" ]; settings.trusted-users = [ "@admin" "anishlakhwara" ];
gc = { gc = {
user = "root";
automatic = true; automatic = true;
interval = { Weekday = 0; Hour = 2; Minute = 0; }; interval = { Weekday = 0; Hour = 2; Minute = 0; };
options = "--delete-older-than 30d"; options = "--delete-older-than 30d";
@ -85,7 +84,9 @@
siji siji
font-awesome font-awesome
proggyfonts proggyfonts
(nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "Iosevka" ]; }) nerd-fonts.fira-code
nerd-fonts.droid-sans-mono
nerd-fonts.iosevka
]; ];
system = { system = {