Move to sx instead of startx

2024-08-15 00:43:28 +00:00 · 2023-07-11 15:28:11 +01:00 · 2023-07-11 15:28:11 +01:00 · b85872dfc9
commit b85872dfc9
parent afda5cf53f
103 changed files with 767 additions and 67 deletions
--- a/4
+++ b/4
@ -5,7 +5,7 @@
 ! #define spacing -2

 #define font1 xft:mononoki:minispace=False:size=10:antialias=true
-#define spacing 1
+#define spacing 2

 #define font2 xft:MesloLGM Nerd Font Mono:minispace=False:size=10
 #define font3 xft:Noto Sans Mono CJK TC:minispace=False:size=10
@ -55,7 +55,7 @@ dzen2.font: mononoki
 ! Set depth to make transparency work.
 URxvt*depth: 32

-*.font: font1
+*.font: font1,font2,font3,font4
 URxvt.font: font1,font2,font3,font4
 URxvt.boldFont: font1:style=bold,font2:style=bold,font3:style=bold,font4
 URxvt.italicFont:font1:style=italic,font2:style=italic,font3:style=italic,font4
--- a/config/bspwm/bspwmrc
+++ b/config/bspwm/bspwmrc
@ -11,7 +11,7 @@ xsetroot -cursor_name left_ptr &
 xrdb ~/.Xdefaults

 pgrep -x sxhkd > /dev/null || sxhkd &
-pgrep -x picom > /dev/null || picom &
+#pgrep -x picom > /dev/null || picom &
 pgrep -x xss-lock > /dev/null || xss-lock slock &
 #pgrep -x bg.sh > /dev/null || $HOME/.scripts/bg.sh > /dev/null &

--- a/config/gtk-3.0/bookmarks
+++ b/config/gtk-3.0/bookmarks
@ -1,3 +1,4 @@
+file:///home/david/docs/lmms
 file:///home/x/pics/screenshot
 file:///home/david/hd1/important
 file:///home/david/docs docs
--- a/config/polybar/config
+++ b/config/polybar/config
@ -40,7 +40,7 @@ modules-right		      = time

 [bar/ws]
 inherit                   = bar/base
-width                     = 1870
+width                     = 2510
 offset-x                  = 25
 offset-y                  = 10
 modules-left              = workspaces xwindow
@ -153,7 +153,7 @@ format-prefix-foreground = #5b

 [module/temperature]
 type = custom/script
-exec = sensors | awk '/^Core 0:/ { print substr($3, 2) }'
+exec = sensors | awk '/^Tctl:/ { print substr($2, 2) }'
 format-prefix = " "
 interval = 1

--- a/config/sx/sxrc
+++ b/config/sx/sxrc
@ -0,0 +1,4 @@
+xrdb ~/.config/Xdefaults
+setxkbmap -option caps:none
+exec bspwm
+
--- a/config/vim/vimrc
+++ b/config/vim/vimrc
@ -50,6 +50,7 @@ Plug 'preservim/vim-markdown'


 Plug 'neoclide/coc.nvim'
+hi CocInlayHint ctermbg=Black ctermfg=Gray                                                         

 set updatetime=300
 set signcolumn=yes
--- a/deploy.sh
+++ b/deploy.sh
@ -1,6 +1,6 @@
 #!/bin/sh

