.

12 files changed, 95 insertions, 11 deletions

diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc
index 99cc457..848f919 100755
--- a/bspwm/bspwmrc
+++ b/bspwm/bspwmrc
@@ -21,3 +21,6 @@ bspc config gapless_monocle          true
 
 bspc rule -a *:tmux_term desktop=term
 
+
+dbus-update-activation-environment --systemd --all
+systemctl --user restart plasma-kactivitymanagerd.service
diff --git a/install.sh b/install.sh
index 11b5ec8..91c4206 100755
--- a/install.sh
+++ b/install.sh
@@ -111,10 +111,17 @@ install_python_venv python3.8
 install_python_venv python3.9
 install_python_venv python3.10
 
+# qt-designer
+symlink ~/.dotfiles/qt-designer/qt-designer.desktop \
+        ~/.local/share/applications/qt-designer.desktop
+
 # qutebrowser
 mkdir -p ~/.config/qutebrowser
 symlink ~/.dotfiles/qutebrowser/autoconfig.yml ~/.config/qutebrowser/autoconfig.yml
 
+# radio
+symlink ~/.dotfiles/radio/student ~/bin/radio-student
+
 # ranger
 mkdir -p ~/.config/ranger
 symlink ~/.dotfiles/ranger/rc.conf ~/.config/ranger/rc.conf
diff --git a/qt-designer/qt-designer.desktop b/qt-designer/qt-designer.desktop
new file mode 100755
index 0000000..6e81c50
--- /dev/null
+++ b/qt-designer/qt-designer.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Application
+Name=Qt6 Designer
+Exec=/home/bozo/opt/python310/lib/python3.10/site-packages/PySide6/designer
+Terminal=false
+Categories=Development;
diff --git a/radio/student b/radio/student
new file mode 100755
index 0000000..c9c9bf9
--- /dev/null
+++ b/radio/student
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+URL=http://161.53.122.184:8000/AAC128.aac
+
+mplayer -ao pulse -quiet $URL | ts '[%Y-%m-%d %H:%M:%S]'
diff --git a/river/init b/river/init
index 91c0156..341389b 100755
--- a/river/init
+++ b/river/init
@@ -9,7 +9,7 @@ riverctl map-pointer normal $mod BTN_LEFT move-view
 riverctl map-pointer normal $mod BTN_RIGHT resize-view
 
 riverctl map normal $mod Return spawn alacritty
-riverctl map normal $mod Space spawn 'wofi --show drun'
+riverctl map normal $mod Space spawn 'wofi --show drun --allow-images --allow-markup --gtk-dark'
 
 riverctl map normal $mod+Shift E exit
 riverctl map normal $mod+Shift Q close
@@ -26,6 +26,22 @@ done
 
 riverctl focus-follows-cursor normal
 riverctl set-cursor-wrap on-output-change
+riverctl xcursor-theme default 32
+
 riverctl default-layout rivertile
 
+# export GDK_DPI_SCALE=0.95
+gsettings set org.gnome.desktop.interface scaling-factor 1
+gsettings set org.gnome.desktop.interface text-scaling-factor 1
+gsettings set org.gnome.desktop.interface cursor-size 32
+
+export QT_QPA_PLATFORM=wayland
+systemctl --user import-environment \
+    QT_QPA_PLATFORM \
+    WAYLAND_DISPLAY \
+    XDG_SESSION_TYPE
+dbus-update-activation-environment --systemd --all
+
+systemctl --user restart plasma-kactivitymanagerd.service
+
 exec rivertile
diff --git a/shell/.profile b/shell/.profile
index eda4c94..d24656e 100644
--- a/shell/.profile
+++ b/shell/.profile
@@ -8,6 +8,18 @@ prepend_path () {
     esac
 }
 
+
+_GUIX_PROFILE=~/.config/guix/current
+export GUIX_PROFILE=~/.guix-profile
+export GUIX_LOCPATH=$GUIX_PROFILE/lib/locale
+
+export INFOPATH=$_GUIX_PROFILE/share/info:$INFOPATH
+export XDG_DATA_DIRS=$GUIX_PROFILE/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}
+
+prepend_path $_GUIX_PROFILE/bin
+[ -f $GUIX_PROFILE/etc/profile ] && . $GUIX_PROFILE/etc/profile
+
+
 # export ATOM_NODE_URL=http://gh-contractor-zcbenz.s3.amazonaws.com/atom-shell/dist
 # export CHICKEN_REPOSITORY=~/programs/chicken_repository
 # export GDK_BACKEND=wayland
@@ -22,6 +34,7 @@ export EDITOR=nvim
 export QT_QPA_PLATFORMTHEME=qt5ct
 export VISUAL=nvim
 
+
 prepend_path ~/opt/janet/bin
 prepend_path ~/opt/python310/bin
 prepend_path ~/bin
diff --git a/shell/zsh/.zshrc b/shell/zsh/.zshrc
index 1ecf9a2..261b166 100644
--- a/shell/zsh/.zshrc
+++ b/shell/zsh/.zshrc
@@ -15,6 +15,8 @@ PROMPT='[%F{green}%n%f@%m %F{green}%~%f $(git_super_status)]$ '
 
 . ~/.dotfiles/shell/zsh/fzf/key-bindings.zsh
 
