fix: swap out hardcoded paths tied to usernamemain

3 files changed, 25 insertions, 10 deletions

diff --git a/.gitconfig b/.gitconfig
index 1dcdc46..64e5494 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,4 +16,4 @@
 [alias]
 	ignore = "!gi() { curl -sL https://www.gitignore.io/api/$@ ;}; gi"
 [core]
-	excludesfile = /Users/melodidey/.gitignore_global
\ No newline at end of file
+	excludesfile = ~/.gitignore_global
\ No newline at end of file
diff --git a/.zshrc b/.zshrc
index d900ef9..dd4c558 100644
--- a/.zshrc
+++ b/.zshrc
@@ -3,10 +3,20 @@ alias nano='micro'
 alias fastfetch='fastfetch --logo nixos'
 alias ls='ls -Ga '
 
+alias jaeger='docker run -d --name jaeger \
+  -p 16686:16686 \
+  -p 4317:4317 \
+  -p 4318:4318 \
+  -p 5778:5778 \
+  -p 9411:9411 \
+  cr.jaegertracing.io/jaegertracing/jaeger:2.20.0
+'
+
 # Path alterations
 eval "$(/opt/homebrew/bin/brew shellenv)"
 export COWPATH="$HOME/.config/cows"
-export PATH="$PATH:/Users/melodidey/.local/bin"
+export PATH="$PATH:$HOME/.local/bin"
+export PATH="$PATH:$HOME/.dotnet/tools"
 
 # Clippy command handler
 command_not_found_handler() {
diff --git a/nix/flake.nix b/nix/flake.nix
index 7b4b944..11ba17f 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -24,6 +24,8 @@
     }:
     let
       system = "aarch64-darwin";
+      user = "melodidey";
+      home = "/Users/${user}";
 
       # wallpaper =
       #   nix-wallpaper.packages.${system}.default.override {
@@ -42,7 +44,7 @@
           ...
         }:
         {
-          system.primaryUser = "melodidey";
+          system.primaryUser = user;
           nixpkgs.config.allowUnfree = true;
 
           # List packages installed in system profile. To search by name, run:
@@ -50,6 +52,7 @@
           environment.systemPackages = [
             pkgs.zed-editor
             pkgs.ghostty-bin
+            pkgs.ollama
 
             pkgs.git
             pkgs.cloc
@@ -85,6 +88,8 @@
             pkgs.docker
             pkgs.docker-compose
             pkgs.colima
+            pkgs.rclone
+            pkgs.claude-code
 
             pkgs.k9s
             pkgs.kubectl
@@ -112,7 +117,7 @@
           services.postgresql = {
             enable = true;
             package = pkgs.postgresql_18;
-            dataDir = "/Users/melodidey/Library/Application Support/Postgres";
+            dataDir = "${home}/Library/Application Support/Postgres";
 
             authentication = pkgs.lib.mkForce ''
               	      # TYPE  DATABASE        USER            ADDRESS                 METHOD
@@ -124,7 +129,7 @@
             #ensureDatabases = [ "master" ];
             #ensureUsers = [
             #  {
-            #   name = "melodidey";
+            #   name = user;
             #    ensurePermissions = {
             #      "DATABASE master" = "ALL PRIVILEGES";
             #    };
@@ -133,9 +138,9 @@
           };
 
           system.activationScripts.postActivation.text = ''
-            sudo -u melodidey /run/current-system/sw/bin/stow \
-              --dir="/Users/melodidey/dotfiles" \
-              --target="/Users/melodidey" \
+            sudo -u ${user} /run/current-system/sw/bin/stow \
+              --dir="${home}/dotfiles" \
+              --target="${home}" \
               --restow "."
 
               osascript -e "tell application \"System Events\" to tell every desktop to set picture to \"${wallpaper}\" as POSIX file"
@@ -155,7 +160,7 @@
               "${pkgs.zed-editor}/Applications/Zed.app"
             ];
             dock.persistent-others = [
-              "/Users/melodidey/Downloads"
+              "${home}/Downloads"
             ];
 
             finder.AppleShowAllExtensions = true;
@@ -192,7 +197,7 @@
             nix-homebrew = {
               enable = true;
               #enableRosetta = true;
-              user = "melodidey";
+              user = user;
               autoMigrate = true;
             };
           }