-configurations="iocane bg bg.gif bspwm cava neofetch mpd mpv ncmpcpp vim sxhkd polybar picom rofi user-dirs.dirs gtk-3.0 zathura"
+configurations="iocane bg bg.gif bspwm cava neofetch mpd mpv ncmpcpp vim sxhkd polybar picom rofi user-dirs.dirs gtk-3.0 zathura sx"


 save () {
@ -15,8 +15,7 @@ save () {
    cp $HOME/.profile profile
    cp $HOME/.mkshrc mkshrc
    cp $HOME/.sh_aliases sh_aliases
-    cp $HOME/.Xdefaults Xdefaults
-    cp $HOME/.xinitrc xinitrc
+    cp $HOME/.config/Xdefaults Xdefaults

    mkdir -p fonts/TTF
    cp -r $HOME/.fonts/ttf-mononoki fonts/
@ -59,8 +58,7 @@ load () {
        cp mkshrc $HOME/.mkshrc
        cp sh_aliases $HOME/.sh_aliases

-        cp Xdefaults $HOME/.Xdefaults
-        cp xinitrc $HOME/.xinitrc
+        cp Xdefaults $HOME/.config/Xdefaults
        cp profile $HOME/.profile

        mkdir -p $HOME/.fonts
--- a/icons/cursor.theme
+++ b/icons/cursor.theme
@ -1,2 +0,0 @@
-[Icon Theme]
-Inherits=pixelfun3
--- a/icons/cursors/00008160000006810000408080010102
+++ b/icons/cursors/00008160000006810000408080010102
@ -1 +0,0 @@
-v_double_arrow
--- a/icons/cursors/028006030e0e7ebffc7f7070c0600140
+++ b/icons/cursors/028006030e0e7ebffc7f7070c0600140
@ -1 +0,0 @@
-h_double_arrow
--- a/icons/cursors/03b6e0fcb3499374a867c041f52298f0
+++ b/icons/cursors/03b6e0fcb3499374a867c041f52298f0
@ -1 +0,0 @@
-crossed_circle
--- a/icons/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
+++ b/icons/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
@ -1 +0,0 @@
-left_ptr_watch
--- a/icons/cursors/1081e37283d90000800003c07f3ef6bf
+++ b/icons/cursors/1081e37283d90000800003c07f3ef6bf
@ -1 +0,0 @@
-copy
--- a/icons/cursors/14fef782d02440884392942c11205230
+++ b/icons/cursors/14fef782d02440884392942c11205230
@ -1 +0,0 @@
-sb_h_double_arrow
--- a/icons/cursors/2870a09082c103050810ffdffffe0204
+++ b/icons/cursors/2870a09082c103050810ffdffffe0204
@ -1 +0,0 @@
-sb_v_double_arrow
--- a/icons/cursors/3085a0e285430894940527032f8b26df
+++ b/icons/cursors/3085a0e285430894940527032f8b26df
@ -1 +0,0 @@
-link
--- a/icons/cursors/3ecb610c1bf2410f44200f48c40d3599
+++ b/icons/cursors/3ecb610c1bf2410f44200f48c40d3599
@ -1 +0,0 @@
-left_ptr_watch
--- a/icons/cursors/4498f0e0c1937ffe01fd06f973665830
+++ b/icons/cursors/4498f0e0c1937ffe01fd06f973665830
@ -1 +0,0 @@
-move
--- a/icons/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408
+++ b/icons/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408
@ -1 +0,0 @@
-question_arrow
--- a/icons/cursors/6407b0e94181790501fd1e167b474872
+++ b/icons/cursors/6407b0e94181790501fd1e167b474872
@ -1 +0,0 @@
-copy
--- a/icons/cursors/640fb0e74195791501fd1ed57b41487f
+++ b/icons/cursors/640fb0e74195791501fd1ed57b41487f
@ -1 +0,0 @@
-link
--- a/icons/cursors/9081237383d90e509aa00f00170e968f
+++ b/icons/cursors/9081237383d90e509aa00f00170e968f
@ -1 +0,0 @@
-move
--- a/icons/cursors/9d800788f1b08800ae810202380a0822
+++ b/icons/cursors/9d800788f1b08800ae810202380a0822
@ -1 +0,0 @@
-hand2
--- a/icons/cursors/X_cursor
+++ b/icons/cursors/X_cursor
@ -1 +0,0 @@
-crossed_circle
--- a/icons/cursors/arrow
+++ b/icons/cursors/arrow
@ -1 +0,0 @@
-left_ptr
--- a/icons/cursors/bd_double_arrow
+++ b/icons/cursors/bd_double_arrow
@ -1 +0,0 @@
-top_left_corner
--- a/icons/cursors/bottom_left_corner
+++ b/icons/cursors/bottom_left_corner
@ -1 +0,0 @@
-top_right_corner
--- a/icons/cursors/bottom_right_corner
+++ b/icons/cursors/bottom_right_corner
@ -1 +0,0 @@
-top_left_corner
--- a/icons/cursors/bottom_side
+++ b/icons/cursors/bottom_side
@ -1 +0,0 @@
-top_side
--- a/icons/cursors/bottom_tee
+++ b/icons/cursors/bottom_tee
--- a/icons/cursors/c7088f0f3e6c8088236ef8e1e3e70000
+++ b/icons/cursors/c7088f0f3e6c8088236ef8e1e3e70000
@ -1 +0,0 @@
-bd_double_arrow
--- a/icons/cursors/circle
+++ b/icons/cursors/circle
--- a/icons/cursors/color-picker
+++ b/icons/cursors/color-picker
--- a/icons/cursors/copy
+++ b/icons/cursors/copy
--- a/icons/cursors/cross
+++ b/icons/cursors/cross
--- a/icons/cursors/cross_reverse
+++ b/icons/cursors/cross_reverse
@ -1 +0,0 @@
-cross
--- a/icons/cursors/crossed_circle
+++ b/icons/cursors/crossed_circle
--- a/icons/cursors/crosshair
+++ b/icons/cursors/crosshair
@ -1 +0,0 @@
-cross
--- a/icons/cursors/d9ce0ab605698f320427677b458ad60b
+++ b/icons/cursors/d9ce0ab605698f320427677b458ad60b
@ -1 +0,0 @@
-question_arrow
--- a/icons/cursors/diamond_cross
+++ b/icons/cursors/diamond_cross
@ -1 +0,0 @@
-cross
--- a/icons/cursors/dnd-ask
+++ b/icons/cursors/dnd-ask
--- a/icons/cursors/dnd-copy
+++ b/icons/cursors/dnd-copy
--- a/icons/cursors/dnd-link
+++ b/icons/cursors/dnd-link
--- a/icons/cursors/dnd-move
+++ b/icons/cursors/dnd-move
--- a/icons/cursors/dnd-none
+++ b/icons/cursors/dnd-none
--- a/icons/cursors/dot_box_mask
+++ b/icons/cursors/dot_box_mask
@ -1 +0,0 @@
-dotbox
--- a/icons/cursors/dotbox
+++ b/icons/cursors/dotbox
--- a/icons/cursors/double_arrow
+++ b/icons/cursors/double_arrow
@ -1 +0,0 @@
-sb_v_double_arrow
--- a/icons/cursors/draft_large
+++ b/icons/cursors/draft_large
@ -1 +0,0 @@
-right_ptr
--- a/icons/cursors/draft_small
+++ b/icons/cursors/draft_small
@ -1 +0,0 @@
-right_ptr
--- a/icons/cursors/draped_box
+++ b/icons/cursors/draped_box
@ -1 +0,0 @@
-dotbox
--- a/icons/cursors/e29285e634086352946a0e7090d73106
+++ b/icons/cursors/e29285e634086352946a0e7090d73106
@ -1 +0,0 @@
-hand2
--- a/icons/cursors/fcf1c3c7cd4491d801f1e1c78f100000
+++ b/icons/cursors/fcf1c3c7cd4491d801f1e1c78f100000
@ -1 +0,0 @@
-fd_double_arrow
--- a/icons/cursors/fd_double_arrow
+++ b/icons/cursors/fd_double_arrow
@ -1 +0,0 @@
-top_right_corner
--- a/icons/cursors/fleur
+++ b/icons/cursors/fleur
@ -1 +0,0 @@
-grabbing
--- a/icons/cursors/grabbing
+++ b/icons/cursors/grabbing
--- a/icons/cursors/h_double_arrow
+++ b/icons/cursors/h_double_arrow
@ -1 +0,0 @@
-sb_h_double_arrow
--- a/icons/cursors/hand
+++ b/icons/cursors/hand
@ -1 +0,0 @@
-hand2
--- a/icons/cursors/hand1
+++ b/icons/cursors/hand1
@ -1 +0,0 @@
-hand2
--- a/icons/cursors/hand2
+++ b/icons/cursors/hand2
--- a/icons/cursors/help
+++ b/icons/cursors/help
@ -1 +0,0 @@
-question_arrow
--- a/icons/cursors/icon
+++ b/icons/cursors/icon
@ -1 +0,0 @@
-dotbox
--- a/icons/cursors/left_ptr
+++ b/icons/cursors/left_ptr
--- a/icons/cursors/left_ptr_help
+++ b/icons/cursors/left_ptr_help
--- a/icons/cursors/left_ptr_watch
+++ b/icons/cursors/left_ptr_watch
--- a/icons/cursors/left_side
+++ b/icons/cursors/left_side
--- a/icons/cursors/left_tee
+++ b/icons/cursors/left_tee
--- a/icons/cursors/link
+++ b/icons/cursors/link
--- a/icons/cursors/ll_angle
+++ b/icons/cursors/ll_angle
--- a/icons/cursors/lr_angle
+++ b/icons/cursors/lr_angle
--- a/icons/cursors/move
+++ b/icons/cursors/move
--- a/icons/cursors/pencil
+++ b/icons/cursors/pencil
--- a/icons/cursors/pirate
+++ b/icons/cursors/pirate
@ -1 +0,0 @@
-X_cursor
--- a/icons/cursors/plus
+++ b/icons/cursors/plus
--- a/icons/cursors/question_arrow
+++ b/icons/cursors/question_arrow
--- a/icons/cursors/right_ptr
+++ b/icons/cursors/right_ptr
--- a/icons/cursors/right_side
+++ b/icons/cursors/right_side
@ -1 +0,0 @@
-left_side
--- a/icons/cursors/right_tee
+++ b/icons/cursors/right_tee
--- a/icons/cursors/sb_down_arrow
+++ b/icons/cursors/sb_down_arrow
--- a/icons/cursors/sb_h_double_arrow
+++ b/icons/cursors/sb_h_double_arrow
@ -1 +0,0 @@
-left_side
--- a/icons/cursors/sb_left_arrow
+++ b/icons/cursors/sb_left_arrow
--- a/icons/cursors/sb_right_arrow
+++ b/icons/cursors/sb_right_arrow
--- a/icons/cursors/sb_up_arrow
+++ b/icons/cursors/sb_up_arrow
--- a/icons/cursors/sb_v_double_arrow
+++ b/icons/cursors/sb_v_double_arrow
@ -1 +0,0 @@
-top_side
--- a/icons/cursors/target
+++ b/icons/cursors/target
@ -1 +0,0 @@
-dotbox
--- a/icons/cursors/tcross
+++ b/icons/cursors/tcross
@ -1 +0,0 @@
-cross
--- a/icons/cursors/top_left_arrow
+++ b/icons/cursors/top_left_arrow
@ -1 +0,0 @@
-left_ptr
--- a/icons/cursors/top_left_corner
+++ b/icons/cursors/top_left_corner
--- a/icons/cursors/top_right_corner
+++ b/icons/cursors/top_right_corner
--- a/icons/cursors/top_side
+++ b/icons/cursors/top_side
--- a/icons/cursors/top_tee
+++ b/icons/cursors/top_tee
--- a/icons/cursors/ul_angle
+++ b/icons/cursors/ul_angle
--- a/icons/cursors/ur_angle
+++ b/icons/cursors/ur_angle
--- a/icons/cursors/v_double_arrow
+++ b/icons/cursors/v_double_arrow
@ -1 +0,0 @@
-sb_v_double_arrow
--- a/icons/cursors/watch
+++ b/icons/cursors/watch
--- a/icons/cursors/xterm
+++ b/icons/cursors/xterm
--- a/icons/index.theme
+++ b/icons/index.theme
@ -1,3 +0,0 @@
-[Icon Theme]
-Name=pixelfun3
-Comment=Good white modern-looking theme with a piece of nostalgia
--- a/4
+++ b/4
@ -14,5 +14,5 @@ export FILE_MANAGER="/usr/bin/thunar"
 export EMAIL_CLIENT="/usr/bin/thunderbird"
 export EDITOR="/usr/bin/vim"

-[ "$(fgconsole 2>/dev/null)" = "1" ] && exec startx -- vt1 &> /dev/null
-
+export XINITRC="$HOME/.config/sx/sxrc"
+[ "$(fgconsole 2>/dev/null)" = "1" ] && exec sx
--- a/scripts/ddc-switch-inputs
+++ b/scripts/ddc-switch-inputs
@ -15,5 +15,5 @@ case $1 in
      ;;
 esac

-ddcutil --bus=12 setvcp 60 ${OUT[0]} &
+ddcutil --bus=13 setvcp 60 ${OUT[0]} &
 wait
--- a/scripts/iommu.sh
+++ b/scripts/iommu.sh
@ -0,0 +1,8 @@
+#!/bin/bash
+shopt -s nullglob
+for g in $(find /sys/kernel/iommu_groups/* -maxdepth 0 -type d | sort -V); do
+    echo "IOMMU Group ${g##*/}:"
+    for d in $g/devices/*; do
+        echo -e "\t$(lspci $@ -nns ${d##*/})"
+    done;
+done;
--- a/Show more
+++ b/Show more