michael/nix-dots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: michael:1233d400fde8906a091812c80c62f961f0b81137
Branches Tags
michael:main
..
compare: michael:528d5da69a915693eb2059d247dca9fb0fbecb89
Branches Tags
michael:main

3 Commits
1233d400fd ... 528d5da69a

Author SHA1 Message Date
Michael Thomas
528d5da69a chore: update lockfile 2023-12-08 11:36:42 -05:00
Michael Thomas
1a2071c596 feat(git): support diffing bun lockfiles 2023-12-08 11:36:21 -05:00
Michael Thomas
e0a99fd91e fix(vscode): add "typecheck" to spellcheck dictionary 2023-12-08 11:35:39 -05:00
3 changed files with 29 additions and 16 deletions
Show Stats Expand all files Collapse all files

30
flake.lock generated
View File

@ -153,11 +153,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1701307184, "lastModified": 1701394021,
"narHash": "sha256-nyWkaA82eLOIr96taEN40OegFC9HW3VUMe9U1VIwEpE=", "narHash": "sha256-5ZEIX2Di/x0GAu9xAP+7tcy7hPu39lhLADwt/YR8Wk0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "dfa26d229c753269091235e1a27d0bb9002cbb66", "rev": "d1f015cf54328b5c96a6f9d68f615f18ddac9264",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -175,11 +175,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701355528, "lastModified": 1701387264,
"narHash": "sha256-YHg+XwkTvkEdWJCG0zSxzbPzMhhuNa0GxJb3U51dY1A=", "narHash": "sha256-uGZycEJqOZSYvpmoFuyDrboe5e1t0F/HB9r7HsWgssc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "4c358d4bb9aee1267fc476bc37c7683fe2df9231", "rev": "1a50ab3fe98934d8f109f05528874c9ab324707b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -237,11 +237,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1701359478, "lastModified": 1701459859,
"narHash": "sha256-CsMkvlne20bT1MEBMCupQAasml/ffcjTNp8GO88F1wU=", "narHash": "sha256-tVEHtlZUEnB3m2PncVCHaBZBHFtZ0c7rKx86OqfstbM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "6b077c8e58ecd06f156a1add6ac0bd88165c9aab", "rev": "6566d9cb63d2abad2bf136e60e0425ba6caa37b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -270,11 +270,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1701310566, "lastModified": 1701397143,
"narHash": "sha256-CL9J3xUR2Ejni4LysrEGX0IdO+Y4BXCiH/By0lmF3eQ=", "narHash": "sha256-nYUJxZXwCWWVBYZXPgRxGDuQcZRhKTtD/Jp5Jl+9EWU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "6d3c6e185198b8bf7ad639f22404a75aa9a09bff", "rev": "bb71557c93cad40f5921b2342d7fd69f9e6497ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -360,11 +360,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1701068326, "lastModified": 1701253981,
"narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
user/modules/dev.nix
View File

@ -24,6 +24,7 @@
extensions = ["rust-src"]; extensions = ["rust-src"];
}) })
]; ];
programs.zsh.initExtra = '' programs.zsh.initExtra = ''
export PATH=~/.npm-packages/bin:$PATH export PATH=~/.npm-packages/bin:$PATH
export NODE_PATH=~/.npm-packages/lib/node_modules export NODE_PATH=~/.npm-packages/lib/node_modules
@ -32,4 +33,15 @@
programs.direnv = { programs.direnv = {
enable = true; enable = true;
}; };
# Bun Git config
programs.git = {
attributes = [
"*.lockb binary diff=lockb"
];
extraConfig = {
diff.lockb.textconv = "bun";
diff.lockb.binary = "true";
};
};
} }

3
user/modules/vscode/settings.json
View File

@ -158,5 +158,6 @@
}, },
"nix.enableLanguageServer": true, "nix.enableLanguageServer": true,
"nix.serverPath": "nil", "nix.serverPath": "nil",
"workbench.colorTheme": "Min Dark" "workbench.colorTheme": "Min Dark",
"cSpell.userWords": ["typecheck"]
} }