Fix a bunch of stuff. Add docker compose files to make server config repo obsolete

Update Configs
idek
2024-07-21 22:04:13 -05:00 · 2024-07-20 11:47:52 -05:00 · 2024-07-18 18:12:54 -05:00 · 2024-07-18 18:09:30 -05:00 · 2024-07-11 08:53:27 -05:00 · 2024-07-08 02:29:49 -05:00
55 changed files with 971 additions and 125 deletions
--- a/GPU/install.sh
+++ b/GPU/install.sh
@ -1,19 +0,0 @@
-# Install Utility for AMD GPUs if needed
-read -p "Would you like to install LACT, an AMD GPU Utility? (y/N) " amd_gpu
-if [ "$amd_gpu" == "y" ]; then
-  sudo dnf install -y $LACT_LINK
-  sudo systemctl enable --now lactd
-fi
-read -p "Would you like to install the proprietary NVIDIA Drivers? (y/N) " nvidia_gpu
-if [ "$nvidia_gpu" == "y" ]; then
-  sudo dnf install -y akmod-nvidia xorg-x11-drv-nvidia-cuda
-  echo -e "\nRemove the duplicate lines below from grub:"
-  echo -e "\t\"rd.driver.blacklist=nouveau,"
-  echo -e "\tmodprobe.blacklist=nouveau,"
-  echo -e "\tnvidia-drm.modeset=1\"\n"
-  echo -e "\n Save the file & close nvim to continue.\n"
-  kitty -1 -e bash -c "sudo nvim /etc/default/grub"
-  sudo grub2-mkconfig -o /etc/grub2-efi.cfg
-  sudo systemctl enable nvidia-hibernate.service nvidia-suspend.service \
-    nvidia-resume.service nvidia-powerd.service
-fi
--- a/bin/sunhat
+++ b/bin/sunhat
@ -3,7 +3,7 @@
 source $SUNHAT_PATH/bin/ascii.sh

 if [ $# -eq 0 ]; then
-	SUB=$(gum choose "theme" "font" "install" "update" --height 8 --header "" | tr '[:upper:]' '[:lower:]')
+	SUB=$(gum choose "theme" "font" "install" "update" "push" --height 8 --header "" | tr '[:upper:]' '[:lower:]')
 else
 	SUB=$1
 fi
--- a/bin/sunhat-push
+++ b/bin/sunhat-push
@ -0,0 +1,7 @@
+cd $SUNHAT_PATH
+git pull
+cp -r ~/Documents/Configs/. $SUNHAT_PATH/configs/dotfiles/
+git add -A
+git commit -m "Update Configs"
+git push
+cd -
--- a/configs/docker/compose_files/caddy/docker-compose.yml
+++ b/configs/docker/compose_files/caddy/docker-compose.yml
@ -0,0 +1,26 @@
+version: "3.7"
+services:
+  caddy:
+    image: caddy:latest
+    container_name: caddy
+    hostname: caddy
+    domainname: caddy.gib
+    networks: 
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.4
+    ports:
+      - "80:80"
+      - "443:443"
+      - "443:443/udp"
+    env_file:
+      - ../user_variables.env
+    volumes:
+      - ${VOLUME_DIR}/Caddy/Caddyfile:/etc/caddy/Caddyfile
+      - ${VOLUME_DIR}/Web:/srv
+      - ${VOLUME_DIR}/Caddy/Data:/data
+      - ${VOLUME_DIR}/Caddy/Config:/config
+    tty: true
+    restart: unless-stopped
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/custom_php/Dockerfile
+++ b/configs/docker/compose_files/custom_php/Dockerfile
@ -0,0 +1,2 @@
+FROM php:7.4-fpm
+RUN docker-php-ext-install pdo pdo_mysql mysqli
--- a/configs/docker/compose_files/custom_php/docker-compose.yml
+++ b/configs/docker/compose_files/custom_php/docker-compose.yml
@ -0,0 +1,20 @@
+version: '3'
+services:
+  php:
+    image: php:7.4-fpm
+    container_name: php_mysql
+    hostname: php_mysql.gib
+    domainname: php_mysql.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.26
+    env_file:
+      - ../user_variables.env
+    volumes:
+      - ${DAS_DIR}/Web:/var/www/html
+    tty: true
+    restart: unless-stopped
+
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/excalidraw/docker-compose.yml
+++ b/configs/docker/compose_files/excalidraw/docker-compose.yml
@ -0,0 +1,20 @@
+version: '3'
+services:
+  excalidraw:
+    image: excalidraw/excalidraw:latest
+    container_name: excalidraw
+    hostname: excalidraw.gib
+    domainname: draw.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.30
+    ports:
+      - 80:80
+    env_file:
+      - ../user_variables.env
+    tty: true
+    restart: unless-stopped
+
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/gitea/docker-compose.yml
+++ b/configs/docker/compose_files/gitea/docker-compose.yml
@ -0,0 +1,58 @@
+version: "2"
+services: 
+  gitea: 
+    image: gitea/gitea:latest
+    container_name: gitea
+    hostname: gitea.gib
+    domainname: git.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.10
+    ports:
+      - "2222:2222"
+      - "3000:3000"
+    env_file:
+      - ../user_variables.env
+    environment:
+      - USER_UID=${PUID}
+      - USER_GID=${PGID}
+      - GITEA__database__DB_TYPE=${GITEA_DB_TYPE}
+      - GITEA__database__HOST=${GITEA_DB_HOST}
+      - GITEA__database__NAME=${GITEA_DB_NAME} 
+      - GITEA__database__USER=${GITEA_DB_USER}
+      - GITEA__database__PASSWD=${GITEA_DB_PW}
+    links:
+      - postgres
+    depends_on:
+      - postgres
+    volumes: 
+      - ${VOLUME_DIR}/Gitea/Data:/data
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
+    tty: true
+    restart: unless-stopped
+
+  postgres:
+    image: postgres:latest
+    container_name: postgres
+    hostname: postgres.gib
+    domainname: pg.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.24
+    ports:
+      - "5432:5432"
+    env_file:
+      - ../user_variables.env
+    environment:
+      - POSTGRES_USER=${GITEA_DB_USER}
+      - POSTGRES_PASSWORD=${GITEA_DB_PW}
+      - POSTGRES_DB=${GITEA_DB_NAME}
+    volumes: 
+      - ${VOLUME_DIR}/Postgres/Data:/var/lib/postgresql/data
+      - /etc/localtime:/etc/localtime:ro
+      - /etc/timezone:/etc/timezone:ro
+
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/homeassistant/docker-compose.yml
+++ b/configs/docker/compose_files/homeassistant/docker-compose.yml
@ -0,0 +1,22 @@
+version: "3"
+services: 
+  homeassistant: 
+    image: homeassistant/home-assistant:latest
+    container_name: homeassistant
+    hostname: homeassistant
+    domainname: home.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.7
+    ports:
+      - "8123:8123"
+    env_file:
+      - ../user_variables.env
+    volumes: 
+      - ${VOLUME_DIR}/HomeAssistant/Config:/config
+      - /etc/localtime:/etc/localtime:ro
+    tty: true
+    restart: unless-stopped
+networks:
+  ${NETWORK_NAME}:
+    external: true  
--- a/configs/docker/compose_files/it_tools/docker-compose.yml
+++ b/configs/docker/compose_files/it_tools/docker-compose.yml
@ -0,0 +1,20 @@
+version: '3'
+services:
+  it_tools:
+    image: corentinth/it-tools:latest
+    container_name: it_tools
+    hostname: it_tools.gib
+    domainname: tools.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.31
+    ports:
+      - 80:80
+    env_file:
+      - ../user_variables.env
+    tty: true
+    restart: unless-stopped
+
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/mediaserver/docker-compose.yml
+++ b/configs/docker/compose_files/mediaserver/docker-compose.yml
@ -0,0 +1,273 @@
+version: '3.8'
+services:
+  plex:
+    image: plexinc/pms-docker:latest
+    container_name: plex
+    hostname: plex.gib
+    domainname: plex.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.13
+    ports:
+      - 32400:32400/tcp
+      - 3005:3005/tcp
+      - 8324:8324/tcp
+      - 32469:32469/tcp
+      - 1900:1900/udp
+      - 32410:32410/udp
+      - 32412:32412/udp
+      - 32413:32413/udp
+      - 32414:32414/udp
+    env_file:
+      - ../user_variables.env
+    environment:
+      - TZ=${TZ}
+      - PLEX_CLAIM=${PLEX_CLAIM}
+      - PLEX_UID=${PUID}
+      - PLEX_GID=${PGID}
+      - ADVERTISE_IP=${IP_PREFIX}.13
+      - NVIDIA_VISIBLE_DEVICES=all
+      - NVIDIA_DRIVER_CAPABILITIES=compute,video,utility
+    volumes:
+      - ${VOLUME_DIR}/Plex/Config:/config
+      - ${VOLUME_DIR}/Plex/Transcode:/transcode
+      #- /run:/run # You might need this with Fedora
+      - ${DAS_DIR}/Media/Movies:/data/movies
+      - ${DAS_DIR}/Media/TVShows:/data/tv
+      - ${DAS_DIR}/Media/Music:/data/music
+    devices:
+      - /dev/dri:/dev/dri
+    tty: true
+    restart: unless-stopped
+    runtime: nvidia
+
+  audiobookshelf:
+    image: ghcr.io/advplyr/audiobookshelf:latest
+    container_name: audiobookshelf
+    hostname: audiobookshelf.gib
+    domainname: audiobookshelf.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.14
+    ports:
+      - 80:80
+    env_file:
+      - ../user_variables.env
+    environment:
+      - TZ=${TZ}
+    volumes:
+      - ${VOLUME_DIR}/Audiobookshelf/Config:/config
+      - ${VOLUME_DIR}/Audiobookshelf/Metadata:/metadata
+      - ${DAS_DIR}/Media/Audiobooks:/audiobooks
+      - ${DAS_DIR}/Media/Podcasts:/podcasts
+    tty: true
+    restart: unless-stopped
+
+  sabnzbd:
+    image: binhex/arch-sabnzbdvpn:latest
+    container_name: sabnzbd
+    hostname: sabnzbd.gib
+    domainname: sabnzbd.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.15
+    ports:
+      - 8080:8080
+      - 8090:8090
+      - 8118:8118
+    env_file:
+      - ../user_variables.env
+    environment:
+      - VPN_ENABLED=yes
+      - VPN_USER=${VPN_USER}
+      - VPN_PASS=${VPN_PASS}
+      - VPN_PROV=${VPN_PROV}
+      - VPN_CLIENT=${VPN_CLIENT}
+      - STRICT_PORT_FORWARD=yes
+      - LAN_NETWORK=${SUBNET}
+      - PUID=${PUID}
+      - PGID=${PGID}
+    cap_add:
+      - NET_ADMIN
+    volumes:
+      - ${VOLUME_DIR}/Sabnzbd/Config:/config
+      - /etc/localtime:/etc/localtime:ro
+    tty: true
+    restart: unless-stopped
+
+  qbittorrentvpn:
+    image: binhex/arch-qbittorrentvpn:latest
+    container_name: qbittorrentvpn
+    hostname: qbittorrentvpn.gib
+    domainname: qbittorrent.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.16
+    ports:
+      - 6881:6881
+      - 6881:6881/udp
+      - ${QB_WEBUI_PORT}:${QB_WEBUI_PORT}
+      - 8118:8118
+    env_file:
+      - ../user_variables.env
+    environment:
+      - VPN_ENABLED=yes
+      - VPN_USER=${VPN_USER}
+      - VPN_PASS=${VPN_PASS}
+      - VPN_PROV=${VPN_PROV}
+      - VPN_CLIENT=${VPN_CLIENT}
+      - STRICT_PORT_FORWARD=yes
+      - WEBUI_PORT=${QB_WEBUI_PORT}
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - LAN_NETWORK=${SUBNET}
+      - ENABLE_PRIVOXY=yes
+      - ENABLE_STARTUP_SCRIPTS=no
+    cap_add:
+      - NET_ADMIN
+    volumes:
+      - ${VOLUME_DIR}/Qbittorrent/Config:/config
+      - /etc/localtime:/etc/localtime:ro
+    tty: true
+    restart: unless-stopped
+
+  overseer:
+    image: lscr.io/linuxserver/overseerr:latest
+    container_name: overseer
+    hostname: overseer.gib
+    domainname: overseer.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.17
+    ports:
+      5055:5055
+    env_file:
+      - ../user_variables.env
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+    volumes:
+      - ${VOLUME_DIR}/Overseerr/Config:/config
+    tty: true
+    restart: unless-stopped
+
+  prowlarr:
+    image: lscr.io/linuxserver/prowlarr:latest
+    container_name: prowlarr
+    hostname: prowlarr.gib
+    domainname: prowlarr.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.18
+    ports:
+      9696:9696
+    env_file:
+      - ../user_variables.env
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+    volumes:
+      - ${VOLUME_DIR}/Prowlarr/Config:/config
+    tty: true
+    restart: unless-stopped
+
+  lidarr:
+    image: ghcr.io/linuxserver/lidarr:latest
+    container_name: lidarr
+    hostname: lidarr.gib
+    domainname: lidarr.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.19
+    ports:
+      - 8686:8686
+    env_file:
+      - ../user_variables.env
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+    volumes:
+      - ${VOLUME_DIR}/Lidarr/Config:/config
+      - ${DAS_DIR}/Media/Music:/music
+      - ${VOLUME_DIR}/Sabnzbd/Config/Downloads:/downloads
+      - ${VOLUME_DIR}/Qbittorrent/Config/qBittorrent/downloads:/qb_downloads
+    tty: true
+    restart: unless-stopped
+
+  radarr:
+    image: ghcr.io/linuxserver/radarr:latest
+    container_name: radarr
+    hostname: radarr.gib
+    domainname: radarr.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.20
+    ports:
+      - 7878:7878
+    env_file:
+      - ../user_variables.env
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+    volumes:
+      - ${VOLUME_DIR}/Radarr/Config:/config
+      - ${DAS_DIR}/Media/Movies:/movies
+      - ${VOLUME_DIR}/Sabnzbd/Config/Downloads:/downloads
+      - ${VOLUME_DIR}/Qbittorrent/Config/qBittorrent/downloads:/qb_downloads
+    tty: true
+    restart: unless-stopped
+
+  sonarr:
+    image: ghcr.io/linuxserver/sonarr:latest
+    container_name: sonarr
+    hostname: sonarr.gib
+    domainname: sonarr.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.21
+    ports:
+      - 8989:8989
+    env_file:
+      - ../user_variables.env
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+    volumes:
+      - ${VOLUME_DIR}/Sonarr/Config:/config
+      - ${DAS_DIR}/Media/TVShows:/tv
+      - ${VOLUME_DIR}/Sabnzbd/Config/Downloads:/downloads
+      - ${VOLUME_DIR}/Qbittorrent/Config/qBittorrent/downloads:/qb_downloads
+    tty: true
+    restart: unless-stopped
+
+  bazarr:
+    image: lscr.io/linuxserver/bazarr:latest
+    container_name: bazarr
+    hostname: bazarr.gib
+    domainname: bazarr.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.22
+    ports:
+      - 6767:6767
+    env_file:
+      - ../user_variables.env
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+    volumes:
+      - ${VOLUME_DIR}/Bazarr/Config:/config
+      - ${DAS_DIR}/Media/Movies:/movies
+      - ${DAS_DIR}/Media/TVShows:/tv
+    tty: true
+    restart: unless-stopped
+
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/minecraft/docker-compose.yml
+++ b/configs/docker/compose_files/minecraft/docker-compose.yml
@ -0,0 +1,22 @@
+version: '3'
+services:
+  minecraft_server:
+    image: itzg/minecraft-server:latest
+    container_name: minecraft_server
+    hostname: minecraft_server.gib
+    domainname: mc.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.33
+    ports:
+      - 25565:25565
+    env_file:
+      - ../user_variables.env
+    volumes:
+      - ${VOLUME_DIR}/Minecraft_Server/Data:/data
+    tty: true
+    restart: unless-stopped
+
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/mysql/docker-compose.yml
+++ b/configs/docker/compose_files/mysql/docker-compose.yml
@ -0,0 +1,42 @@
+version: '3'
+services:
+  mysql:
+    image: mysql:latest
+    container_name: mysql
+    hostname: mysql.gib
+    domainname: mysql.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.25
+    ports:
+      - 3306:2206
+    env_file:
+      - ../user_variables.env
+    environment:
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+    volumes:
+      - ${VOLUME_DIR}/MySQL/Data:/var/lib/mysql
+    tty: true
+    restart: unless-stopped
+
+  adminer:
+    image: adminer:latest
+    container_name: adminer
+    hostname: adminer.gib
+    domainname: adminer.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.26
+    ports:
+      - 8080:8080
+    env_file:
+      - ../user_variables.env
+    tty: true
+    restart: unless-stopped
+
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/nextcloud_aio/docker-compose.yml
+++ b/configs/docker/compose_files/nextcloud_aio/docker-compose.yml
@ -0,0 +1,39 @@
+services:
+  nextcloud-aio-mastercontainer:
+    image: nextcloud/all-in-one:latest
+    init: true
+    restart: unless-stopped
+    tty: true
+    container_name: nextcloud-aio-mastercontainer
+    hostname: nextcloud-aio-mastercontainer
+    domainname: ncmaster.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.9
+    volumes:
+      - ${VOLUME_DIR}/NC_AIO/Master_Container:/mnt/docker-aio-config
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    ports:
+      - 8080:8080
+    env_file:
+      - ../user_variables.env
+    environment:
+      - APACHE_PORT=11000
+      - SKIP_DOMAIN_VALIDATION=true
+      - BORG_RETENTION_POLICY=--keep-within=7d --keep-weekly=4 --keep-monthly=2
+      - NEXTCLOUD_UPLOAD_LIMIT=${NC_UPLOAD_LIMIT}
+      - NEXTCLOUD_MAX_TIME=${NC_MAX_TIME}
+      - NEXTCLOUD_MEMORY_LIMIT=${NC_MEMORY_LIMIT}
+      # - COLLABORA_SECCOMP_DISABLED=true
+      - NEXTCLOUD_STARTUP_APPS=deck twofactor_totp tasks calendar contacts notes
+      - NEXTCLOUD_ENABLE_DRI_DEVICE=true
+      - NEXTCLOUD_ADDITIONAL_APKS=imagemagick
+      - NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS=imagick
+      - TALK_PORT=3478
+      # - NEXTCLOUD_MOUNT=/mnt/
+      - NEXTCLOUD_DATADIR=${NC_DATADIR}
+      # - APACHE_IP_BINDING=127.0.0.1
+    security_opt: ["label:disable"] # Need this line when using SELinux
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/node/Dockerfile
+++ b/configs/docker/compose_files/node/Dockerfile
@ -0,0 +1,2 @@
+FROM node:latest
+CMD ["node", "index.js"]
--- a/configs/docker/compose_files/node/image_hoster_node/docker-compose.yml
+++ b/configs/docker/compose_files/node/image_hoster_node/docker-compose.yml
@ -0,0 +1,22 @@
+version: '3'
+services:
+  image_hoster:
+    image: node_indexjs:latest
+    container_name: image_hoster
+    hostname: image_hoster.gib
+    domainname: img.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.28
+    ports:
+      - 3000:3000
+    env_file:
+      - ../../user_variables.env
+    volumes:
+      - ${DAS_DIR}/Web/image_hoster:/home/node/app
+    tty: true
+    restart: unless-stopped
+
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/node/techtracker/docker-compose.yml
+++ b/configs/docker/compose_files/node/techtracker/docker-compose.yml
@ -0,0 +1,22 @@
+version: '3'
+services:
+  techtracker:
+    image: node_indexjs:latest
+    container_name: techtracker
+    hostname: techtracker.gib
+    domainname: techtracker.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.27
+    ports:
+      - 3000:3000
+    env_file:
+      - ../../user_variables.env
+    volumes:
+      - ${DAS_DIR}/Web/techtracker:/home/node/app
+    tty: true
+    restart: unless-stopped
+
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/node_indexjs/Dockerfile
+++ b/configs/docker/compose_files/node_indexjs/Dockerfile
@ -0,0 +1,2 @@
+FROM node:latest
+CMD ["node", "index.js"]
--- a/configs/docker/compose_files/node_t3/Dockerfile
+++ b/configs/docker/compose_files/node_t3/Dockerfile
@ -0,0 +1,4 @@
+FROM node:latest
+WORKDIR /home/node/app
+RUN npm install -g pnpm
+CMD ["pnpm", "go"]
--- a/configs/docker/compose_files/openwebui/docker-compose.yml
+++ b/configs/docker/compose_files/openwebui/docker-compose.yml
@ -0,0 +1,28 @@
+version: '3.7'
+services:
+  openwebui:
+    image: ghcr.io/open-webui/open-webui:main
+    container_name: openwebui
+    hostname: openwebui.gib
+    domainname: ai.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.12
+    ports:
+      - ${OPENWEBUI_PORT}:${OPENWEBUI_PORT}
+    env_file:
+      - ../user_variables.env
+    environment:
+      - OLLAMA_BASE_URL=${OLLAMA_BASE_URL}
+      - PORT=${OPENWEBUI_PORT}
+      - OPENAI_API_KEY=${OPENAI_API_KEY}
+      - AUTOMATIC1111_BASE_URL=${AUTOMATIC1111_BASE_URL}
+      - USE_OLLAMA_DOCKER=${USE_OLLAMA_DOCKER}
+      - USE_CUDA_DOCKER=${USE_CUDA_DOCKER}
+    volumes:
+      - ${VOLUME_DIR}/OpenWebUI/Data:/app/backend/data
+    tty: true
+    restart: unless-stopped
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/pihole/docker-compose.yml
+++ b/configs/docker/compose_files/pihole/docker-compose.yml
@ -0,0 +1,30 @@
+version: "3"
+services:
+  pihole:
+    image: pihole/pihole:latest
+    container_name: pihole
+    hostname: pihole
+    domainname: pihole.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.3
+    ports: 
+      - "53:53/tcp"
+      - "53:53/udp"
+      - "67:67/udp" 
+      - "80:80/tcp"
+    env_file:
+      - ../user_variables.env
+    environment:
+      TZ: ${TZ}
+      WEBPASSWORD: ${PIHOLE_PW}
+    cap_add:
+      - NET_ADMIN
+    volumes:
+      - ${VOLUME_DIR}/Pihole/Etc:/etc/pihole
+      - ${VOLUME_DIR}/Pihole/DNSMasq:/etc/dnsmasq.d
+    tty: true
+    restart: unless-stopped
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/portainer/docker-compose.yml
+++ b/configs/docker/compose_files/portainer/docker-compose.yml
@ -0,0 +1,23 @@
+version: "3"
+services:
+  portainer:
+    image: portainer/portainer-ee:latest
+    container_name: portainer
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true"
+    hostname: port.gib
+    domainname: port.gibbyb.com
+    networks:
+      Gib_Home:
+        ipv4_address: 192.168.0.6
+    ports:
+      - 8000:8000
+      - 9443:9443
+    volumes:
+      - /home/gib/Documents/Media_Server/config/portainer/data:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+    tty: true
+    restart: unless-stopped
+networks:
+  Gib_Home:
+    external: true
--- a/configs/docker/compose_files/satisfactory/docker-compose.yml
+++ b/configs/docker/compose_files/satisfactory/docker-compose.yml
@ -0,0 +1,27 @@
+version: '3'
+services:
+  satisfactory_server:
+    image: wolveix/satisfactory-server:latest
+    container_name: satisfactory_server
+    hostname: satisfactory_server.gib
+    domainname: satisfactory.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.34
+    ports:
+      - 7777:7777/udp
+      - 15000:15000/udp
+      - 15777:15777/udp
+    env_file:
+      - ../user_variables.env
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+    volumes:
+      - ${VOLUME_DIR}/Satisfactory_Server/Data:/config
+    tty: true
+    restart: unless-stopped
+
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/searxng/docker-compose.yml
+++ b/configs/docker/compose_files/searxng/docker-compose.yml
@ -0,0 +1,34 @@
+services:
+  searxng:
+    image: searxng/searxng:latest
+    container_name: searxng
+    hostname: searxng.gib
+    domainname: search.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.11
+    ports:
+      - "8080:8080"
+    env_file:
+      - ../user_variables.env
+    environment:
+      - SEARXNG_BASE_URL=https://search.${DOMAIN}
+      - AUTOCOMPLETE=google
+    cap_drop:
+      - ALL
+    cap_add:
+      - CHOWN
+      - SETGID
+      - SETUID
+    volumes:
+      - ${VOLUME_DIR}/Searxng/Data:/etc/searxng
+    tty: true
+    restart: unless-stopped
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "1m"
+        max-file: "1"
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/vaultwarden/docker-compose.yml
+++ b/configs/docker/compose_files/vaultwarden/docker-compose.yml
@ -0,0 +1,30 @@
+version: "3"
+services:
+  vaultwarden:
+    image: vaultwarden/server:latest
+    container_name: vaultwarden
+    hostname: vaultwarden
+    domainname: vault.${DOMAIN}
+    networks:
+      ${NETWORK_NAME}:
+        ipv4_address: ${IP_PREFIX}.8
+    ports:
+      - "80:80"
+      - "3012:3012"
+    env_file:
+      - ../user_variables.env
+    environment:
+      - DOMAIN=https://vault.${DOMAIN}
+      - LOGIN_RATELIMIT_MAX_BURST=10
+      - LOGIN_RATELIMIT_SECONDS=60
+      - WEB_VAULT_ENABLED=false
+      - SIGNUPS_ALLOWED=false
+      - WEBSOCKET_ENABLED=true
+    volumes:
+      - ${VOLUME_DIR}/Vaultwarden/data:/data
+      - /etc/localtime:/etc/localtime:ro
+    tty: true
+    restart: unless-stopped
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/docker/compose_files/whisperasr/docker-compose.yml
+++ b/configs/docker/compose_files/whisperasr/docker-compose.yml
@ -0,0 +1,27 @@
+version: "2.1"
+services:
+  whisperasr:
+    image: onerahmet/openai-whisper-asr-webservice:latest-gpu
+    container_name: whisperasr
+    hostname: whisperasr.gib
+    domainname: whisperasr.gibbyb.com
+    networks:
+      Gib_Home: 
+        ipv4_address: 192.168.0.36
+    ports:
+      - 9000:9000
+    environment:
+      - ASR_MODEL=small
+      - ASR_ENGINE=faster_whisper
+    deploy:
+      resources:
+        reservations:
+          devices:
+            - driver: nvidia
+              count: 1
+              capabilities: [gpu]
+    tty: true
+    restart: unless-stopped
+networks:
+  Gib_Home:
+    external: true
--- a/configs/docker/compose_files/wireguard/docker-compose.yml
+++ b/configs/docker/compose_files/wireguard/docker-compose.yml
@ -0,0 +1,36 @@
+version: "2.1"
+services:
+  wireguard:
+    image: lscr.io/linuxserver/wireguard:latest
+    container_name: wireguard
+    hostname: wireguard
+    domainname: wg.${DOMAIN}
+    networks:
+      ${NETWORK_NAME} : 
+        ipv4_address: ${IP_PREFIX}.5
+    ports:
+      - 51820:51820/udp
+    env_file:
+      - ../user_variables.env
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TZ}
+      - SERVERPORT=51820
+      - PEERS=${WG_PEERS}
+      - PEERDNS=${IP_PREFIX}.3
+      - INTERNAL_SUBNET=${IP_PREPREFIX}.1.0
+      - SERVERURL=wg.${DOMAIN}
+    cap_add:
+      - NET_ADMIN
+      - SYS_MODULE
+    sysctls:
+      - net.ipv4.conf.all.src_valid_mark=1
+    volumes:
+      - ${VOLUME_DIR}/Wireguard/Config:/config
+      - ${VOLUME_DIR}/Wireguard/Modules:/lib/modules
+    tty: true
+    restart: always
+networks:
+  ${NETWORK_NAME}:
+    external: true
--- a/configs/dotfiles/bashrc
+++ b/configs/dotfiles/bashrc
@ -0,0 +1 @@
+source ~/.local/share/sunhat/defaults/bash/rc
--- a/configs/dotfiles/forge/config/windows.json
+++ b/configs/dotfiles/forge/config/windows.json
@ -59,6 +59,10 @@
        {
            "wmClass": "Ulauncher",
            "mode": "float"
+        },
+        {
+            "wmClass": "com.nextcloud.desktopclient.nextcloud",
+            "mode": "float"
        }
    ]
 }
