update config

dotfiles/bash_files/all_hosts/bashrc

@@ -1,7 +1,7 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
  
-#dont put duplicate lines or lines starting with space in the history
+# dont put duplicate lines or lines starting with space in the history
 # See bash(1) for more options
 HISTCONTROL=ignoreboth
 HISTFILESIZE=-1
@@ -12,6 +12,8 @@ if [ -f ~/.bash_local ]; then
         . ~/.bash_local
 fi
 
+# show tldr on terminal start
+# tldr --quiet $(tldr --quiet --list | shuf -n1)
  
 PS1="\[\e[32m\][\[\e[m\]\[\e[32m\]\u\[\e[m\]\[\e[32m\]@\[\e[m\]\[\e[32m\]\h\[\e[m\]\[\e[32m\]]\[\e[m\]\[\e[34m\]\W\[\e[m\]\[\e[36m\]\\$\[\e[m\] "
 if [ ! -z "$SSH_CLIENT" ]

dotfiles/bash_files/all_hosts/git

@@ -0,0 +1,7 @@
+alias g='git'
+alias ga='git add'
+alias gc='git commit'
+alias gs='git status'
+alias gd='git diff'
+alias lg='lazygit'
+alias gtop="cd \$(git rev-parse --show-toplevel)" # go to top level of git repo

dotfiles/bash_files/all_hosts/global

@@ -0,0 +1,23 @@
+alias cp="cp -i"                          # confirm before overwriting something
+alias df='df -h'                          # human-readable sizes
+alias free='free -m'                      # show sizes in MB
+alias du='du -h'
+alias diff='diff --color=auto'
+alias grep='grep --color=auto'
+alias ip='ip -color=auto'
+alias ls='ls --color=auto'
+alias vm='mv'
+alias cat='bat -pp'
+alias man='batman'
+alias ll="ls -lhA"
+alias sl='ls'
+alias -- -='cd -'
+
+alias caddy_reload="docker exec -it caddy sh -c 'cd /etc/caddy && caddy reload'"
+
+mkcd() { mkdir -p "$@" && cd "$@"; }
+rnd() { echo $((RANDOM%10000+1000)); }
+
+### NIX ###
+alias rebuild="sudo nixos-rebuild switch --flake ~/nixos#$NIXHOST"
+alias search="nix search nixpkgs"

dotfiles/bash_files/desk/methods

