fixes to nix merges

Author: Conner Ohnesorge

.zshrc

@@ -4,15 +4,11 @@ ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git"
 [ ! -d $ZINIT_HOME/.git ] && git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME"
 source "${ZINIT_HOME}/zinit.zsh"
 export ANTHROPIC_LOG=error
-export CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS="1"
-export CLAUDE_CODE_FILE_READ_MAX_OUTPUT_TOKENS=450000 # 450k
-export CLAUDE_CODE_DISABLE_TERMINAL_TITLE="1"
-export USE_API_CONTEXT_MANAGEMENT="0"
-export ANTHROPIC_BETAS=""
 export CLAUDE_CODE_ENABLE_TELEMETRY="0"
 export BUN_INSTALL="$HOME/.bun"
 export PATH="$HOME/.cargo/bin:$PATH"
-export CLAUDE_CODE_ENABLE_TELEMETRY="0"
+export PATH="$HOME/.local/bin:$PATH"
+
 
 path=(
     $HOME/.cargo/bin
@@ -49,6 +45,7 @@ if command -v zoxide &>/dev/null && [[ "$CLAUDECODE" != "1" ]]; then
   fi
 fi
 eval "$(starship init zsh)"
+eval "$(direnv hook zsh)"
 source <(carapace chmod zsh)
 
 autoload -Uz edit-command-line
@@ -73,7 +70,7 @@ cf() {
 }
 alias g='git'
 alias git-reset='git checkout main && git pull'
-alias gr='git reset'
+alias gr='git-reset'
 alias gs='git status'
 alias gd='git diff'
 alias gsh='git stash'

flake.nix

@@ -3,7 +3,6 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-<<<<<<< HEAD
     zen-browser = {
       url = "github:0xc000022070/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -15,13 +14,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-=======
-    zen-browser.url = "github:connerohnesorge/zen-browser-flake";
-    zen-browser.inputs.nixpkgs.follows = "nixpkgs";
-    zen-browser.inputs.home-manager.follows = "home-manager";
-    firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
-    firefox-addons.inputs.nixpkgs.follows = "nixpkgs";
->>>>>>> f4c6eea (add python testing script title)
     proton-authenticator.url = "github:connerohnesorge/proton-authenticator-flake?ref=0494e1b70724861b4f8e2fb314b744e0591dfbb5";
     proton-authenticator.inputs.nixpkgs.follows = "nixpkgs";
 

modules/config/constants.nix

@@ -16,14 +16,9 @@ delib.module {
   name = "constants";
 
   options.constants = with delib; {
-<<<<<<< HEAD
     # Primary username for the system (derived from host configuration)
     # This allows different usernames per machine (e.g., "connerohnesorge" locally, "cohnesor" at work)
     username = strOption "connerohnesorge";
-=======
-    # Primary username for the system (used for account creation and home directory)
-    username = readOnly (strOption "cohnesor");
->>>>>>> f4c6eea (add python testing script title)
 
     # Full display name for the user (used in Git commits and system identification)
     userfullname = readOnly (strOption "Conner Ohnesorge");

modules/config/user.nix

@@ -28,22 +28,14 @@ in
           trusted-users = [
             "root"
             "@wheel" # All wheel group members
-<<<<<<< HEAD
-            username
-=======
-            "cohnesor"
->>>>>>> f4c6eea (add python testing script title)
+            "connerohnesorge"
           ];
 
           # Users allowed to use Nix daemon
           allowed-users = [
             "root"
             "@wheel"
-<<<<<<< HEAD
-            username
-=======
-            "cohnesor"
->>>>>>> f4c6eea (add python testing script title)
+            "connerohnesorge"
           ];
 
           # Binary cache configuration for faster builds