--- a/configs/dotfiles/nvim/lazy-lock.json
+++ b/configs/dotfiles/nvim/lazy-lock.json
@ -1,37 +1,36 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" },
-  "barbar.nvim": { "branch": "master", "commit": "dd852401ee902745b67fc09a83d113b3fe82a96f" },
-  "cloak.nvim": { "branch": "main", "commit": "6e5bcd50bebc5cdb7cd3a00eb3d97ab7c4cc3b94" },
+  "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" },
+  "barbar.nvim": { "branch": "master", "commit": "79f7d16578a167bdf5355725551ef7d90613a601" },
+  "cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" },
  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "copilot.vim": { "branch": "release", "commit": "25feddf8e3aa79f0573c8f43ddb13c44c530cfa5" },
-  "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
-  "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" },
-  "image.nvim": { "branch": "master", "commit": "2a618c86d9f8fd9f7895d12b55ec2f31fd14fa05" },
-  "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" },
-  "lsp-zero.nvim": { "branch": "v3.x", "commit": "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08" },
-  "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
-  "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
+  "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
+  "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" },
+  "image.nvim": { "branch": "master", "commit": "61c76515cfc3cdac8123ece9e9761b20c3dc1315" },
+  "lazy.nvim": { "branch": "main", "commit": "9a374a0fb4d3ac42dac4a129d4bead7252473c77" },
+  "lsp-zero.nvim": { "branch": "v3.x", "commit": "87701af045b3032515776abeb47eb8c2ddb5e679" },
+  "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
  "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
  "nerdcommenter": { "branch": "master", "commit": "7bb1f72e802a80e37bdda5f6906c69b5a93de1eb" },
