changes

darwin/brew.nix

@@ -23,10 +23,13 @@
       "enchant" # spellchecker
       "pkgconfig"
       # "macosrec" # macosrec --record emacs --gif (ctrl-c in terminal to stop)
+      "modular"
       # "openblas"
+      # "ollama"
       "openssl"
       # "openssl@1.1"
       "pandoc"
+      # "pgvector"
       # "pyenv"
       "python@3.11"
       # "qemu"
@@ -61,6 +64,7 @@
       # "discord"
       # "google-chrome"
       # "keybase"
+      "macfuse"
       # "microsoft-auto-update"
       # "microsoft-azure-storage-explorer"
       # "microsoft-office"
@@ -90,6 +94,7 @@
       "microsoft/mssql-release"
       "epk/epk"
       "xenodium/macosrec"
+      "modularml/packages"
       # "jimeh/emacs-builds"
       # "borkdude/brew"
       # "railwaycat/emacsmacport"

darwin/default.nix

@@ -43,7 +43,6 @@
         # "gccemacs-darwin.cachix.org-1:E0Q1uCBvxw58kfgoWtlletUjzINF+fEIkWknAKBnPhs="
       ];
     };
-    readOnlyStore = true;
     nixPath = [
       "nixpkgs=/etc/${config.environment.etc.nixpkgs.target}"
       "home-manager=/etc/${config.environment.etc.home-manager.target}"
@@ -99,6 +98,7 @@
       # "/run/current-system/sw/bin/" # TODO how to avoid hardcoding?
       "$HOME/.npm-packages/bin"
       "$HOME/.poetry/bin"
+      "$HOME/.modular/pkg/packages.modular.com_mojo/bin"
       # "$HOME/.emacs.d/bin"
       # "$HOME/git/doom-emacs/bin"
       # "/opt/homebrew/bin"
@@ -117,6 +117,7 @@
       CPATH="$(brew --prefix)/include";
       CFLAGS="-I$(brew --prefix openssl)/include";
       LDFLAGS="-L$(brew --prefix openssl)/lib";
+      MODULAR_HOME="$HOME/.modular";
       # OPENSSL_ROOT_DIR="/opt/homebrew/Cellar/openssl@3/3.0.7/";
       # BROWSER = "firefox";
       # OPENTYPEFONTS="$HOME/.nix-profile/share/fonts/opentype//:";

home/default.nix

@@ -51,11 +51,12 @@ in
       # docker # World's #1 container tool
       # emacs-all-the-icons-fonts
       # enchant
-      exa # ls replacement written in Rust
+      eza # ls replacement written in Rust
       fd # find replacement written in Rust
       # ffmpeg
       # font-awesome
       fira-code
+      google-cloud-sdk
       gh
       # gitAndTools.gh
       # gitAndTools.git-crypt
@@ -71,6 +72,7 @@ in
       nodePackages.pyright
       nodePackages.eslint
       # nodePackages.prettier
+      # ollama
       # pandoc
       # pinentry_mac # Necessary for GPG
       # poetry
@@ -82,9 +84,11 @@ in
       ripgrep # grep replacement written in Rust
       # rsync
       # rustup
+      shellcheck
       # source-code-pro
       # sqlite
-      # tree # Should be included in macOS but it's not
+      terraform
+      tree # Should be included in macOS but it's not
       tree-sitter
       # tmux
       # watch

home/programs/shells/aliases.nix

@@ -4,46 +4,11 @@
   # Set all shell aliases programatically
   shellAliases = {
     # Aliases for commonly used tools
-    grep = "grep --color=auto";
     cat = "bat";
 
-    # first Create Command-line Launcher
-    ds="/usr/local/bin/dataspell";
-
-    vmstart="az vm start -g rgpazewpmlit-forecasting-tooling-001 -n avocado-ds-vm";
-
-    find = "fd";
-
-    l = "${pkgs.exa}/bin/exa";
-    ls = "${pkgs.exa}/bin/exa";
-    la = "${pkgs.exa}/bin/exa -la";
-    ll = "${pkgs.exa}/bin/exa -lh";
-    lt = "${pkgs.exa}/bin/exa --tree";
-
-    k = "kubectl";
-    ke = "kubectl edit";
-    kx = "kubectl exec -ti ";
-    kp = "kubectl get pods";
-    kj = "kubectl get jobs";
-    kc = "kubectl get cronjobs";
-    kl = "kubectl logs";
-    klf = "kubectl logs -f ";
-    wkp= "watch -n 1 kubectl get pods";
-    kpr= "kubectl get pods --field-selector status.phase=Running";
-    wkpr= "watch -n 1 kubectl get pods --field-selector status.phase=Running";
-    kga= "kubectl get all";
-    kgj= "kubectl get jobs";
-    kdl= "kubectl delete ";
-    kds= "kubectl describe ";
-    pj= "python $HOME/bin/pretty_json.py";
-
-    cljclr="mono $CLOJURE_LOAD_PATH/Clojure.Main.exe";
-
-    pipde = "poetry run pip install debugpy";
-    pipdt = "poetry run pip install dtale";
-
-    # Reload home manager and zsh
-    reload = "cd ~/git/nixpkgs && darwin-rebuild switch --flake .#macbookpro && cd -";
+    ls = "${pkgs.eza}/bin/eza";
+    ll = "${pkgs.eza}/bin/eza -lh";
+    lt = "${pkgs.eza}/bin/eza --tree";
 
     # Nix garbage collection
     garbage = "sudo nix-collect-garbage -d && docker image prune --all --force";