Merge branch 'p14s' of github.com:marcelarie/dots into p14s

Author: marcelarie

.asoundrc

@@ -0,0 +1,20 @@
+pcm.!default {
+    type plug
+    slave.pcm "multi"
+}
+
+pcm.multi {
+    type multi
+    slaves.a.pcm "hw:0,3"
+    slaves.b.pcm "hw:1,3"
+    slaves.a.channels 2
+    slaves.b.channels 2
+    bindings.0.slave a
+    bindings.0.channel 0
+    bindings.1.slave a
+    bindings.1.channel 1
+    bindings.2.slave b
+    bindings.2.channel 0
+    bindings.3.slave b
+    bindings.3.channel 1
+}

.bash_aliases

@@ -52,7 +52,7 @@ alias tree="erd"
 # alias glom="git pull origin (git branch -rl "*/HEAD" | rev | cut -d/ -f1 | rev)''"
 alias glof="git log --oneline -M --stat --follow --"
 alias glast="git log --pretty=format:"%h" HEAD^..HEAD"
-alias cglast="glast | copy"
+alias gclast="glast | copy"
 # alias grec='git log --graph --oneline --decorate ( git fsck --no-reflog | awk "/dangling commit/ {print $3}" )'
 alias gdfc=" git diff --name-only origin/HEAD"
 # alias gdsm='git diff (gst | rg "modified" | sed "s/modified://g" | fzf | awk \'{$1=$1};1\' )'
@@ -102,6 +102,7 @@ alias retro="~/scripts/open-retro-notes.sh"
 alias emulator="~/Library/Android/sdk/emulator/emulator"
 # alias vi="nvim"
 alias vi="~/scripts/vi.sh"
+alias feni='~/scripts/fennel-nvim.sh'
 alias vin="nvim-nightly"
 alias screen_shoot_partial='grim -g "$(slurp)" ~/screenshots/grim-"$(date '+%Y%m%d-%H:%M:%S')".png'
 alias cvi="vi"
@@ -157,8 +158,7 @@ alias mc="mcfly search"
 # alias af="xdotool type --delay 0 ( alias | fzy | awk -F' ' '{print $2}')"
 # alias chs="cht.sh"
 
-alias ta="tmux attach -t"
-alias tas='~/scripts/tmux/tmux-attach-search.sh own work'
+alias ta='tmux attach -t $(tmux ls -F "#{session_name}" | fzf)'
 alias tcs='~/scripts/tmux/create-session-tmex.sh'
 alias trc='nvim ~/.config/tmux/tmux.conf'
 alias skrc='nvim ~/.config/skhd/skhdrc'
@@ -361,7 +361,7 @@ alias myip="dig +short myip.opendns.com @resolver1.opendns.com"
 alias nurc="nvim ~/.config/nushell/config.nu"
 alias nual="nvim ~/.config/nushell/alias.nu"
 alias nuenv="nvim ~/.config/nushell/env.nu"
-alias ta="tarea"
+alias ff="fzf --preview 'bat --style=numbers --color=always {}'"
 
 alias nn="nnn -e"
 alias nnn="nnn -e"

.bashrc

@@ -6,6 +6,7 @@ export NIX_PROMPT=true
 export VI_MODE_PROMPT=true
 
 source ~/.bash_aliases
+
 if [[ $- == *i* ]] && [[ -t 0 ]]; then
 	source ~/clones/forks/xelabash/xela.bash
 fi
@@ -21,6 +22,10 @@ set -o vi
 export CARAPACE_BRIDGES='zsh,fish,bash,inshellisense' # optional
 source <(carapace _carapace)
 eval "$(direnv hook bash)"
+
+[[ -f ~/.bash-preexec.sh ]] && source ~/.bash-preexec.sh
+# Turn on comments for commands executed from the command line so they can show in history
+# setopt interactivecomments
 eval "$(atuin init bash --disable-up-arrow)"
 
 # Use bash-completion, if available
@@ -108,9 +113,9 @@ gstp() {
 	git status --porcelain "$@" | awk '$1 ~ /^M/ { print $2 }' | paste -sd ' '
 }
 
-# if [[ $- == *i* ]] && [[ -t 0 ]]; then
-# 	 tarea
-# fi
+if [[ $- == *i* ]] && [[ -t 0 ]] && command -v tarea >/dev/null 2>&1; then
+	tarea
+fi
 
 if command -v tarea >/dev/null 2>&1; then
 	eval "$(tarea --completions bash)"
@@ -121,4 +126,3 @@ fi
 # 	eval "$(gcs --completion bash)"
 # fi
 
-# alias claude="/home/mmanzanares/.claude/local/claude"

.claude/CLAUDE.md