-  "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
-  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
-  "nvim-lspconfig": { "branch": "master", "commit": "d70633830acf605ec03d9728698d9e7232442eb4" },
-  "nvim-treesitter": { "branch": "master", "commit": "aa02427dfeaead86fae038024ae7b29299f08b8c" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "f62bfe19e0fbc13ae95649dfb3cf22f4ff85b683" },
-  "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
+  "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
+  "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e26da408cf955afa8e9ddbadd510e84ea8976cd7" },
+  "nvim-treesitter": { "branch": "master", "commit": "667b9dbbfa2d0071c5677c429ddcf89fb931b53f" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "2aba92ceb1479485953007f4d5adf34d0b66917e" },
+  "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" },
  "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "refactoring.nvim": { "branch": "master", "commit": "d2786877c91aa409c824f27b4ce8a9f560dda60a" },
+  "refactoring.nvim": { "branch": "master", "commit": "8ef9cfb8199bed4be4d609cc4b5dbfb5416b3ca6" },
+  "supermaven-nvim": { "branch": "main", "commit": "d71257f431e190d9236d7f30da4c2d659389e91f" },
  "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
-  "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" },
-  "tokyonight.nvim": { "branch": "main", "commit": "0fae425aaab04a5f97666bd431b96f2f19c36935" },
-  "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" },
+  "tokyonight.nvim": { "branch": "main", "commit": "1471dab694ad88351185758bb4275624d8b798ec" },
+  "trouble.nvim": { "branch": "main", "commit": "ad8ef38666834e9e438f84bd446657445bc2a71e" },
  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