+. ~/.dotfiles/shell/zsh/broot.zsh
+
 . /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
 . /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 . /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
diff --git a/shell/zsh/broot.zsh b/shell/zsh/broot.zsh
new file mode 100644
index 0000000..44cee96
--- /dev/null
+++ b/shell/zsh/broot.zsh
@@ -0,0 +1,21 @@
+
+# This script was automatically generated by the broot program
+# More information can be found in https://github.com/Canop/broot
+# This function starts broot and executes the command
+# it produces, if any.
+# It's needed because some shell commands, like `cd`,
+# have no useful effect if executed in a subshell.
+function br {
+    local cmd cmd_file code
+    cmd_file=$(mktemp)
+    if broot --outcmd "$cmd_file" "$@"; then
+        cmd=$(<"$cmd_file")
+        rm -f "$cmd_file"
+        eval "$cmd"
+    else
+        code=$?
+        rm -f "$cmd_file"
+        return "$code"
+    fi
+}
+
diff --git a/sublime-text/Preferences.sublime-settings b/sublime-text/Preferences.sublime-settings
index e33b7bf..dc53eaf 100644
--- a/sublime-text/Preferences.sublime-settings
+++ b/sublime-text/Preferences.sublime-settings
@@ -44,7 +44,7 @@
 	[
 	],
 	"font_face": "Roboto Mono",
-	"font_size": 12,
+	"font_size": 13,
 	"highlight_line": true,
 	"highlight_modified_tabs": true,
 	"ignored_packages":
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index a23dac9..60ce1c0 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -34,6 +34,7 @@ set -g status-style "fg=black,bg=colour34"
 bind-key 'Up' select-pane -P 'fg=white,bg=black'
 bind-key 'Down' select-pane -P 'fg=black,bg=white'
 
+set -g status-right "%Y-%m-%d %H:%M"
 
 bind-key ] run "sh ~/.dotfiles/tmux/paste.sh"
 
diff --git a/vim/.vimrc b/vim/.vimrc
index c3614fe..fefdf10 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -39,6 +39,8 @@ Plug 'majutsushi/tagbar'
 Plug 'xolox/vim-misc'
 Plug 'vim-scripts/paredit.vim'
 Plug 'ryanoasis/vim-devicons'
+Plug 'ms-jpq/chadtree', {'branch': 'chad', 'do': 'python3 -m chadtree deps'}
+Plug 'https://git.sr.ht/~sircmpwn/hare.vim'
 
 "Plug 'tpope/vim-fugitive.git'
 "Plug 'severin-lemaignan/vim-minimap'
diff --git a/vim/plug.vim b/vim/plug.vim
index 8a195d3..652caa8 100644
--- a/vim/plug.vim
+++ b/vim/plug.vim
@@ -352,7 +352,7 @@ function! plug#end()
   endif
   let lod = { 'ft': {}, 'map': {}, 'cmd': {} }
 
-  if exists('g:did_load_filetypes')
+  if get(g:, 'did_load_filetypes', 0)
     filetype off
   endif
   for name in g:plugs_order
@@ -2621,26 +2621,34 @@ function! s:preview_commit()
 
   let sha = matchstr(getline('.'), '^  \X*\zs[0-9a-f]\{7,9}')
   if empty(sha)
-    return
+    let name = matchstr(getline('.'), '^- \zs[^:]*\ze:$')
+    if empty(name)
+      return
+    endif
+    let title = 'HEAD@{1}..'
+    let command = 'git diff --no-color HEAD@{1}'
+  else
+    let title = sha
+    let command = 'git show --no-color --pretty=medium '.sha
+    let name = s:find_name(line('.'))
   endif
 
-  let name = s:find_name(line('.'))
   if empty(name) || !has_key(g:plugs, name) || !isdirectory(g:plugs[name].dir)
     return
   endif
 
   if exists('g:plug_pwindow') && !s:is_preview_window_open()
     execute g:plug_pwindow
-    execute 'e' sha
+    execute 'e' title
   else
-    execute 'pedit' sha
+    execute 'pedit' title
     wincmd P
   endif
-  setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable
+  setlocal previewwindow filetype=git buftype=nofile bufhidden=wipe nobuflisted modifiable
   let batchfile = ''
   try
     let [sh, shellcmdflag, shrd] = s:chsh(1)
-    let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
+    let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && '.command
     if s:is_win
       let [batchfile, cmd] = s:batchfile(cmd)
     endif
@@ -2766,9 +2774,9 @@ function! s:snapshot(force, ...) abort
   1
   let anchor = line('$') - 3
   let names = sort(keys(filter(copy(g:plugs),
-        \'has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)')))
+        \'has_key(v:val, "uri") && isdirectory(v:val.dir)')))
   for name in reverse(names)
-    let sha = s:git_revision(g:plugs[name].dir)
+    let sha = has_key(g:plugs[name], 'commit') ? g:plugs[name].commit : s:git_revision(g:plugs[name].dir)
     if !empty(sha)
       call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha))
       redraw