Merge branch 'master' of github.com:Maxattax97/miscellaneous

Maxattax97 · Sep 29, 2024 · 7c43c8d · 7c43c8d
2 parents fbbacd2 + ee09b91
commit 7c43c8d
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 6 deletions.
diff --git a/.tmuxp/leviathan.yaml b/.tmuxp/leviathan.yaml
@@ -4,12 +4,45 @@ windows:
   - window_name: SYS
     environment:
       DISABLE_AUTO_TITLE: "true"
-    # focus: true
     options:
       allow-rename: false
       automatic-rename: false
     panes:
-      - shell_command: sudo top
+      - shell_command: sudo btop
+        focus: true
+        environment:
+          DISABLE_AUTO_TITLE: "true"
+        options:
+          allow-rename: false
+          automatic-rename: false
+  - window_name: XMR / LLM
+    layout: main-vertical
+    environment:
+      DISABLE_AUTO_TITLE: "true"
+    options:
+      allow-rename: false
+      automatic-rename: false
+    panes:
+      - shell_command: ~/mine
+        focus: true
+        environment:
+          DISABLE_AUTO_TITLE: "true"
+        options:
+          allow-rename: false
+          automatic-rename: false
+      - shell_command: tail -f /var/log/ollama/ollama.log
+        environment:
+          DISABLE_AUTO_TITLE: "true"
+        options:
+          allow-rename: false
+          automatic-rename: false
+      - shell_command: tail -f /var/log/flamenco/flamenco.log
+        environment:
+          DISABLE_AUTO_TITLE: "true"
+        options:
+          allow-rename: false
+          automatic-rename: false
+      - shell_command: kernlog
         environment:
           DISABLE_AUTO_TITLE: "true"
         options:

diff --git a/.zshrc b/.zshrc
@@ -352,6 +352,12 @@ zshrc_setup_completion() {
         fi
     fi
 
+    if type docker > /dev/null 2>&1; then
+        if [ ! -s "${HOME}/.zsh_completions/_docker" ]; then
+            docker completion zsh > "${HOME}/.zsh_completions/_docker"
+        fi
+    fi
+
     #if type pipx > /dev/null 2>&1; then
         #if [ ! -s "${HOME}/.zsh_completions/_pipx" ]; then
             #register-python-argcomplete pipx > "${HOME}/.zsh_completions/_pipx"
@@ -1701,6 +1707,10 @@ zshrc_load_library() {
         local monitor="$(xrandr --listmonitors | awk '{ print $4}' | tail -n 1)"
         xrandr --output "${monitor}" --scale "${factor}x${factor}"
     }
+
+    public-ip() {
+        curl -s https://ipinfo.io
+    }
 }
 
 zshrc_set_aliases() {
@@ -1758,10 +1768,17 @@ zshrc_set_aliases() {
     alias please='sudo'
 
     # Docker commands
-    alias dcp='docker-compose -f /opt/docker-compose.yml '
-    alias dcpull='docker-compose -f /opt/docker-compose.yml pull --parallel'
-    alias dclogs='docker-compose -f /opt/docker-compose.yml logs -tf --tail="50" '
-    alias dtail='docker logs -tf --tail="50" "$@"'
+    ## Don't use the old version of compose, use the new, official one.
+    alias docker-compose="docker compose"
+    alias Dc='docker compose'
+    alias Dcrm='docker compose rm -sf'
+    alias Dcpl='docker compose pull --parallel'
+    alias Dcup='docker compose up -d'
+    alias Dcl='docker compose logs -tf --tail="50" '
+    alias Dce="docker compose exec"
+
+    alias Dr="docker run --rm -it"
+    alias Dtail='docker logs -tf --tail="50" "$@"'
 
     # Clipboard
     alias clip='xsel --clipboard --trim -i'
@@ -1826,6 +1843,7 @@ zshrc_set_aliases() {
     alias Eupgrade='sudo emerge --ask --tree --update --verbose --deep --newuse @world'
     alias Einstall='sudo emerge --ask --verbose --tree --noreplace'
     alias Eclean='sudo emerge --ask --depclean'
+    alias Esearch='emerge --search'
 }
 
 zshrc_set_default_programs() {