Update to 22.11 and add plantuml
This commit is contained in:
parent
7538dfd756
commit
1c1ff5c6fb
2
.zshrc
2
.zshrc
@ -4,6 +4,8 @@ export EDITOR="nvim"
|
||||
PS1="%F{green}[%T] %F{cyan}(%n@%m) %F{lightgrey}(%y)
|
||||
%F{white}%(!.%F{red}>>.$>) "
|
||||
|
||||
export PATH="${PATH}:/opt/podman/bin"
|
||||
|
||||
# >>> conda initialize >>>
|
||||
# !! Contents within this block are managed by 'conda init' !!
|
||||
__conda_setup="$('/Users/zaphar/opt/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
|
||||
|
@ -12,6 +12,11 @@
|
||||
imports = [
|
||||
./program-neovim.nix
|
||||
];
|
||||
|
||||
# Right now the documentation build is broken.
|
||||
# TODO(jwall): Add this back when they work again.
|
||||
documentation.enable = false;
|
||||
|
||||
# I'm not a zealot about this one.
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
@ -55,7 +60,6 @@
|
||||
coc-json
|
||||
vim-toml
|
||||
hoon-vim
|
||||
rnix-lsp
|
||||
];
|
||||
};
|
||||
};
|
||||
@ -87,10 +91,15 @@
|
||||
go
|
||||
htop
|
||||
colima
|
||||
qemu
|
||||
lima
|
||||
rlwrap
|
||||
docker-client
|
||||
google-cloud-sdk
|
||||
rnix-lsp
|
||||
alloy6
|
||||
jdk
|
||||
plantuml-c4
|
||||
inputs.sile
|
||||
inputs.runwhen
|
||||
inputs.durnitisp
|
||||
|
8
nix/darwin/flake.lock
generated
8
nix/darwin/flake.lock
generated
@ -216,16 +216,16 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1653328845,
|
||||
"narHash": "sha256-NKc98+iX8YH500np1zWZSQ2C+FoD9sS/nuH02Rg2ats=",
|
||||
"lastModified": 1669833724,
|
||||
"narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7ae60dd7068478db5d936a3850b6df859aec21d0",
|
||||
"rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "22.05-beta",
|
||||
"ref": "22.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
inputs = {
|
||||
# TODO(jwall): Pinning this to a fixed version of lua on darwin for now.
|
||||
nixpkgs.url = "github:nixos/nixpkgs?ref=22.05-beta";
|
||||
nixpkgs.url = "github:nixos/nixpkgs?ref=22.11";
|
||||
darwin.url = "github:lnl7/nix-darwin";
|
||||
darwin.inputs.nixpkgs.follows = "nixpkgs";
|
||||
runwhen.url = "github:zaphar/runwhen?ref=v0.0.5";
|
||||
@ -30,7 +30,7 @@
|
||||
durnitisp = durnitisp.defaultPackage."${system}";
|
||||
rust-overlay = rust-overlay.overlay;
|
||||
#TODO(jwall): when the libtexpdf issue is fixed we can stop doing this
|
||||
sile = pkgs.sile.overrideAttrs(oldAttrs: { doCheck = false; });
|
||||
sile = pkgs.sile.overrideAttrs(oldAttrs: { doCheck = false; meta.broken = false; });
|
||||
jj = jj.defaultPackage."${system}";
|
||||
};
|
||||
});
|
||||
|
Loading…
x
Reference in New Issue
Block a user