@@ -4,9 +4,7 @@ mp(){
 }
  
 cs(){
-  # cp -l fullpath fullpath/Documents/cheatsheet
-  # path=~/Documents/cheatsheet
-  path=/solid/dir/reference/cheatsheet/
+  path=~/Documents/cheatsheet
   if [[ -z "$1" ]]; then
     ls $path
   else

dotfiles/bash_files/desk/shortcuts

@@ -1,7 +1,5 @@
 alias ctllist="systemctl --type=service"
 alias esc='setxkbmap -option "caps:swapescape"'
-alias checkip="curl ipinfo.io"
 alias hold='hold=$(pwd)'
 
-alias ollama_up="./scripts/VM/VMmanager.sh macvtap; sudo virsh start ollama_vm"
-
+alias ollama_up='sh ~/scripts/VM/VMmanager.sh macvtap; sudo virsh start ollama_vm; ssh remote "/bin/bash /scripts/remote_commands.sh init_ollama"'

dotfiles/gtk-3.0/bookmarks

@@ -1,10 +1,6 @@
 file:///home/fred/Downloads
 file:///home/fred/Documents
 file:///home/fred/scripts
-file:///nfs
-file:///solid/dir/reference/cheatsheet
-file:///solid
-file:///solid/dir/reference/scratch
-file:///docker/compose docker
-file:///solid/job
+file:///nfs/media/music
 file:///home/fred/nixos
+file:///ssd

dotfiles/i3/config

@@ -4,7 +4,7 @@ exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
 
 # applets
 exec --no-startup-id nm-applet
-exec volumeicon
+exec --no-startup-id volumeicon
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
@@ -126,16 +126,14 @@ bindsym Mod4+Button7       resize grow width 10 px or 10 ppt
 # finds out, if available)
 bar {
         status_command i3blocks
-        tray_output HDMI-A-0
+        tray_output HDMI-1
 
 }
 
 ####session management
 bindsym Mod4+grave exec screens 4
 bindsym Control+Shift+q kill
-#bindsym Control+Shift+c reload
 bindsym Control+Shift+r restart
-#bindsym Control+Mod1+p exec i3-msg exit
 bindsym Control+Mod1+p exec xfce4-session-logout --logout
 bindsym Control+Mod1+bracketright exec i3lock -c 000000
 bindsym Control+Mod1+Delete exec i3-sensible-terminal -e 'sh $scripts/setup.sh off'
@@ -163,20 +161,6 @@ bindsym Mod4+b exec mousepad
 
 bindsym --release Mod4+u exec sh $scripts/shortcuts.sh searchbar
 
-####Function keys
-#bindsym F1 exec playerctl play-pause
-#bindsym F2 exec playerctl stop
-#bindsym F3 exec playerctl previous
-#bindsym F4 exec playerctl next
-#bindsym F5 exec --no-startup-id pactl set-sink-mute 0 toggle
-#bindsym F6 exec --no-startup-id pactl set-sink-volume 0 -5%
-#bindsym F7 exec --no-startup-id pactl set-sink-volume 0 +5%
-#bindsym --release F8 exec xdotool key Shift+Alt+b
-#bindsym --release F8 exec xdotool key s
-#bindsym --release F3 exec xdotool key p
-#bindsym --release F4 exec xdotool key n
-#bindsym --release F1 exec xdotool key space
-
 #########XP-pen
 #bindsym Mod1+Up exec sh $scripts/remote/xp.sh q_up
 #bindsym Mod1+Down exec sh $scripts/remote/xp.sh q_down
@@ -194,24 +178,17 @@ bindsym --release Mod1+0 exec sh $scripts/remote/xp.sh k10
 
 ####startup
 exec --no-startup-id sh $scripts/init.sh
-#workspace 1 output HDMI-2
-#workspace 2 output DP-5
-#workspace 3 output DP-6
-
-workspace 1 output HDMI-A-0
-workspace 2 output DisplayPort-1
-workspace 3 output DisplayPort-2
+workspace 1 output HDMI-1
+workspace 2 output DP-2
+workspace 3 output DP-3
 
 exec_always --no-startup-id feh --bg-scale /home/fred/Pictures/wallpaper/800252.png
+exec i3-sensible-terminal -e 'vpn'
 exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 
 exec --no-startup-id xset dpms 0 0 600 &
 exec --no-startup-id xss-lock -- i3lock -c 000000 &
-#exec --no-startup-id numlockx o
-exec_always --no-startup-id exec sh $scripts/setup.sh sync
 exec --no-startup-id xbindkeys
 exec --no-startup-id i3-msg 'workspace 3; exec firefox'
 exec --no-startup-id solaar --window=hide
 exec --no-startup-id input-remapper-control --command autoload
-#exec --no-startup-id /usr/lib/pentablet/PenTablet
-#for_window [class="PenTablet"] move scratchpad

dotfiles/nvim/lua/community.lua

@@ -1,4 +1,4 @@
-if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+-- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
 
 -- AstroCommunity: import any community modules here
 -- We import this file in `lazy_setup.lua` before the `plugins/` folder.
@@ -8,5 +8,12 @@ if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
 return {
   "AstroNvim/astrocommunity",
   { import = "astrocommunity.pack.lua" },
+  { import = "astrocommunity.pack.html-css" },
+  { import = "astrocommunity.pack.typescript" },
+  { import = "astrocommunity.comment.ts-comments-nvim" },
+  { import = "astrocommunity.pack.yaml" },
+  { import = "astrocommunity.pack.tailwindcss" },
+  -- { import = "astrocommunity.pack.nix" },
+  -- { import = "astrocommunity.pack.ruby" },
   -- import/override with your plugins folder
 }