-  "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }
-}
+  "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }
+}
--- a/configs/dotfiles/nvim/lua/gib_nvim/cloak.lua
+++ b/configs/dotfiles/nvim/lua/gib_nvim/cloak.lua
@ -1,5 +1,5 @@
 require("cloak").setup({
-  enabled = true,
+  enabled = false,
  cloak_character = "*",
  -- The applied highlight group (colors) on the cloaking, see `:h highlight`.
  highlight_group = "Comment",
--- a/configs/dotfiles/nvim/lua/gib_nvim/init.lua
+++ b/configs/dotfiles/nvim/lua/gib_nvim/init.lua
@ -15,4 +15,3 @@ require("gib_nvim.treesitter")
 require("gib_nvim.trouble")
 require("gib_nvim.undotree")
 require("gib_nvim.barbar")
-require("gib_nvim.toggleterm")
--- a/configs/dotfiles/nvim/lua/gib_nvim/lazy.lua
+++ b/configs/dotfiles/nvim/lua/gib_nvim/lazy.lua
@ -65,7 +65,18 @@ require("lazy").setup({
    {'saadparwaiz1/cmp_luasnip'},
    {'rafamadriz/friendly-snippets'},
    {
-        'github/copilot.vim'
+        --'github/copilot.vim'
+        'supermaven-inc/supermaven-nvim',
+        config = function()
+          require('supermaven-nvim').setup({
+            keymaps = {
+              accept_suggestion = '<Tab>',
+              clear_suggestion = '<C-]>',
+              accept_word = '<C-.>',
+            },
+            disable_inline_completion = false, -- for cmp
+          })
+        end,
    },
    {
        'laytan/cloak.nvim'
@ -116,7 +127,4 @@ require("lazy").setup({
        },
        version = '^1.0.0',
    },
-    {
-      'akinsho/toggleterm.nvim', version = "*", config = true
-    },
 })
--- a/configs/dotfiles/nvim/lua/gib_nvim/lsp.lua
+++ b/configs/dotfiles/nvim/lua/gib_nvim/lsp.lua
@ -56,6 +56,7 @@ local cmp_select = {behavior = cmp.SelectBehavior.Select}

 cmp.setup({
  sources = {
+    --{name = 'supermaven'},
    {name = 'path'},
    {name = 'nvim_lsp'},
    {name = 'nvim_lua'},
--- a/configs/dotfiles/nvim/lua/gib_nvim/toggleterm.lua
+++ b/configs/dotfiles/nvim/lua/gib_nvim/toggleterm.lua
@ -1,29 +0,0 @@
-require("toggleterm").setup{
-  size = 10,
-  open_mapping = [[<C-x>]],
-  shade_filetypes = {},
-  shade_terminals = true,
-  shading_factor = 1, -- the degree by which to darken to terminal colour, default: 1 for dark backgrounds, 3 for light
-  start_in_insert = true,
-  insert_mappings = true,
-  persist_size = true,
-  direction = 'horizontal',
-  close_on_exit = true, -- close the terminal window when the process exits
-  shell = vim.o.shell, -- change the default shell
-  -- this field is only relevant if direction is set to 'float'
-  float_opts = {
-    -- the border key is *almost* the same as 'nvim_win_open'
-    -- see :h nvim_win_open for details on borders however
-    -- the 'curved' border is a custom border type
-    -- not natively supported but implemented in this plugin.
-    border = 'single',
-    width = 200,
-    height = 50,
-    winblend = 3,
-    highlights = {
-      border = "normal",
-      background = "normal",
-    }
-  }
-}
-
--- a/configs/dotfiles/symlink_configs.sh
+++ b/configs/dotfiles/symlink_configs.sh
@ -0,0 +1,19 @@
+#!/bin/bash
+#mv ~/.bashrc ./temp/.bashrc
+#ln -s /home/gib/Documents/Configs/bashrc /home/gib/.bashrc
+#mv ~/.config/espanso ./temp/espanso
+#ln -s /home/gib/Documents/Configs/espanso /home/gib/.config/espanso
+mv ~/.config/forge ./temp/forge
+ln -s /home/gib/Documents/Configs/forge /home/gib/.config/forge
+mv ~/.config/kitty ./temp/kitty
+ln -s /home/gib/Documents/Configs/kitty /home/gib/.config/kitty
+mv ~/.config/lobster ./temp/lobster
+ln -s /home/gib/Documents/Configs/lobster /home/gib/.config/lobster
+#mv ~/.config/neomutt ./temp/neomutt
+#ln -s /home/gib/Documents/Configs/neomutt /home/gib/.config/neomutt
+mv ~/.config/nvim ./temp/nvim
+ln -s /home/gib/Documents/Configs/nvim /home/gib/.config/nvim
+mv ~/.config/powerline ./temp/powerline
+ln -s /home/gib/Documents/Configs/powerline /home/gib/.config/powerline
+mv ~/.config/ranger ./temp/ranger
+ln -s /home/gib/Documents/Configs/ranger /home/gib/.config/ranger
--- a/configs/rc/inputrc
+++ b/configs/rc/inputrc
@ -1 +0,0 @@
-$include ~/.local/share/omakub/defaults/bash/inputrc
--- a/defaults/bash/aliases
+++ b/defaults/bash/aliases
@ -6,10 +6,12 @@ alias gtext="gnome-text-editor"
 alias :q="exit"
 alias :wq="exit"
 alias cdcode="cd ~/Documents/Code"
+alias cdsun="cd ~/.local/share/sunhat"
 alias rnr="ranger"
 alias startsunshine="systemctl --user restart sunshine.service"
-alias jump="wine /home/gib/.wine/drive_c/Program\ Files/Phase\ Five\ Systems/Jump\ Desktop/JumpClient.exe & disown"
 alias n.="nvim ."
+alias sourcerc="source ~/.bashrc"
+alias john="~/.local/share/sunhat/packages/JohnTheRipper/run/john"

 # File system
 alias ls='eza -lh --group-directories-first --icons'
--- a/defaults/bash/inputrc
+++ b/defaults/bash/inputrc
@ -1,31 +0,0 @@
-set completion-ignore-case on
-set completion-prefix-display-length 2
-set show-all-if-ambiguous on
-set show-all-if-unmodified on
-
-# Immediately add a trailing slash when autocompleting symlinks to directories
-set mark-symlinked-directories on
-
-# Do not autocomplete hidden files unless the pattern explicitly begins with a dot
-set match-hidden-files off
-
-# Show all autocomplete results at once
-set page-completions off
-
-# If there are more than 200 possible completions for a word, ask to show them all
-set completion-query-items 200
-
-# Show extra file information when completing, like `ls -F` does
-set visible-stats on
-
-$if Bash
-  # Be more intelligent when autocompleting by also looking at the text after
-  # the cursor. For example, when the current line is "cd ~/src/mozil", and
-  # the cursor is on the "z", pressing Tab will not autocomplete it to "cd
-  # ~/src/mozillail", but to "cd ~/src/mozilla". (This is supported by the
-  # Readline used by Bash 4.)
-  set skip-completed-text on
-
-  # Coloring for Bash 4 tab completions.
-  set colored-stats on
-$endif
--- a/defaults/bash/rc
+++ b/defaults/bash/rc
@ -1,3 +1,3 @@
+source ~/.local/share/sunhat/defaults/bash/powerline
 source ~/.local/share/sunhat/defaults/bash/shell
 source ~/.local/share/sunhat/defaults/bash/aliases
-source ~/.local/share/sunhat/defaults/bash/powerline
--- a/defaults/bash/shell
+++ b/defaults/bash/shell
@ -1,3 +1,8 @@
+# Source global definitions
+if [ -f /etc/bashrc ]; then
+	. /etc/bashrc
+fi
+
 # History control
 shopt -s histappend
 HISTCONTROL=ignoreboth
@ -8,10 +13,16 @@ HISTFILESIZE="${HISTSIZE}"
 export EDITOR="nvim"
 export SUDO_EDITOR="nvim"

-export SUNHAT_PATH="/home/$USER/.local/share/sunhat"
+# Define Paths
+export SUNHAT_PATH="$HOME/.local/share/sunhat"
+export CARGO_PATH="$HOME/.cargo"
 export BUN_INSTALL="$HOME/.bun"
+export PYENV_ROOT="$HOME/.pyenv"
+export PNPM_HOME="$HOME/.local/share/pnpm"

 # Set complete path
-export PATH="./bin:$HOME/.local/bin:$HOME/.local/share/sunhat/bin:$HOME/.rbenv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$BUN_INSTALL/bin:$HOME/.cargo/bin"
+export PATH="$HOME/bin:$HOME/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SUNHAT_PATH/bin:$BUN_INSTALL/bin:$CARGO_PATH/bin:$PNPM_HOME:$PYENV_ROOT/bin:$HOME/.rbenv/bin"
 set +h

+# Zoxide
+eval "$(zoxide init bash)"
--- a/install/app_bottles.sh
+++ b/install/app_bottles.sh
@ -0,0 +1 @@
+sudo dnf install -y bottles
--- a/install/app_espanso.sh
+++ b/install/app_espanso.sh
@ -11,3 +11,4 @@ espanso start
 espanso install html-utils-package
 espanso install markdown-shortcuts
 espanso install misspell-en
+cd ~/.local/share/sunhat || exit
--- a/install/app_grub_btrfs.sh
+++ b/install/app_grub_btrfs.sh
@ -3,6 +3,7 @@ git clone https://github.com/Antynea/grub-btrfs ~/.local/share/sunhat/packages/g
 cp ~/.local/share/sunhat/configs/grub-btrfs/config ~/.local/share/sunhat/packages/grub-btrfs/config
 cd ~/.local/share/sunhat/packages/grub-btrfs
 sudo make install
+cd ~/.local/share/sunhat
 sudo grub2-mkconfig -o /etc/grub2-efi.cfg
 sudo systemctl enable --now grub-btrfsd
 echo -e "\nIn order to make GRUB-BTRFS work with Timeshift,"
--- a/install/app_john_the_ripper.sh
+++ b/install/app_john_the_ripper.sh
@ -0,0 +1,5 @@
+sudo dnf install yasm gmp-devel libpcap-devel bzip2-devel
+git clone https://github.com/magnumripper/JohnTheRipper.git ~/.local/share/sunhat/packages/JohnTheRipper/
+cd ~/.local/share/sunhat/JohnTheRipper/src
+./configure && make
+cd ~/.local/share/sunhat
--- a/install/fonts.sh
+++ b/install/fonts.sh
@ -38,6 +38,7 @@ rm -rf master.zip iaFonts

 fc-cache
 cd -
+cd ~/.local/share/sunhat

 # Set Victor Mono as the default
 gsettings set org.gnome.desktop.interface monospace-font-name 'VictorMono Nerd Font 10'
--- a/install/nodenv.sh
+++ b/install/nodenv.sh
@ -13,4 +13,5 @@ if ! command -v nodenv &>/dev/null; then
 	nodenv install $DEFAULT_NODE_VERSION
 	nodenv global $DEFAULT_NODE_VERSION
 	sudo ln -vs $(nodenv root)/shims/* /usr/local/bin/
+  cd ~/.local/share/sunhat
 fi
--- a/install/optional/app_LACT.sh
+++ b/install/optional/app_LACT.sh
@ -0,0 +1,3 @@
+source ~/.local/share/sunhat/sources/env.sh
+sudo dnf install -y $LACT_LINK
+sudo systemctl enable --now lactd
--- a/packages/hanabi
+++ b/packages/hanabi
@ -1 +1 @@
-Subproject commit 482c9ad3f712fffc0b76490379a1c205321af260
+Subproject commit 8834eea1d9b70623d62697e6d241f276401ab51f
--- a/settings/set_gnome_extensions.sh
+++ b/settings/set_gnome_extensions.sh
@ -26,7 +26,7 @@ gext install weatheroclock@CleoMenezesJr.github.io
 gext install wifiqrcode@glerro.pm.me
 # Install Hanabi
 git clone https://github.com/jeffshee/gnome-ext-hanabi.git ~/.local/share/sunhat/packages/hanabi
-cd ~/.local/share/sunhat/packages/hanabi || exit
+cd ~/.local/share/sunhat/packages/hanabi
 ./run.sh install > /dev/null
 echo "Hanabi installed"

--- a/sources/dotfiles.sh
+++ b/sources/dotfiles.sh
@ -2,15 +2,11 @@
 mkdir ~/Documents/Configs

 # Set up Bash Config and Source it ASAP.
-[ -f "~/.bashrc" ] && rm ~/.bashrc
+[ -f "$HOME/.bashrc" ] && mv ~/.bashrc ~/.bashrc.bak
 cp ~/.local/share/sunhat/configs/rc/bashrc ~/Documents/Configs/bashrc
 ln -s ~/Documents/Configs/bashrc ~/.bashrc
 source ~/.bashrc

-[ -f "~/.inputrc" ] && rm ~/.inputrc
-cp ~/.local/share/sunhat/configs/rc/inputrc ~/Documents/Configs/inputrc
-ln -s ~/Documents/Configs/inputrc ~/.inputrc
-
 # Copy all Dotfiles to the Configs Directory.
 cp -r ~/.local/share/sunhat/configs/dotfiles/. ~/Documents/Configs/

@ -34,5 +30,5 @@ ln -s ~/Documents/Configs/ranger ~/.config/ranger

 # Copy any additional files such as Wallpapers,
 # Icons, .desktop files, & Nautilus Extensions
-cp -r ~/.local/share/sunhat/config/copy/home/. ~/
-cp -r ~/.local/share/sunhat/config/copy/root/. /
+cp -r ~/.local/share/sunhat/configs/copy/home/. ~/
+sudo cp -r ~/.local/share/sunhat/configs/copy/root/. /
--- a/sources/env.sh
+++ b/sources/env.sh
@ -1,3 +1,4 @@
+export TOOLS=$(cat ~/.local/share/sunhat/sources/install/tools | tr "\n" " " | sed 's/ //g')
 export GH_USERNAME="gibbyb"
 export GH_EMAIL="gib@gibbyb.com"
 export GH_EDITOR="nvim"
--- a/sources/install/nvidia_driver.sh
+++ b/sources/install/nvidia_driver.sh
@ -0,0 +1,10 @@
+sudo dnf install -y akmod-nvidia xorg-x11-drv-nvidia-cuda
+echo -e "\nRemove the duplicate lines below from grub:"
+echo -e "\t\"rd.driver.blacklist=nouveau,"
+echo -e "\tmodprobe.blacklist=nouveau,"
+echo -e "\tnvidia-drm.modeset=1\"\n"
+echo -e "\n Save the file & close nvim to continue.\n"
+kitty -1 -e bash -c "sudo nvim /etc/default/grub"
+sudo grub2-mkconfig -o /etc/grub2-efi.cfg
+sudo systemctl enable nvidia-hibernate.service nvidia-suspend.service \
+  nvidia-resume.service nvidia-powerd.service
--- a/sources/install/tools
+++ b/sources/install/tools
@ -109,3 +109,27 @@ bison
 ImageMagick
 sqlite3
 gperftools-libs
+boost-devel
+intel-mediasdk-devel
+libappindicator-gtk3-devel
+libcap-devel
+libcurl-devel
+libdrm-devel
+libevdev-devel
+libnotify-devel
+libva-devel
+libvdpau-devel
+libX11-devel
+libxcb-devel
+libXcursor-devel
+libXfixes-devel
+libXi-devel
+libXinerama-devel
+libXrandr-devel
+libXtst-devel
+mesa-libGL-devel
+miniupnpc-devel
+numactl-devel
+openssl-devel
+opus-devel
+pulseaudio-libs-devel
--- a/sources/tools.sh
+++ b/sources/tools.sh
@ -1,2 +1,2 @@
-tools=$(cat ~/.local/share/sunhat/sources/install/tools | tr "\n" " ")
+source ~/.local/share/sunhat/sources/env.sh
 sudo dnf install -y $tools
Author	SHA1	Message	Date
gibbyb	4c58bc45d0	Fix a bunch of stuff. Add docker compose files to make server config repo obsolete	2024-07-21 22:04:13 -05:00
gibbyb	060d736b24	Update Configs	2024-07-20 11:47:52 -05:00
gibbyb	da6a88e63a	idek	2024-07-18 18:12:54 -05:00
gibbyb	fe715b675b	Fix zoxide	2024-07-18 18:09:30 -05:00
gibbyb	d14d4bc1b8	Fixes and added john the ripper install	2024-07-11 08:53:27 -05:00
gibbyb	6ea8f02158	Small fixes	2024-07-08 02:29:49 -05:00
gibbyb	3503909f34	Fix some errors	2024-06-21 18:49:43 -05:00
gibbyb	50f70cfdcb	Remove inputrc	2024-06-11 10:41:35 -05:00
gibbyb	6ade6b867b	Clean up	2024-06-11 10:38:53 -05:00
gibbyb	f1c9fe9c16	Clean up bashrc	2024-06-11 09:35:10 -05:00
				`@ -0,0 +1 @@`
				`source ~/.local/share/sunhat/defaults/bash/rc`
				`@ -1 +0,0 @@`
				`$include ~/.local/share/omakub/defaults/bash/inputrc`