diff --git a/dot_bashrc b/dot_bashrc index 4fc4451..53a84b4 100644 --- a/dot_bashrc +++ b/dot_bashrc @@ -2,21 +2,11 @@ # ~/.bashrc # -# Only run this for interactive shells +# If not running interactively, don't do anything [[ $- != *i* ]] && return -# Auto-start pwsh only in graphical / non-TTY sessions -if [[ -z "$XDG_SESSION_TYPE" || "$XDG_SESSION_TYPE" == "tty" ]]; then - : # real TTY → do nothing -else - if [[ $(ps --no-header --pid=$PPID --format=comm) != "pwsh" ]] \ - && [[ -z $BASH_EXECUTION_STRING ]]; then - # exec pwsh - exec fish -l - fi -fi - -if [ "$TERM" = "linux" ] || [ "$TERM" = "xterm-256color" ]; then +# TTY Color Palette +if [ "$TERM" = "linux" ]; then # Catppuccin Mocha TTY Palette printf "\e]P01e1e2e" # 0: Black (Base) printf "\e]P1f38ba8" # 1: Red (Red) @@ -33,22 +23,22 @@ if [ "$TERM" = "linux" ] || [ "$TERM" = "xterm-256color" ]; then printf "\e]PC89b4fa" # C: Bright Blue (Blue) printf "\e]PDcba6f7" # D: Bright Magenta (Mauve) printf "\e]PE94e2d5" # E: Bright Cyan (Teal) - printf "\e]PFf5e0dc" # F: Bright White (Rosewater) - - # Clear screen to paint the new background color + + # Clear screen so the background color takes effect immediately clear fi -# Start light-dm -if [[ "$TERM" = "linux" && "$(tty)" == "/dev/tty1" ]]; then - exec ly-dm -fi +# Launch Fish +if [[ -x "$(command -v fish)" && "$TERM" != "linux" && -z "$BASH_EXECUTION_STRING" ]]; then + # PREVENT INFINITE LOOPS: + PARENT_COMM=$(ps -o comm= -p $PPID) + if [[ "$PARENT_COMM" != "fish" ]]; then + exec fish -l + fi +fi -# Set a basic prompt +# Enable bash completion PS1='[\u@\h \W]\$ ' - -# Use bash-completion, if available [[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \ . /usr/share/bash-completion/bash_completion - diff --git a/dot_config/hypr/hyprland.conf b/dot_config/hypr/hyprland.conf index 51092d6..9d23cdc 100644 --- a/dot_config/hypr/hyprland.conf +++ b/dot_config/hypr/hyprland.conf @@ -31,13 +31,13 @@ monitorv2 { position = 0x0 scale = 1 - bitdepth = 10 - supports_wide_color = 1 - supports_hdr = 1 - max_luminance = 400 - - sdr_min_luminance = 0.005 - sdr_max_luminance = 350 + # bitdepth = 10 + # supports_wide_color = 1 + # supports_hdr = 1 + # max_luminance = 400 + # + # sdr_min_luminance = 0.005 + # sdr_max_luminance = 350 } monitorv2 { diff --git a/dot_config/hypr/windowrules.conf b/dot_config/hypr/windowrules.conf index 4322233..1e6cf05 100644 --- a/dot_config/hypr/windowrules.conf +++ b/dot_config/hypr/windowrules.conf @@ -6,6 +6,7 @@ windowrule=idle_inhibit focus, match:fullscreen true # Disable Transparency windowrule=opaque on,match:title (.*)- YouTube(.*) +windowrule=opaque on,match:title (.*)- Twitch(.*) windowrule=opaque on,match:class (.*)cord windowrule=opaque on,match:title (.*)HiAnime\.to.* windowrule=opaque on,match:title (.*)n\.eko.* diff --git a/dot_config/opencode/opencode.json b/dot_config/opencode/opencode.json index 4b6bd3c..73aedbb 100644 --- a/dot_config/opencode/opencode.json +++ b/dot_config/opencode/opencode.json @@ -51,33 +51,61 @@ "bash": { "*": "ask", "sudo*": "deny", - "mkdir *": "allow", - "touch *": "allow", + + "./scripts/validate.sh": "allow", + "awk *": "allow", + "cat *": "allow", "cd *": "allow", - "ls *": "allow", - "kubectl get *": "allow", - "kubectl describe *": "allow", - "kubectl logs *": "allow", - "kubectl debug *": "allow", - "helm list *": "allow", - "helm get *": "allow", - "helm status *": "allow", - "helm show *": "allow", - "helm repo *": "allow", - "helm link *": "allow", + "curl *": "allow", + "date *": "allow", + "dig *": "allow", + "find *": "allow", + "flux check *": "allow", "flux get *": "allow", - "grep *": "allow", - "rg *": "allow", - "tail *": "allow", - "head *": "allow", + "flux logs *": "allow", + "flux reconcile *": "ask", + "git branch *": "allow", "git diff *": "allow", - "git status *": "allow", "git log *": "allow", + "git show *": "allow", + "git status *": "allow", + "grep *": "allow", + "head *": "allow", + "helm get *": "allow", + "helm link *": "allow", + "helm list *": "allow", + "helm repo *": "allow", + "helm show *": "allow", + "helm status *": "allow", + "history *": "allow", + "hubble *": "allow", + "jq *": "allow", + "kubectl api-resources *": "allow", + "kubectl auth can-i *": "allow", + "kubectl debug *": "allow", + "kubectl describe *": "allow", + "kubectl diff *": "allow", + "kubectl events *": "allow", + "kubectl explain *": "allow", + "kubectl get *": "allow", + "kubectl logs *": "allow", + "kubectl top *": "allow", + "kustomize build *": "allow", + "ls *": "allow", + "mkdir *": "allow", "pwsh -NoProfile ./scripts/validate.ps1": "allow", + "rg *": "allow", + "sed *": "allow", + "sort *": "allow", + "tail *": "allow", + "tar *": "allow", + "touch *": "allow", "tree *": "allow", + "uniq *": "allow", + "unzip *": "allow", + "wc *": "allow", "xargs *": "allow", - "yq *": "allow", - "jq *": "allow" + "yq *": "allow" } } } diff --git a/dot_config/powershell/profile.ps1 b/dot_config/powershell/profile.ps1 index f0fb96f..4cb6f12 100644 --- a/dot_config/powershell/profile.ps1 +++ b/dot_config/powershell/profile.ps1 @@ -4,4 +4,4 @@ $env:PATH = "$HOME/.local/bin:$env:PATH" $env:CILIUM_NAMESPACE = "cilium" # Load Main Data -. (Join-Path $HOME ".config/powershell/main.ps1") +# . (Join-Path $HOME ".config/powershell/main.ps1") diff --git a/dot_config/private_fish/config.fish b/dot_config/private_fish/config.fish index b6877db..5d04102 100644 --- a/dot_config/private_fish/config.fish +++ b/dot_config/private_fish/config.fish @@ -6,6 +6,7 @@ end abbr -a .. 'cd ..' abbr -a cc "claude" abbr -a oc "opencode" +abbr -a co "codex" abbr -a v "nvim" abbr -a watch "watch -c -n 1 -d" @@ -38,7 +39,7 @@ set -g fish_greeting '' set -g fzf_history_opts --with-nth=4.. # Set up tide prompt -set -g tide_right_prompt_items status cmd_duration context jobs direnv bun node python rustc java php pulumi ruby go gcloud distrobox toolbox terraform aws nix_shell crystal elixir zig +set -g tide_right_prompt_items status cmd_duration context jobs direnv bun node python rustc java php pulumi ruby go gcloud distrobox toolbox terraform aws nix_shell crystal elixir zig shlvl # Catppuccin Frappé Palette set -g ct_rosewater f2d5cf