diff --git a/.zshrc b/.zshrc index 2e5454d..9268083 100644 --- a/.zshrc +++ b/.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)" diff --git a/nix/darwin/darwin-configuration.nix b/nix/darwin/darwin-configuration.nix index b70960e..a941be6 100644 --- a/nix/darwin/darwin-configuration.nix +++ b/nix/darwin/darwin-configuration.nix @@ -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 diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock index 41a199b..d541124 100644 --- a/nix/darwin/flake.lock +++ b/nix/darwin/flake.lock @@ -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" } diff --git a/nix/darwin/flake.nix b/nix/darwin/flake.nix index c3dfc27..7a1895a 100644 --- a/nix/darwin/flake.nix +++ b/nix/darwin/flake.nix @@ -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}"; }; }); diff --git a/result b/result new file mode 120000 index 0000000..122edc0 --- /dev/null +++ b/result @@ -0,0 +1 @@ +/nix/store/an2n1rd5y1i5l35bb7vh5kyimsnb2cmd-darwin-system-22.11.20221130.4d2b37a+darwin4.4fdbb81 \ No newline at end of file