From fca200896916231d2146c8b2bf7d81644220dc06 Mon Sep 17 00:00:00 2001 From: Jake Pullen Date: Tue, 4 Nov 2025 20:48:50 +0000 Subject: [PATCH] =?UTF-8?q?deploy:=20=F0=9F=9A=80=20latest=20updates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alacritty/alacritty.toml | 7 + kitty/kitty.conf | 50 ++ set_up_dev/lm_studio_grab.sh | 2 +- starship.toml | 234 +++++++++ zsh/.histfile | 899 ++++++++++++++++++++++++++++++----- zsh/.zshrc | 3 + 6 files changed, 1083 insertions(+), 112 deletions(-) create mode 100644 kitty/kitty.conf create mode 100644 starship.toml diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml index 97523ec..302a8c4 100644 --- a/alacritty/alacritty.toml +++ b/alacritty/alacritty.toml @@ -54,3 +54,10 @@ save_to_clipboard = false [terminal.shell] program = "/usr/bin/zsh" args = ["-l"] + +#[font.normal] +#family = "Noto Sans" +#style = "Regular" + +#[font.emoji] +#family = "google-noto-color-emoji-fonts" diff --git a/kitty/kitty.conf b/kitty/kitty.conf new file mode 100644 index 0000000..914d8fe --- /dev/null +++ b/kitty/kitty.conf @@ -0,0 +1,50 @@ +# vim:ft=kitty + +## name: Catppuccin Kitty Diff Mocha +## author: Catppuccin Org +## license: MIT +## upstream: https://github.com/catppuccin/kitty/blob/main/themes/diff-mocha.conf +## blurb: Soothing pastel theme for the high-spirited! + +# text +foreground #cdd6f4 +# base +background #1e1e2e +# subtext0 +title_fg #a6adc8 + +# mantle +title_bg #181825 +margin_bg #181825 + +# subtext1 +margin_fg #a6adc8 +# mantle +filler_bg #181825 + +# 30% red, 70% base +removed_bg #5e3f53 +# 50% red, 50% base +highlight_removed_bg #89556b +# 40% red, 60% base +removed_margin_bg #734a5f + +# 30% green, 70% base +added_bg #475a51 +# 50% green, 50% base +highlight_added_bg #628168 +# 40% green, 60% base +added_margin_bg #734a5f + +# mantle +hunk_margin_bg #181825 +hunk_bg #181825 + +# 40% yellow, 60% base +search_bg #766c62 +# text +search_fg #cdd6f4 +# 30% sky, 70% base +select_bg #3e5767 +# text +select_fg #cdd6f4 \ No newline at end of file diff --git a/set_up_dev/lm_studio_grab.sh b/set_up_dev/lm_studio_grab.sh index 93843e1..7a20e02 100755 --- a/set_up_dev/lm_studio_grab.sh +++ b/set_up_dev/lm_studio_grab.sh @@ -2,7 +2,7 @@ rm ~/AppImages/LM-Studio.AppImage -cp ~/Downloads/LM-Studio-0.3.30-1-x64.AppImage ~/AppImages/LM-Studio.AppImage +mv ~/Downloads/LM-Studio*.AppImage ~/AppImages/LM-Studio.AppImage chmod +x ~/AppImages/LM-Studio.AppImage diff --git a/starship.toml b/starship.toml new file mode 100644 index 0000000..a81d8c4 --- /dev/null +++ b/starship.toml @@ -0,0 +1,234 @@ +"$schema" = 'https://starship.rs/config-schema.json' + +format = """ +[](red)\ +$os\ +$username\ +[](bg:peach fg:red)\ +$directory\ +[](bg:yellow fg:peach)\ +$git_branch\ +$git_status\ +[](fg:yellow bg:green)\ +$rust\ +$golang\ +$python\ +[](fg:green bg:sapphire)\ +$sudo\ +[](fg:sapphire bg:lavender)\ +$time\ +[ ](fg:lavender)\ +$cmd_duration\ +$line_break\ +$character""" + +palette = 'catppuccin_mocha' + +[os] +disabled = false +style = "bg:red fg:crust" + +[os.symbols] +Windows = "" +Ubuntu = "󰕈" +SUSE = "" +Raspbian = "󰐿" +Mint = "󰣭" +Macos = "󰀵" +Manjaro = "" +Linux = "󰌽" +Gentoo = "󰣨" +Fedora = "󰌽" +Alpine = "" +Amazon = "" +Android = "" +AOSC = "" +Arch = "󰣇" +Artix = "󰣇" +CentOS = "" +Debian = "󰣚" +Redhat = "󱄛" +RedHatEnterprise = "󱄛" + +[username] +show_always = true +style_user = "bg:red fg:crust" +style_root = "bg:red fg:crust" +format = '[ $user]($style)' + +[directory] +style = "bg:peach fg:crust" +format = "[ $path ]($style)" +truncation_length = 4 +truncation_symbol = "…/" + +[directory.substitutions] +"source" = "󰲋 " + +[sudo] +style = "fg:crust bg:sapphire" +symbol = '🧙 ' +disabled = false + +[time] +disabled = false +time_format = "%R" +utc_time_offset = '+0' +style = "bg:lavender" +format = '[[ 🕙 $time ](fg:crust bg:lavender)]($style)' + +[git_branch] +symbol = "git " +style = "bg:yellow" +format = '[[ $symbol$branch ](fg:crust bg:yellow)]($style)' + +[git_status] +style = "bg:yellow" +format = '[[($all_status$ahead_behind )](fg:crust bg:yellow)]($style)' + +[rust] +symbol = "" +style = "bg:green" +format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)' + +[golang] +symbol = "" +style = "bg:green" +format = '[[ $symbol( $version) ](fg:crust bg:green)]($style)' + +[python] +symbol = "" +style = "bg:green" +format = '[[ $symbol( $version)(\(#$virtualenv\)) ](fg:crust bg:green)]($style)' + +[line_break] +disabled = true + +[character] +disabled = false +success_symbol = '[❯](bold fg:green)' +error_symbol = '[❯](bold fg:red)' +vimcmd_symbol = '[❮](bold fg:green)' +vimcmd_replace_one_symbol = '[❮](bold fg:lavender)' +vimcmd_replace_symbol = '[❮](bold fg:lavender)' +vimcmd_visual_symbol = '[❮](bold fg:yellow)' + +[cmd_duration] +show_milliseconds = true +format = " in $duration " +style = "bg:lavender" +disabled = false +show_notifications = false +min_time_to_notify = 45000 + +[palettes.catppuccin_mocha] +rosewater = "#f5e0dc" +flamingo = "#f2cdcd" +pink = "#f5c2e7" +mauve = "#cba6f7" +red = "#f38ba8" +maroon = "#eba0ac" +peach = "#fab387" +yellow = "#f9e2af" +green = "#a6e3a1" +teal = "#94e2d5" +sky = "#89dceb" +sapphire = "#74c7ec" +blue = "#89b4fa" +lavender = "#b4befe" +text = "#cdd6f4" +subtext1 = "#bac2de" +subtext0 = "#a6adc8" +overlay2 = "#9399b2" +overlay1 = "#7f849c" +overlay0 = "#6c7086" +surface2 = "#585b70" +surface1 = "#45475a" +surface0 = "#313244" +base = "#1e1e2e" +mantle = "#181825" +crust = "#11111b" + +[palettes.catppuccin_frappe] +rosewater = "#f2d5cf" +flamingo = "#eebebe" +pink = "#f4b8e4" +mauve = "#ca9ee6" +red = "#e78284" +maroon = "#ea999c" +peach = "#ef9f76" +yellow = "#e5c890" +green = "#a6d189" +teal = "#81c8be" +sky = "#99d1db" +sapphire = "#85c1dc" +blue = "#8caaee" +lavender = "#babbf1" +text = "#c6d0f5" +subtext1 = "#b5bfe2" +subtext0 = "#a5adce" +overlay2 = "#949cbb" +overlay1 = "#838ba7" +overlay0 = "#737994" +surface2 = "#626880" +surface1 = "#51576d" +surface0 = "#414559" +base = "#303446" +mantle = "#292c3c" +crust = "#232634" + +[palettes.catppuccin_latte] +rosewater = "#dc8a78" +flamingo = "#dd7878" +pink = "#ea76cb" +mauve = "#8839ef" +red = "#d20f39" +maroon = "#e64553" +peach = "#fe640b" +yellow = "#df8e1d" +green = "#40a02b" +teal = "#179299" +sky = "#04a5e5" +sapphire = "#209fb5" +blue = "#1e66f5" +lavender = "#7287fd" +text = "#4c4f69" +subtext1 = "#5c5f77" +subtext0 = "#6c6f85" +overlay2 = "#7c7f93" +overlay1 = "#8c8fa1" +overlay0 = "#9ca0b0" +surface2 = "#acb0be" +surface1 = "#bcc0cc" +surface0 = "#ccd0da" +base = "#eff1f5" +mantle = "#e6e9ef" +crust = "#dce0e8" + +[palettes.catppuccin_macchiato] +rosewater = "#f4dbd6" +flamingo = "#f0c6c6" +pink = "#f5bde6" +mauve = "#c6a0f6" +red = "#ed8796" +maroon = "#ee99a0" +peach = "#f5a97f" +yellow = "#eed49f" +green = "#a6da95" +teal = "#8bd5ca" +sky = "#91d7e3" +sapphire = "#7dc4e4" +blue = "#8aadf4" +lavender = "#b7bdf8" +text = "#cad3f5" +subtext1 = "#b8c0e0" +subtext0 = "#a5adcb" +overlay2 = "#939ab7" +overlay1 = "#8087a2" +overlay0 = "#6e738d" +surface2 = "#5b6078" +surface1 = "#494d64" +surface0 = "#363a4f" +base = "#24273a" +mantle = "#1e2030" +crust = "#181926" diff --git a/zsh/.histfile b/zsh/.histfile index 9767512..05f7651 100644 --- a/zsh/.histfile +++ b/zsh/.histfile @@ -9,7 +9,6 @@ cargo run -- monitor /dotfiles/hypr/hyprland.conf cd .config/nvim cargo add anyhow cargo run -- monitor ~/dotfiles/hypr/hyprla -nvim .gitignore rm -rf target cargo run cargo run alias ~/.zshrc @@ -66,7 +65,6 @@ cd JPs_make_work_easier_area mdbook new blog git new blog mkdir blog -rm .gitignore rm chapter_1.md git remote add origin git@github.com:Jake-Pullen/blog.git git checkout -b blog_one @@ -142,8 +140,6 @@ git checkout dev git checkout -b better_docs mdbook init rm -rf book -rm -rf src -rm book.toml mdbook init docs nbim cd docs @@ -172,7 +168,6 @@ gpg --armor --export 047E30AFD800B3E3 git config --global user.signingkey 047E30AFD800B3E3 git config --global commit.gpgsign true nvim verity -uv run pytest -v uv run uff check kill 61252 git checkout stage @@ -221,9 +216,7 @@ la / nvim dotfiles cd /mnt/raid cd com -cd Documents .. -cd /home cd steamapps/common // cd /mnt/raid/ @@ -326,7 +319,6 @@ cd zed rich_tests ls -la devin ls ~ -days-to-bh find verity find devin find winutil @@ -353,13 +345,11 @@ shudown cat ai-web/.webui_secret_key cd ai-web uv init hue_playground -cd hue_playground lms serve cd data_pipeline_for_YNAB zed . uv run main_v2.py code ../devin -uv add python-dotenv cd ../devin uv run json_to_yaml.py cp json_to_yaml.py ~/JPs_make_work_easier_area/my_codes/random_python @@ -372,7 +362,6 @@ git commit -m 'location change' uv init repo-template git commit -m 'batman' git remote add origin git@github.com:sorcware/repo-template.git -git push -u origin main rm repo-template sudo rm -r .github-private sudo rm -r .baml @@ -442,10 +431,8 @@ rocm info cd source/ai_images sudo rm -r ai_images uv run open-webui serve -cd ai_web sudo chmod +x run.sh sudo chmod +x update.sh -./update.sh ./source/ai_web/run.sh cd source/verity git commit -m 'changed to self hosted actions runner' @@ -455,13 +442,11 @@ uv version bump patch uv version bump --patch uv version bump --help uv version patch -uv version --bump patch git commit -m 'fixed pyproject' git clone git@github.com:sorcware/repo-template.git cd repo-template git commit -m 'fixed uv lock file' sudo rm -r repo-template -cd blog git commit -m 'removed self host runner' sudo hostnamectl set-hostname framework sudo systemctl restart NetworkManager @@ -508,14 +493,12 @@ ping 192.168.0.100 ssh newplex -v traceroute 192.168.0.100 ping 192.168.0.28 -nvim .ssh/config ssh -vvv newplex cat .ssh/id_rsa.pub ssh newplex -vvv ssh plex -v scp plex:plex_backup_20250928 /mnt/bulk/plex_backups scp plex:plex_backup_20250928.tar.gz /mnt/bulk/plex_backups -code scp plex:backup_plex.sh ~/source code backup_plex.sh scp ~/source/backup_plex.sh plex:backup_plex.sh @@ -547,7 +530,6 @@ git config --global git config cd .gitconfig nvim .gitconfig -ls -la .ssh gpg gpg --version ls -la .gnupg @@ -576,11 +558,8 @@ cd source/flutter_intro/intro_app flutter build linux cd .ssh cat id_rsa.pub -ssh server -ssh plex rm plex_wins.tar.gz rm -r flutter_intro -cd dotfiles cd set_up_dev cp bazecore_grab.sh lmstudio_grab.sh code lmstudio_grab.sh @@ -615,7 +594,6 @@ uv run bank_holiday_app.py git clone git@github.com:DBCltd/trAIner.git git checkout -b JPs_minor_tweaks git switch JPs_minor_tweaks -uv init uv add -r requirements.txt uv run app/main.py mkdir -p uploads/images uploads/videos @@ -717,7 +695,6 @@ cd /etc/yum.repos.d sudo rm -rf mongodb-org.repo sudo dnf remove postgresql sudo dnf clean -dnf -h sudo dnf clean all\ sudo dnf makecache sudo semanage fcontext -a -t bin_t '/mnt/bulk/source/trAIner/backend/pyproject.toml' @@ -727,10 +704,7 @@ ls -Z /mnt/bulk/source/trAIner/backend/pyproject.toml ping http://localhost:8000 ping localhost:5432 sudo docker ps -sudo setenforce 0 -sudo setenforce 1 sudo getenforce -whoami whereami whyami pwd @@ -749,7 +723,6 @@ git staus chmod -R 755 ./backend sudo chmod -R 755 ./backend ls -l ~ -ls -la ls -la ./backend sudo chown -R devin:devin ./backend/uploads ./backend/.venv semanage fcontext -a -t FILE_TYPE '/mnt/bulk/source/trAIner/backend/.venv' @@ -794,7 +767,6 @@ sudo groupadd docker sudo usermod -aG docker devin touch /.autorelabel sudo touch /.autorelabel -reboot sudo docker-compose down sudo docker image sudo docker image ls @@ -813,7 +785,6 @@ docker-compose logs trainer-backend rm my-main2.pp my-main2.te git commit -m 'removed random docker files' sudo rm -rf .venv -uv add ruff git commit -m 'ruff check --fix' tree -L 2 tree -L 3 @@ -822,8 +793,6 @@ docker-compose exec backend bash docker rmi trainer-backend docker image list docker-compose down -v -cd /mnt/bulk -cd source/ai_web ./run.sh code alex_sucks.sh sudo dnf install figlet -y @@ -844,7 +813,6 @@ cd ../jake-pullen.github.io cd . cd.. uv pyyaml -uv add pyyaml sudo ./setup.sh curl http://localhost:8000/health curl http://localhost:8000/api/v1/register @@ -863,11 +831,8 @@ whitch flutter ls -la ~ docker-compose ps ~ -cd source/devin ai_web lmstudio -cat dotfiles/zsh/.zshrc -nvim dotfiles/zsh/.zshrc ~/AppImages/LM-Studio.AppImage sudo fwupdmgr reboot-to-firmware-menu sudo fwupdmgr --help @@ -877,7 +842,6 @@ rocm-smi --showmeminfo rocm-smi -h rocm-smi --showhw rocm-smi --showmemuse -shutdown -r now nvim lm_studio_grab.sh chmod +x lm_studio_grab.sh ./lm_studio_grab.sh @@ -905,7 +869,6 @@ cd source/flutter_application_1 cd ../trAIner flutter cd ~/bin -cd / cd android-studio/bin ./studio.sh sudo kvm-ok @@ -914,21 +877,16 @@ cd conjure echo "hello Marco" uv -v uv --version -cd ~/source run main.py cd ~/source/cunj cd ~/source/conjure cat hack_plan.md git checkout -b dev git switch -git switch main git switch dev -git merge main uv remove dspy FASTFETCH cd fireball/ -tree -python uv run ruff chek git clone git@github.com:sorcware/frostbolt.git cd frostbolt @@ -955,25 +913,18 @@ fzf -e 'Jake_is_amazing' cd unity3d cd .var cd app/ -cd ~/source/devin cd ../conjure cd /mnt/bulk/SteamLibrary/steamapps/compatdata/2060160/pfx/drive_c/users/steamuser/AppData/LocalLow/TheFarmerWasReplaced/TheFarmerWasReplaced ln -s "$(pwd)" ~/source/$(basename "$(pwd)") cd ~/source/TheFarmerWasReplaced -git init -cd source/TheFarmerWasReplaced cd Saves/theFarm git history ping 8.8.8.8 -btop killall open-webui killall lm-studio history code .zsh_history -cd .config -ls -l git switch feature/alex_end_to_end -git pull uv run multi uv run multi.py cd source/earthshock/src/multi.py @@ -982,16 +933,9 @@ cat multi.py git checkout -b JPs_rendition git commit . cd trAIner -nvim . cat earthshock.py -cd source/earthshock/src -lms ps -lms cat app.log -uv run earthshock.py -shutdown sudo dnf update -y -cd source/trAIner uv run pytest tests/ git commit -m 'set cicd to run on this branch' uv run python -c "import secrets; print(secrets.token_urlsafe(32))" @@ -1003,83 +947,816 @@ ld -la pip list | grep httpx uv add fastapi.test_client uv tree | grep fastapi -uv tree uv run tests/conftest.py cd tests uv run conftest.py cd ../. uv run backend/tests/conftest.py -uv run ruff check --fix -uv run ruff check cd ../frontend flutter pub get cd backend uv run pytest tests/ -v --cov=app --cov-report=xml -git status -git log -uv run pytest uv sync --locked -git add . -git commit -git push -cd ~ -fastfetch -wake_up cd sour -cd source uv init merlin cd ../earthshock cp -r earthshock/src merlin/ -ls -la -cd src cd devin -ls cat config.py cp devin/config.py merlin/src -cd source/earthshock -code . uv add dspy rich ruff requests requests-cache openmeteo-requests urllib3 retry-requests uv lock --python 3.14 -uv lock -U -uv sync -clear uv run main cp earthshock/src/config.py merlin/src/config.py -cd merlin bye -cd source/merlin -uv run main.py -cd .. cat devin/tools.py cat devin/.env +shutdown -r +sudo flatpak update +nvim dotfiles/zsh/.zshrc +sudo flatpak update -y +flatpak -h +dnf -h +dnf clean +clean --help +dnf clean --help +dnf clean cache_types all +dnf clean all +dnf needs_restarting +sudo dnf needs_restarting +sudo dnf needs-restarting +flatpak --help +chmod +x updater.sh +./updater.sh +uv init song_finder +cd song_finder +cd source/JPs_make_work_easier_area +rm -rf song_finder +SHUTDOWN +ls /mnt +mkdir /mnt/nas +sudo mkdir /mnt/nas +mount -t nfs 192.168.0.146/share/Plex /mnt/nas +sudo mount -t nfs 192.168.0.146/share/Plex /mnt/nas +sudo mount -t nfs 192.168.0.146:/share/Plex /mnt/nas +tree Plex +sudo mkdir /mnt/bulk/plex_archive +cp -r Plex/tv_shows/Supernatural /mnt/bulk/plex_archive +sudo cp -r Plex/tv_shows/Supernatural /mnt/bulk/plex_archive +sudo ./dotfiles/set_up_dev/lm_studio_grab.sh +cd source/ai_web +./update.sh +nvim ./dotfiles/set_up_dev/lm_studio_grab.sh +./dotfiles/set_up_dev/lm_studio_grab.sh +Filelight . +ls -la / +vd / +ls .. +rsync -v +sudo rm -rf Plex/tv_shows/Supernatural +ls -la nas +ssh-copy-id admin@192.168.0.146 +rsync -rvh --progress /mnt/nas/Plex/tv_shows/Criminal\ Minds /mnt/bulk/plex_archive +sudo rsync -rvh --progress /mnt/nas/Plex/tv_shows/Criminal\ Minds /mnt/bulk/plex_archive +cd tv_shows +ssh admin@ShowcaseNAS +./AppImages/Bazecor-1.7.0-x64.AppImage +ls -l /mnt/nas +rm -rf android-studio +rm -rf Android +rm -rf flutter +rm -rf .android +rm -rf .dartServer +rm -rf .dart-tool +rm -rf .flutter +rm -rf .flutter-devtools +rm -rf flutter Cursor +ld Unknown\ Organization +ls Unknown\ Organization +sudo nvim dotfiles +code Downloads/chat-export-1760981569553.json +ssh admin@192.168.0.146 +nvim .ssh/config +ssh server +fastfetch +cd source/trAIner +code backend +code frontend +cd source/earthshock +git switch JPs_rendition +uv run main.py +rm -rf merlin +cd .config +cd git +cd /mnt +lsblk +fdisk -l +sudo fdisk -l +ls -la /dev/sd* +ls -la .gpg +gpg --list-keys +gpg --export --armor keyboxd > public_key.asc +gpg --export --armor 6CB1583D37A36BCD2242AF0E5CBC649FBEF851A6 > public_key.asc +gpg --export-secret-keys --armor 6CB1583D37A36BCD2242AF0E5CBC649FBEF851A6 > private_key.asc +rm private_key.asc +rm public_key.asc +cd Documents +cd ~/source/earthshock/src +lms ps +LMS +cd source/earthshock/src +uv run earthshock.py +cp earthshock merlin +cp -r earthshock merlin +ls -la .git +ls -la .github +rm -rf .ruff_cache +rm app.log +rm -rf __pycache__ +rm reference.py +mv earthshock.py merlin.py +uvx --from rich -- python3 -m rich.emoji +uv add emoji +uv remove emoji +cd source/merlin/src && uv run merlin.py +cd source/merlin/src & uv run merlin.py +(cd ~source/merlin/src && uv run merlin.py) && cd ~ +(cd ~/source/merlin/src && uv run merlin.py) && cd ~ +cod e. +cd source/trAIner/backend +uv run pytest +uv run pytest -v +cp -r trAIner trAIner_VC +cd trAIner_VC +rm -r .git +rm -rf .git +git init . +git remote add origin git@github.com:DBCltd/trAIner_VC.git +cd /mnt/bulk +cd plex_archive +filelight . +rm -rf Supernatural +sudo rm -rf Supernatural +sudo rm -rf plex_archive +ls .Trash-1000 +dolphin .Trash-1000 +sudo rm -rf .Trash-1000 +ls plex_backups +ls -la .ssh +code .ssh +git statud +git add src/merlin.py +git checkout -b lights +uv add python-dotenv +ping 8.8.8.8 -c 3 +cd source/merlin/temp_devin +cat ~/source/devin/config.py +nvim ~/source/devin/ +uv run dev_sync_lights.py +cat ~/dotfiles/set_up_dev/fedora.sh +git log +updatepls +git pull git@github.com:danielmiessler/Fabric.git +git clone git@github.com:danielmiessler/Fabric.git +dnf copr enable lihaohong/yazi\ +dnf install yazi +sudo dnf copr enable lihaohong/yazi\ +sudo dnf install yazi +yazo +yazi +cd temp_devin +uv run update_hue_config.py +cd source/devin +Hey, can you turn on the office lights (its a room) +cd hue_playground +uv run test.py +cd ../merlin +uv run merlin.py +git diff main --no-page +git remote add origin git@github.com:sorcware/merlin.git +git push -u origin main +uv lock bump feature +uv lock --bump feature +uv +uv version -bump feature +uv version --bump feature +rm src/test.py +git checkout -b memory +cd source/TheFarmerWasReplaced +cat src/memory.yaml +uv version --bump minor +cp src/config/user_config_template.py src/config/user_config.py +git switch chore/refactor_project +git switch lights +git add README.md +uv add pyproject.toml +uv synce +git add src/main.py +uv run riff format +git swtich memory +git switch memory +rm uv.lock +git add pyproject.toml +git add uv.lock +git add src/experts/memory.py +cd ~/source/devin +shutdown +code source/merlin +nvim dotfiles/zsh/ +git -h +git restore +git restore -h +git restore -w +git restore -W +git reset +cat src/config/config.yaml +nvim ~/dotfiles/zsh/ +lms +git checkout -b jp_small_fixes +uv lock -U +uv run ruff check +uv version --bump patch +git checkout -b justfile_play +uv add just +uv run just patch +uv add python-dateutil +uv run just workflow +uvx run just workflow +uv just workflow +uv just --help +uv run just --help +uv remove just +uvx just --help +uvx install dateutil +uvx install python-dateutil +uv tool remove just +uv tool uninstall just +uv tool install just +just --hlp +uv pip install python-dateutil +sudo dnf install just +just --help +just workflow +git fetch origin +just -l +just update_from_main +git commit -m 'justfile tidy' +just pr_prep_major +uv version 1.2.2 +uv build +cat dotfiles/zsh/.zshrc +cat ~/dotfiles/updater.sh +code dotfiles/updater.sh +git switch justfile_play +git switch jp_small_fixes +git branch +git branch --merged | grep -v "\*\|master\|main" | xargs -n 1 git branch -d +git branch -la +git branch -r +git branch -rv +cat .ssh/config +sudo mkdir git_backups +cd /mnt/ +mkdir -p git_backups +cat /etc/fstab +ls -ld /mnt/nas/ +touch /mnt/nas/Jake/testfile.txt +sudo umount /mnt/nas +kill 164950 +lsof +D /mnt/nas +touch /mnt/nas/testfile.txt +cd Plex +touch testfile.txt +ls -lav +setenforce=0 +setenforce=1 +sudo setenforce 0 +sudo touch testing.txt +sudo umount /mnt/nas\ +sudo mount -t nfs -o rw,hard,intr 192.168.0.146:/share/Plex /mnt/nas +touch testing.txt +sudo mkdir -p /tmp/nas_test\ +sudo mount -t nfs -o rw,hard,intr 192.168.0.146:/share/Plex /tmp/nas_test\ +touch /tmp/nas_test/test.txt +umount /tmp/nas_test +sudo umount /tmp/nas_test +dmesg | grep -i nfs +touch nas/test.txt +sudo dmesg | grep -i nfs +journalctl -u rpc-statd +journalctl -u nfs-client.target +ssh nas +cd nas +touch test.txt +cd ... +mount | grep nas +findmnt -n -o SOURCE,TARGET,FSTYPE,OPTIONS /mnt/nas +stat /mnt/nas +sudo setenforce 0\ +touch /mnt/nas/test.txt +sudo setenforce 1 +sudo umount /mnt/nas\ +sudo mount -t nfs -v -o rw,hard,intr,async,acdirmax=0,acdirmin=0 192.168.0.146:/share/NFSv=4/Jake/ /mnt/nas +ls nas +ssh plex +cd plex_wins +cat set_up_plex_server.sh +sudo dnf install cifs-utils +sudo mount -t cifs //192.168.0.146/Jake /mnt/nas -o username=admin,password=Jake1403,uid=1000,gid=1000,iocharset=utf8,cache=none,vers=3.0 +sudo mount -t cifs //192.168.0.146/Jake /mnt/nas -o username=admin,password=Jake1403 +sudo nvim /etc/fstab +sudo systemctl daemon-reload\ +sudo umount /mnt/nas\ +sudo mount /mnt/nas +cd /mnt/nas +mkdir git_backups +cat ~/.justfile +just backup +chmod +x git_backup.sh +ls -la /mnt/nas/Jake/git_backups +ls -la /mnt/nas/Jake/git_backups/20251028_140054 +ls -la /mnt/nas/Jake/git_backups/20251028_140054/verity +cd /mnt/bulk/source +rm -rf trAIner_VC +cd TheFarmerWasReplaced +git init +touch .gitignore +nvim .gitignore +cd /mnt/nas/Jake/git_backups/20251028_14 +cd /mnt/nas/Jake/git_backups/ +cd 20251028_141803 +cd /mnt/nas/Jake/git_backups/20251028_142103 +cd mau +./git_backup.sh +cd 20251028_1426 +cd ../data_pipeline_for_YNAB +cd ../ +rm -r . +rm -r * +cd 20251028_1433 +cd ~/source/ai_web +cd ../agentic_test +rm -rf agentic_test +cd ai_web +cd /mnt/nas/Jake/git_backups/20251028_1433/ai_web +tar backup.tar +tar --help +tar -xf backup.tar +rm -rf * +rm -r 20251028_1433 +rm -r 20251028_144651 +nvim ~/git_backup.sh +~/git_backup.sh +cd 20251028 +tar -xvf backup.tar +cd src +cd blog +rm book.toml +rm -rf src +nvim git_backup.sh +sudo mv git_backup.sh /usr/local/bin/git_backup.sh\ +sudo chmod +x /usr/local/bin/git_backup.sh +cat /usr/local/bin/git_backup.sh +sudo crontab -e +systemctl status crond +crontab -l +# Watch for new backups being created\ +watch -n 1 "ls -la /mnt/nas/Jake/git_backups/" +watch -n 1 "ls -la /mnt/nas/Jake/git_backups/" +reboot +cd /mnt/nas/Jake/git_backups +cd 20251029 +ls -l bin +cd /mnt/nas/Jake +ln -s "$(pwd)" ~/$(basename "$(pwd)") +cd Supporting +rm -r Supporting +cd backup\ pre\ system\ change +mv Address\ Book.md ../address_book.md +rm -r backup\ pre\ system\ change +cat beauty.png +rm Cyberpunk_Theme.vsix +cd Installers +rm -r Installers +rm linux_test_openvpn.zip +cd OneDrive_1_27-03-2025 +mv OneDrive_1_27-03-2025 Portraits/ +cd Portraits +unzip ParentTrap.zip +rm -rf ParentTrap +rm -rf ParentTrap.sln +rm -r PT_Master +cd repos +rm -r advent_of_code +rm -rf advent_of_code +rm -rf dotfiles +rm -rf JPs_make_work_easier_area +cd temp +rm -rf temp +cp -r * ~/source +ls -l ~/source +ls -la ~/source +ls -la /mnt/bulk/source +cd ~/source +cat azure-pipelines.yml +rm azure-pipelines.yml +ls -la repos +rm -rf repos +cat ubuntu.txt +rm ventoy-1.0.94-windows.zip +rm Zovu.jpg +cd Shapez +rm -rf Shapez +cd Temp +rm -r Temp +rm ubuntu.txt +rm .gitignore +cat .gitattributes +rm .gitattributes +cd H +cd .factorio +nvim player-data.json +days-to-bh +LS +mkdir met_office +unzip OneDrive_1_31-10-2025.zip +ls -la OneDrive_1_31-10-2025.zip +unzip -v OneDrive_1_31-10-2025.zip +rm OneDrive_1_31-10-2025.zip +cd source/met_office +tar -xzf BRICSC.tar.gz ./dat_files/BRICSC/ +mkdir ./dat_files/BRICSC +tar -xzf BRICSC.tar.gz -C ./dat_files/BRICSC/ +ls -la dat_files/BRICSC +rm -r dat_files/BRICSC +tar -xzf BRICSC.tar.gz -C ./dat_files/ +ls -la dat_files/ +tar -xzf WINTSC.tar.gz -C ./dat_files/ +cd dat_files +mv Dat\ files\ BRICSC\ non\ standard\ names/ BRISCS/ +mv dat\ files\ WINTSC\ standard\ names/ WINTSC/ +ls WINTSC +ls -la WINTSC +cd WINTSC +cd BRISCS +rm *.Identifier +rm metoffice-c-band-rain-radar_uk_202408241330_1km-composite.dat +mkdir asc_files +uv run nimrod_3.py -bbox 607000 608000 217000 218000 -qx ./dat_files/BRISCS/202409291105_nimrod_ng_radar_rainrate_composite_1km_UK ./asc_files +uv run nimrod_3.py -bbox 607000 608000 217000 218000 -qx ./dat_files/BRISCS/202409291105_nimrod_ng_radar_rainrate_composite_1km_UK ./asc_files/202409291105.asc +uv add ruff +uv add pyyaml +cd ~/Jake +cd git_backups +cd 20251101 +cp address_book.md ~/source/merlin/src/config +git fetch +git checkout -b bugfix/lights +uv run unittest +rm -r tests +just --list +just pr_prep_patch +git checkout -b feature/file_expert +got commit +git switch bugfix/lights +cd / +cd /home +python +git commit +git merge main +uv self update +nvim .justfile +just update-uv +rm -rf .pub-cache +find /home/devin -name model_factory.py +find /home/devin -name model_factory.py -v +find -v /home/devin -name model_factory.py +find --help +find ~ -type f -iname "model_factory.py" +find ~ -type f -iname "model_factory" +find -L ~ -name "model_factory.py" +find /mnt/bulk/ -name "model_factory.py" -not -type l +find /mnt/bulk/ -name "model_factory.py" -not -type l -not -path */.* +find /mnt/bulk/ -name "model_factory.py" -not -type l -not -path "*/.*" +cd dotfiles +whoami +ls -la +ls -la Desktop +ls -la Desktop/.directory +ls -la /usr/share/applications/ +ls -la ~/.local/share/applications/ +cat /usr/share/applications/steam.desktop +exec /usr/bin/steam %U +ls -la dotfiles +cd /mnt/bulk/SteamLibrary/steamapps/compatdata/1551360/pfx/drive_c/users/steamuser/AppData/Local/ForzaHorizon5/webview2/EBWebView/Default/ +cd Jake +cd .local/share/applications +rm Auto\ Rogue.desktop +rm Balatro.desktop +rm dev.zed.Zed.desktop +cat Factorio.desktop +rm Factorio.desktop +cd applications +touch Merlin.desktop +cd /usr/share/applications +code ~/.local/share/applications +ls -la ~/Jake/git_backups +mkdir ~/AppImages/merlin +cp dist/merlin-1.3.0-py3-none-any.whl ~/AppImages/merlin +cd ~/AppImages/merlin +uv publish +uv publish --help +rm -f .git .gitignore main.py pyproject.toml .python-version README.md +rm -rf .git .gitignore main.py pyproject.toml .python-version README.md +uv venv prod-merlin +uv venv +rm -rf .venv +source prod-merlin/bin/activate +uv python 3.14 +uv python -v 3.14 +uv python -h +uv python install 3.14 +uv pip install merlin-1.3.0-py3-none-any.whl +source +rm -rf prod-merlin +uv pip install AppImages/merlin/merlin-1.3.0-py3-none-any.whl +uv pip install AppImages/merlin/merlin-1.3.0-py3-none-any.whl --system +sudo uv pip install AppImages/merlin/merlin-1.3.0-py3-none-any.whl --system +pip install AppImages/merlin/merlin-1.3.0-py3-none-any.whl +python -v +python --version +cd AppImages/merlin +uv venv test-env +source test-env/bin/activate +pip install dspy +cd AP +cd AppImages +mv merlin test_merlin +cd test_merlin +uv init +uv add merlin-1.3.0-py3-none-any.whl +uv run merlin-1.3.0-py3-none-any.whl +uv tree +uv run .venv/bin/merlin +rm -rm test_merlin +rm -rf test_merlin +uv python install +uv python install cpython-3.14.0+freethreaded-linux-x86_64-gnu +git reset --hard +git clone git@github.com:sorcware/merlin.git prod_merlin +cd prod_merlin +uv run merlin +git checkout -b feature/git_expert +cd Jake/git_backups/20251102 +cd /usr/share +crontab -e +cd ../local/bin +cat git_backup.sh +cd source +cd met_office +uv run batch_nimrod.py +uv sync +code +ruff format +git rev-parse HEAD +git HEAD +git --abbrev-ref HEAD +git rev-parse --abbrev-ref HEAD +git rev-parse --help +git log -10 --oneline +git remote -v +cd kind_api +git rev-parse --git-dir +tree +tree -a +uv run ruff format +uv run ruff check --fix +git diff main +git diff main > ~/source/diff.txt +cat ~/source/diff.txt +shutdown -r now +uv python list +uv python uninstall 3.14t +nvim source/merlin +code . +git switch main +git pull +git checkout -b prompt_tweak +git merge feature/file_expert +git merge feature/git_expert +just pr_prep_minor +cd ~Ap +cd ~/AppImages +rm -rf prod_merlin +cd ~/source/merlin +rm diff.txt +rm -rf flutter_application_1 +ls -la TOBBY + git branch -l +git switch feature/git_expert +git add . +git commit +git switch - +git merge - +git status +git push +cd Jake/git_backups +cd 20251104 +ls -l +cd merlin +wake_up +cd ~ +sudo dnf install noto-fonts-color-emoji +sudo dnf install google-noto-color-emoji-fonts +nvim ~/.config/alacritty +cd ~/.config/alacritty +cat yaml_to_toml_conversion_guide.md +cd .. +nvim . +alacritty --print-config +alacritty --help +fc-match -f "%{family}\n" :default +fc-match -f "%{family}\n" :emoji +fc-list :lang=emoji +fc-list | grep -i emoji +nvim alacritty/alacritty.toml +btop +just update +clear +cd source/merlin +ls +ls -la +cat .justfile +merlin logout -: 1760542273:0;btop -: 1760542349:0;shutdown -r -: 1760546316:0;nvim dotfiles/zsh/.zshrc -: 1760546349:0;updatepls -: 1760546391:0;flatpak -h -: 1760546405:0;sudo flatpak update -: 1760546429:0;nvim dotfiles/zsh/.zshrc -: 1760546457:0;cd dotfiles -: 1760546460:0;git add . -: 1760546462:0;git commit -: 1760546504:0;git push -: 1760546516:0;sudo flatpak update -y -: 1760546524:0;updatepls -: 1760546541:0;nvim . -: 1760546642:0;flatpak -h -: 1760546658:0;dnf -h -: 1760546722:0;dnf clean -: 1760546731:0;clean --help -: 1760546736:0;dnf clean --help -: 1760546754:0;dnf clean cache_types all -: 1760546764:0;dnf clean all -: 1760546788:0;dnf needs_restarting -: 1760546807:0;sudo dnf needs_restarting -: 1760546819:0;sudo dnf needs-restarting -: 1760546914:0;flatpak --help -: 1760546961:0;chmod +x updater.sh -: 1760546966:0;./updater.sh -: 1760547002:0;nvim . -: 1760547043:0;updatepls -: 1760547151:0;git add . +: 1762274292:0;code .config/alacritty/alacritty.toml +: 1762275268:0;curl -sS https://starship.rs/install.sh | sh +: 1762275308:0;nvim dotfiles/zsh/.zshrc +: 1762275330:0;cd source/merlin +: 1762275346:0;fastfetch +: 1762275530:0;cd ~ +: 1762275531:0;ls +: 1762275535:0;ls -la +: 1762279958:0;code .config/starship.toml +: 1762280048:0;starship preset nerd-font-symbols -o ~/.config/starship.toml +: 1762280062:0;code .config/ +: 1762280260:0;sudo dnf search firacode-nerd-font +: 1762280267:0;sudo dnf search firacode +: 1762280275:0;sudo dnf search nerd-font +: 1762280278:0;sudo dnf search nerdfont +: 1762280281:0;sudo dnf search nerd +: 1762280317:0;sudo dnf search fonts +: 1762280329:0;sudo dnf search fonts | grep nerd +: 1762280340:0;sudo dnf search font | grep nerd +: 1762280407:0;code dotfiles/set_up_dev +: 1762280588:0;sudo dnf install fira-code-fonts +: 1762280680:0;code .config/starship.toml +: 1762280688:0;fc-list | grep -i fira +: 1762280725:0;echo "Test:    " > test.txt\ +cat test.txt +: 1762280779:0;sudo dnf install liberation-fonts google-noto-fonts +: 1762280799:0;echo " " +: 1762280808:0;fc-list | grep -i "emoji\|noto" +: 1762280905:0;sudo dnf install kitty +: 1762280914:0;ls +: 1762280921:0;echo " " +: 1762280925:0;echo "Test:    " > test.txt\ +cat test.txt +: 1762280931:0;melin +: 1762280935:0;merlin +: 1762281001:0;code .config/starship.toml +: 1762281015:0;cat .config/starship.toml +: 1762281080:0;cd source +: 1762281083:0;cd merlin +: 1762281102:0;git status +: 1762281111:0;git log -10 +: 1762281134:0;cat .config/starship.toml +: 1762281142:0;cat ~/.config/starship.toml +: 1762281220:0;locale +: 1762281312:0;cd ~ +: 1762281320:0;starship preset catppuccin-powerline -o ~/.config/starship.toml +: 1762281322:0;ls +: 1762281327:0;cd source +: 1762281338:0;cd merlin +: 1762281424:0;code ~/.config/starship.toml +: 1762281658:0;fc-list | grep -i fira +: 1762281813:0;code ~/.config/starship.toml +: 1762281835:0;nvim ~/.config/starship.toml +: 1762281893:0;ls +: 1762281942:0;nvim ~/.config/starship.toml +: 1762281966:0;ls +: 1762281976:0;cd source/merlin +: 1762282486:0;sudo dnf install fontawesome-fonts +: 1762282509:0;sudo dnf search fontawesom +: 1762282543:0;sudo dnf install fontawesome-fonts-all +: 1762282562:0;cd source/merlin +: 1762282576:0;nvim ~/.config/starship.toml +: 1762282620:0;starship preset catppuccin-powerline -o ~/.config/starship.toml +: 1762282650:0;ls +: 1762282654:0;ls -la +: 1762282684:0;echo "" +: 1762282782:0;cd source/merlin +: 1762282927:0;git status +: 1762283453:0;cd source/merlin +: 1762283461:0;reboot +: 1762283541:0;cd source/merlin +: 1762283550:0;just update +: 1762283970:0;kitty -v +: 1762283987:0;wake_up +: 1762284071:0;kitty +kitten info +: 1762284121:0;# Simple test\ +echo ""\ +echo ""\ +echo "︃︃" +: 1762284132:0;\ +echo ""\ +echo ""\ +echo "︃︃" +: 1762284164:0;\ +locale -a | grep -i utf +: 1762284172:0;clear +: 1762284197:0;cd source/merlin +: 1762284235:0;code ~/.config/kitty +: 1762284313:0;localip +: 1762284338:0;code ~/.config/ +: 1762284378:0;nvim . +: 1762284502:0;sudo +: 1762284511:0;sudo ls -la +: 1762284520:0;ls -la +: 1762284523:0;kitty restart +: 1762284538:0;sudo ls +: 1762284544:0;la +: 1762284556:0;ls -la +: 1762284558:0;ll +: 1762284559:0;l +: 1762284561:0;ls +: 1762284563:0;la +: 1762284634:0;ls +: 1762284637:0;lsla +: 1762284657:0;ls +: 1762284696:0;nvim ~/.config/starship.toml +: 1762284830:0;ls +: 1762285039:0;cd source/merlin +: 1762285063:0;ls +: 1762285263:0;sudo ls +: 1762285269:0;ls +: 1762285342:0;clear +: 1762285343:0;ls +: 1762285438:0;cd .. +: 1762285446:0;cd merlin +: 1762285456:0;ls +: 1762285461:0;cd .. +: 1762285472:0;cd days_to_bh +: 1762285485:0;cd .. +: 1762285492:0;cd rust_days_to_bh +: 1762285505:0;rustup +: 1762285524:0;rustup update +: 1762285543:0;cd .. +: 1762285553:0;nvim .justfile +: 1762285649:0;just update +: 1762285672:0;cd source/rust_days_to_bh +: 1762285775:0;ls +: 1762285887:0;cd ../merlin +: 1762286001:0;ls +: 1762286256:0;cd ../rust_days_to_bh +: 1762286265:0;cd ../merlin +: 1762286322:0;cd ~ +: 1762286327:0;kitty +runpy 'from kitty.config import *; print(commented_out_default_config())' +: 1762286379:0;kitty +runpy 'from kitty.config import *; print(commented_out_default_config())' > ~/.config/kitty/kitty.conf +: 1762286392:0;clear +: 1762286407:0;cd source +: 1762286411:0;cd merlin +: 1762286764:0;cd source/merlin +: 1762286839:0;ls +: 1762286845:0;cd source/merlin/q +: 1762286847:0;cd source/merlin/ +: 1762286883:0;ls +: 1762286889:0;cd source/merlin/q +: 1762286891:0;cd source/merlin/ +: 1762286968:0;cd source/merlin +: 1762286968:0;ls +: 1762287004:0;merlin +: 1762287625:0;cd dotfiles +: 1762287626:0;ls +: 1762287632:0;cat todo.txt +: 1762288118:0;cd source/merlin +: 1762288119:0;code . +: 1762288455:0;cd ~ +: 1762288594:0;code .config +: 1762288763:0;rm todo.txt +: 1762288764:0;ls +: 1762288785:0;git status +: 1762288795:0;rm alacritty/yaml_to_toml_conversion_guide.md +: 1762288824:0;cd source/merlin +: 1762288827:0;code . +: 1762288857:0;merlin +: 1762288881:0;git status +: 1762289227:0;cp ~/.config/starship.toml ~/dotfiles/starship.toml +: 1762289261:0;cp ~/.config/kitty/kitty.conf ~/dotfiles/kitty/kitty.conf +: 1762289276:0;mkdir ~/dotfiles/kitty +: 1762289278:0;cp ~/.config/kitty/kitty.conf ~/dotfiles/kitty/kitty.conf +: 1762289280:0;ls +: 1762289298:0;code ~/dotfiles +: 1762289323:0;cd ~/dotfiles +: 1762289325:0;ls +: 1762289327:0;git add . diff --git a/zsh/.zshrc b/zsh/.zshrc index 68d4db1..bc86bde 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -33,5 +33,8 @@ alias la='ls -la' alias wake_up='cd source/ai_web && ./run.sh & ~/AppImages/LM-Studio.AppImage &' alias updatepls='~/dotfiles/updater.sh' +alias mklink='ln -s "$(pwd)" ~/$(basename "$(pwd)")' +alias merlin='(cd ~/source/merlin && uv run merlin) && cd ~' +eval "$(starship init zsh)" fastfetch