@@ -13,4 +13,8 @@ When writing code:
 This project prefers minimal diffs and clean patches.  
 Follow Unix-style conventions: small, focused changes that are easy to review.
 If the project has a flake.nix try to use nix develop to run commands.
+Check if there is a Makefile, Justfile or variants to see if there are already
+setup some command runs.
+Check if there is a flake.nix to know if you need to use nix develop to run
+commands.
 

.claude/settings.json

@@ -0,0 +1,9 @@
+{
+  "permissions": {
+    "deny": [
+      "Read(ENV)",
+      "Read(./.env)",
+      "Read(./.env.*)"
+    ]
+  }
+}

.config/btop/btop.conf

@@ -1,4 +1,4 @@
-#? Config file for btop v. 1.2.13
+#? Config file for btop v. 1.3.0
 
 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
@@ -25,7 +25,7 @@ presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:defaul
 vim_keys = False
 
 #* Rounded corners on boxes, is ignored if TTY mode is ON.
-rounded_corners = True
+rounded_corners = False
 
 #* Default symbols to use for graph creation, "braille", "block" or "tty".
 #* "braille" offers the highest resolution but might not be included in all fonts.
@@ -37,6 +37,9 @@ graph_symbol = "braille"
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_cpu = "default"
 
+# Graph symbol to use for graphs in gpu box, "default", "braille", "block" or "tty".
+graph_symbol_gpu = "default"
+
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_mem = "default"
 
@@ -46,7 +49,7 @@ graph_symbol_net = "default"
 # Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
 graph_symbol_proc = "default"
 
-#* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace.
+#* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace.
 shown_boxes = "cpu mem net proc"
 
 #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
@@ -66,7 +69,7 @@ proc_tree = False
 proc_colors = True
 
 #* Use a darkening gradient in the process list.
-proc_gradient = True
+proc_gradient = False
 
 #* If process cpu usage should be of the core it's running on or usage of the total available cpu power.
 proc_per_core = False
@@ -86,13 +89,19 @@ proc_left = False
 #* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
 proc_filter_kernel = False
 
+#* In tree-view, always accumulate child process resources in the parent process.
+proc_aggregate = False
+
 #* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
 #* Select from a list of detected attributes from the options menu.
-cpu_graph_upper = "total"
+cpu_graph_upper = "Auto"
 
 #* Sets the CPU stat shown in lower half of the CPU graph, "total" is always available.
 #* Select from a list of detected attributes from the options menu.
-cpu_graph_lower = "total"
+cpu_graph_lower = "Auto"
+
+#* If gpu info should be shown in the cpu box. Available values = "Auto", "On" and "Off".
+show_gpu_info = "Auto"
 
 #* Toggles if the lower CPU graph should be inverted.
 cpu_invert_lower = True
@@ -209,4 +218,29 @@ selected_battery = "Auto"
 
 #* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
 #* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
-log_level = "WARNING"
+log_level = "WARNING"
+
+#* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards.
+nvml_measure_pcie_speeds = True
+
+#* Horizontally mirror the GPU graph.
+gpu_mirror_graph = True
+
+#* Custom gpu0 model name, empty string to disable.
+custom_gpu_name0 = ""
+
+#* Custom gpu1 model name, empty string to disable.
+custom_gpu_name1 = ""
+
+#* Custom gpu2 model name, empty string to disable.
+custom_gpu_name2 = ""
+
+#* Custom gpu3 model name, empty string to disable.
+custom_gpu_name3 = ""
+
+#* Custom gpu4 model name, empty string to disable.
+custom_gpu_name4 = ""
+
+#* Custom gpu5 model name, empty string to disable.
+custom_gpu_name5 = ""
+

.config/hypr/pyprland.toml

@@ -36,7 +36,7 @@ lazy = true
 [scratchpads.volume]
 animation = ""
 command = "pavucontrol"
-class = "org.pulseaudio.pavucontrol"
+class = "Pavucontrol"
 position = "25% 25%"
 size = "50% 50%"
 unfocus = "hide"

.config/waybar/config

@@ -10,7 +10,6 @@
     "hyprland/mode"
   ],
   "modules-center": [
-    "hyprland/window"
   ],
   "modules-right": [
     "pulseaudio",

.gitignore

@@ -1,3 +1,4 @@
 
 .cargo/
 old-scripts/
+.config/nushell/history.txt

.sops.yaml

@@ -0,0 +1,10 @@
+keys:
+  - &nixos age16phd3r65ggmhv090r57es8ygt7j0y0tjezfndkuaptgmk50rxyms56ys87
+  - &work age1yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy     # Add work host's public key here
+
+creation_rules:
+  - path_regex: secrets/secrets\.yaml$
+    key_groups:
+      - age:
+          - *nixos
+          - *work