zaphar/dotfiles
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Update to 22.11 and add plantuml

Browse Source
This commit is contained in:
Jeremy Wall 2022-11-20 14:04:02 -05:00
parent 7538dfd756
commit 1c1ff5c6fb
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zshrc
View File

@ -4,6 +4,8 @@ export EDITOR="nvim"
PS1="%F{green}[%T] %F{cyan}(%n@%m) %F{lightgrey}(%y) PS1="%F{green}[%T] %F{cyan}(%n@%m) %F{lightgrey}(%y)
%F{white}%(!.%F{red}>>.$>) " %F{white}%(!.%F{red}>>.$>) "
export PATH="${PATH}:/opt/podman/bin"
# >>> conda initialize >>> # >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !! # !! Contents within this block are managed by 'conda init' !!
__conda_setup="$('/Users/zaphar/opt/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" __conda_setup="$('/Users/zaphar/opt/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"

11
nix/darwin/darwin-configuration.nix
View File

@ -12,6 +12,11 @@
imports = [ imports = [
./program-neovim.nix ./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. # I'm not a zealot about this one.
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -55,7 +60,6 @@
coc-json coc-json
vim-toml vim-toml
hoon-vim hoon-vim
rnix-lsp
]; ];
}; };
}; };
@ -87,10 +91,15 @@
go go
htop htop
colima colima
qemu
lima lima
rlwrap rlwrap
docker-client docker-client
google-cloud-sdk google-cloud-sdk
rnix-lsp
alloy6
jdk
plantuml-c4
inputs.sile inputs.sile
inputs.runwhen inputs.runwhen
inputs.durnitisp inputs.durnitisp

8
nix/darwin/flake.lock generated
View File

@ -216,16 +216,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1653328845, "lastModified": 1669833724,
"narHash": "sha256-NKc98+iX8YH500np1zWZSQ2C+FoD9sS/nuH02Rg2ats=", "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7ae60dd7068478db5d936a3850b6df859aec21d0", "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "22.05-beta", "ref": "22.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
nix/darwin/flake.nix
View File

@ -2,7 +2,7 @@
inputs = { inputs = {
# TODO(jwall): Pinning this to a fixed version of lua on darwin for now. # 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.url = "github:lnl7/nix-darwin";
darwin.inputs.nixpkgs.follows = "nixpkgs"; darwin.inputs.nixpkgs.follows = "nixpkgs";
runwhen.url = "github:zaphar/runwhen?ref=v0.0.5"; runwhen.url = "github:zaphar/runwhen?ref=v0.0.5";
@ -30,7 +30,7 @@
durnitisp = durnitisp.defaultPackage."${system}"; durnitisp = durnitisp.defaultPackage."${system}";
rust-overlay = rust-overlay.overlay; rust-overlay = rust-overlay.overlay;
#TODO(jwall): when the libtexpdf issue is fixed we can stop doing this #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}"; jj = jj.defaultPackage."${system}";
}; };
}); });

1
result Symbolic link
View File

@ -0,0 +1 @@
/nix/store/an2n1rd5y1i5l35bb7vh5kyimsnb2cmd-darwin-system-22.11.20221130.4d2b37a+darwin4.4fdbb81