diff --git a/Xdefaults b/Xdefaults index ae6f395..5362be3 100644 --- a/Xdefaults +++ b/Xdefaults @@ -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 diff --git a/config/bspwm/bspwmrc b/config/bspwm/bspwmrc index b78963a..3845a00 100755 --- 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 & diff --git a/config/gtk-3.0/bookmarks b/config/gtk-3.0/bookmarks index 3bdccb3..f1aa247 100644 --- 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 diff --git a/config/polybar/config b/config/polybar/config index 8b16e9b..213b86c 100644 --- 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 diff --git a/config/sx/sxrc b/config/sx/sxrc new file mode 100755 index 0000000..a95a311 --- /dev/null +++ b/config/sx/sxrc @@ -0,0 +1,4 @@ +xrdb ~/.config/Xdefaults +setxkbmap -option caps:none +exec bspwm + diff --git a/config/vim/vimrc b/config/vim/vimrc index 5bb2e7d..1850986 100644 --- 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 diff --git a/deploy.sh b/deploy.sh index 3cbaea2..acc9f45 100755 --- 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 diff --git a/icons/cursor.theme b/icons/cursor.theme deleted file mode 100644 index b8f2118..0000000 --- a/icons/cursor.theme +++ /dev/null @@ -1,2 +0,0 @@ -[Icon Theme] -Inherits=pixelfun3 diff --git a/icons/cursors/00008160000006810000408080010102 b/icons/cursors/00008160000006810000408080010102 deleted file mode 120000 index 127e1c0..0000000 --- a/icons/cursors/00008160000006810000408080010102 +++ /dev/null @@ -1 +0,0 @@ -v_double_arrow \ No newline at end of file diff --git a/icons/cursors/028006030e0e7ebffc7f7070c0600140 b/icons/cursors/028006030e0e7ebffc7f7070c0600140 deleted file mode 120000 index 1ffc159..0000000 --- a/icons/cursors/028006030e0e7ebffc7f7070c0600140 +++ /dev/null @@ -1 +0,0 @@ -h_double_arrow \ No newline at end of file diff --git a/icons/cursors/03b6e0fcb3499374a867c041f52298f0 b/icons/cursors/03b6e0fcb3499374a867c041f52298f0 deleted file mode 120000 index 01c907d..0000000 --- a/icons/cursors/03b6e0fcb3499374a867c041f52298f0 +++ /dev/null @@ -1 +0,0 @@ -crossed_circle \ No newline at end of file diff --git a/icons/cursors/08e8e1c95fe2fc01f976f1e063a24ccd b/icons/cursors/08e8e1c95fe2fc01f976f1e063a24ccd deleted file mode 120000 index b0e6589..0000000 --- a/icons/cursors/08e8e1c95fe2fc01f976f1e063a24ccd +++ /dev/null @@ -1 +0,0 @@ -left_ptr_watch \ No newline at end of file diff --git a/icons/cursors/1081e37283d90000800003c07f3ef6bf b/icons/cursors/1081e37283d90000800003c07f3ef6bf deleted file mode 120000 index 88740b2..0000000 --- a/icons/cursors/1081e37283d90000800003c07f3ef6bf +++ /dev/null @@ -1 +0,0 @@ -copy \ No newline at end of file diff --git a/icons/cursors/14fef782d02440884392942c11205230 b/icons/cursors/14fef782d02440884392942c11205230 deleted file mode 120000 index baba492..0000000 --- a/icons/cursors/14fef782d02440884392942c11205230 +++ /dev/null @@ -1 +0,0 @@ -sb_h_double_arrow \ No newline at end of file diff --git a/icons/cursors/2870a09082c103050810ffdffffe0204 b/icons/cursors/2870a09082c103050810ffdffffe0204 deleted file mode 120000 index a3693c3..0000000 --- a/icons/cursors/2870a09082c103050810ffdffffe0204 +++ /dev/null @@ -1 +0,0 @@ -sb_v_double_arrow \ No newline at end of file diff --git a/icons/cursors/3085a0e285430894940527032f8b26df b/icons/cursors/3085a0e285430894940527032f8b26df deleted file mode 120000 index c150ede..0000000 --- a/icons/cursors/3085a0e285430894940527032f8b26df +++ /dev/null @@ -1 +0,0 @@ -link \ No newline at end of file diff --git a/icons/cursors/3ecb610c1bf2410f44200f48c40d3599 b/icons/cursors/3ecb610c1bf2410f44200f48c40d3599 deleted file mode 120000 index b0e6589..0000000 --- a/icons/cursors/3ecb610c1bf2410f44200f48c40d3599 +++ /dev/null @@ -1 +0,0 @@ -left_ptr_watch \ No newline at end of file diff --git a/icons/cursors/4498f0e0c1937ffe01fd06f973665830 b/icons/cursors/4498f0e0c1937ffe01fd06f973665830 deleted file mode 120000 index d6a0af6..0000000 --- a/icons/cursors/4498f0e0c1937ffe01fd06f973665830 +++ /dev/null @@ -1 +0,0 @@ -move \ No newline at end of file diff --git a/icons/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408 b/icons/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408 deleted file mode 120000 index cc9a7ed..0000000 --- a/icons/cursors/5c6cd98b3f3ebcb1f9c7f1c204630408 +++ /dev/null @@ -1 +0,0 @@ -question_arrow \ No newline at end of file diff --git a/icons/cursors/6407b0e94181790501fd1e167b474872 b/icons/cursors/6407b0e94181790501fd1e167b474872 deleted file mode 120000 index 88740b2..0000000 --- a/icons/cursors/6407b0e94181790501fd1e167b474872 +++ /dev/null @@ -1 +0,0 @@ -copy \ No newline at end of file diff --git a/icons/cursors/640fb0e74195791501fd1ed57b41487f b/icons/cursors/640fb0e74195791501fd1ed57b41487f deleted file mode 120000 index c150ede..0000000 --- a/icons/cursors/640fb0e74195791501fd1ed57b41487f +++ /dev/null @@ -1 +0,0 @@ -link \ No newline at end of file diff --git a/icons/cursors/9081237383d90e509aa00f00170e968f b/icons/cursors/9081237383d90e509aa00f00170e968f deleted file mode 120000 index d6a0af6..0000000 --- a/icons/cursors/9081237383d90e509aa00f00170e968f +++ /dev/null @@ -1 +0,0 @@ -move \ No newline at end of file diff --git a/icons/cursors/9d800788f1b08800ae810202380a0822 b/icons/cursors/9d800788f1b08800ae810202380a0822 deleted file mode 120000 index 0b08654..0000000 --- a/icons/cursors/9d800788f1b08800ae810202380a0822 +++ /dev/null @@ -1 +0,0 @@ -hand2 \ No newline at end of file diff --git a/icons/cursors/X_cursor b/icons/cursors/X_cursor deleted file mode 120000 index 01c907d..0000000 --- a/icons/cursors/X_cursor +++ /dev/null @@ -1 +0,0 @@ -crossed_circle \ No newline at end of file diff --git a/icons/cursors/arrow b/icons/cursors/arrow deleted file mode 120000 index 0de4e80..0000000 --- a/icons/cursors/arrow +++ /dev/null @@ -1 +0,0 @@ -left_ptr \ No newline at end of file diff --git a/icons/cursors/bd_double_arrow b/icons/cursors/bd_double_arrow deleted file mode 120000 index be1ee95..0000000 --- a/icons/cursors/bd_double_arrow +++ /dev/null @@ -1 +0,0 @@ -top_left_corner \ No newline at end of file diff --git a/icons/cursors/bottom_left_corner b/icons/cursors/bottom_left_corner deleted file mode 120000 index 19274a2..0000000 --- a/icons/cursors/bottom_left_corner +++ /dev/null @@ -1 +0,0 @@ -top_right_corner \ No newline at end of file diff --git a/icons/cursors/bottom_right_corner b/icons/cursors/bottom_right_corner deleted file mode 120000 index be1ee95..0000000 --- a/icons/cursors/bottom_right_corner +++ /dev/null @@ -1 +0,0 @@ -top_left_corner \ No newline at end of file diff --git a/icons/cursors/bottom_side b/icons/cursors/bottom_side deleted file mode 120000 index 83cc946..0000000 --- a/icons/cursors/bottom_side +++ /dev/null @@ -1 +0,0 @@ -top_side \ No newline at end of file diff --git a/icons/cursors/bottom_tee b/icons/cursors/bottom_tee deleted file mode 100644 index 370fe4b..0000000 Binary files a/icons/cursors/bottom_tee and /dev/null differ diff --git a/icons/cursors/c7088f0f3e6c8088236ef8e1e3e70000 b/icons/cursors/c7088f0f3e6c8088236ef8e1e3e70000 deleted file mode 120000 index a8afe37..0000000 --- a/icons/cursors/c7088f0f3e6c8088236ef8e1e3e70000 +++ /dev/null @@ -1 +0,0 @@ -bd_double_arrow \ No newline at end of file diff --git a/icons/cursors/circle b/icons/cursors/circle deleted file mode 100644 index 3fde812..0000000 Binary files a/icons/cursors/circle and /dev/null differ diff --git a/icons/cursors/color-picker b/icons/cursors/color-picker deleted file mode 100644 index ba2c456..0000000 Binary files a/icons/cursors/color-picker and /dev/null differ diff --git a/icons/cursors/copy b/icons/cursors/copy deleted file mode 100644 index d7d129c..0000000 Binary files a/icons/cursors/copy and /dev/null differ diff --git a/icons/cursors/cross b/icons/cursors/cross deleted file mode 100644 index 2f3deff..0000000 Binary files a/icons/cursors/cross and /dev/null differ diff --git a/icons/cursors/cross_reverse b/icons/cursors/cross_reverse deleted file mode 120000 index 982ae30..0000000 --- a/icons/cursors/cross_reverse +++ /dev/null @@ -1 +0,0 @@ -cross \ No newline at end of file diff --git a/icons/cursors/crossed_circle b/icons/cursors/crossed_circle deleted file mode 100644 index 4c57b48..0000000 Binary files a/icons/cursors/crossed_circle and /dev/null differ diff --git a/icons/cursors/crosshair b/icons/cursors/crosshair deleted file mode 120000 index 982ae30..0000000 --- a/icons/cursors/crosshair +++ /dev/null @@ -1 +0,0 @@ -cross \ No newline at end of file diff --git a/icons/cursors/d9ce0ab605698f320427677b458ad60b b/icons/cursors/d9ce0ab605698f320427677b458ad60b deleted file mode 120000 index cc9a7ed..0000000 --- a/icons/cursors/d9ce0ab605698f320427677b458ad60b +++ /dev/null @@ -1 +0,0 @@ -question_arrow \ No newline at end of file diff --git a/icons/cursors/diamond_cross b/icons/cursors/diamond_cross deleted file mode 120000 index 982ae30..0000000 --- a/icons/cursors/diamond_cross +++ /dev/null @@ -1 +0,0 @@ -cross \ No newline at end of file diff --git a/icons/cursors/dnd-ask b/icons/cursors/dnd-ask deleted file mode 100644 index f897fa4..0000000 Binary files a/icons/cursors/dnd-ask and /dev/null differ diff --git a/icons/cursors/dnd-copy b/icons/cursors/dnd-copy deleted file mode 100644 index 8c128de..0000000 Binary files a/icons/cursors/dnd-copy and /dev/null differ diff --git a/icons/cursors/dnd-link b/icons/cursors/dnd-link deleted file mode 100644 index a1942ed..0000000 Binary files a/icons/cursors/dnd-link and /dev/null differ diff --git a/icons/cursors/dnd-move b/icons/cursors/dnd-move deleted file mode 100644 index f932d07..0000000 Binary files a/icons/cursors/dnd-move and /dev/null differ diff --git a/icons/cursors/dnd-none b/icons/cursors/dnd-none deleted file mode 100644 index dcde4fa..0000000 Binary files a/icons/cursors/dnd-none and /dev/null differ diff --git a/icons/cursors/dot_box_mask b/icons/cursors/dot_box_mask deleted file mode 120000 index def8590..0000000 --- a/icons/cursors/dot_box_mask +++ /dev/null @@ -1 +0,0 @@ -dotbox \ No newline at end of file diff --git a/icons/cursors/dotbox b/icons/cursors/dotbox deleted file mode 100644 index 1de5515..0000000 Binary files a/icons/cursors/dotbox and /dev/null differ diff --git a/icons/cursors/double_arrow b/icons/cursors/double_arrow deleted file mode 120000 index a3693c3..0000000 --- a/icons/cursors/double_arrow +++ /dev/null @@ -1 +0,0 @@ -sb_v_double_arrow \ No newline at end of file diff --git a/icons/cursors/draft_large b/icons/cursors/draft_large deleted file mode 120000 index cb9c1b4..0000000 --- a/icons/cursors/draft_large +++ /dev/null @@ -1 +0,0 @@ -right_ptr \ No newline at end of file diff --git a/icons/cursors/draft_small b/icons/cursors/draft_small deleted file mode 120000 index cb9c1b4..0000000 --- a/icons/cursors/draft_small +++ /dev/null @@ -1 +0,0 @@ -right_ptr \ No newline at end of file diff --git a/icons/cursors/draped_box b/icons/cursors/draped_box deleted file mode 120000 index def8590..0000000 --- a/icons/cursors/draped_box +++ /dev/null @@ -1 +0,0 @@ -dotbox \ No newline at end of file diff --git a/icons/cursors/e29285e634086352946a0e7090d73106 b/icons/cursors/e29285e634086352946a0e7090d73106 deleted file mode 120000 index 0b08654..0000000 --- a/icons/cursors/e29285e634086352946a0e7090d73106 +++ /dev/null @@ -1 +0,0 @@ -hand2 \ No newline at end of file diff --git a/icons/cursors/fcf1c3c7cd4491d801f1e1c78f100000 b/icons/cursors/fcf1c3c7cd4491d801f1e1c78f100000 deleted file mode 120000 index 3d249d7..0000000 --- a/icons/cursors/fcf1c3c7cd4491d801f1e1c78f100000 +++ /dev/null @@ -1 +0,0 @@ -fd_double_arrow \ No newline at end of file diff --git a/icons/cursors/fd_double_arrow b/icons/cursors/fd_double_arrow deleted file mode 120000 index 19274a2..0000000 --- a/icons/cursors/fd_double_arrow +++ /dev/null @@ -1 +0,0 @@ -top_right_corner \ No newline at end of file diff --git a/icons/cursors/fleur b/icons/cursors/fleur deleted file mode 120000 index bc5dcc0..0000000 --- a/icons/cursors/fleur +++ /dev/null @@ -1 +0,0 @@ -grabbing \ No newline at end of file diff --git a/icons/cursors/grabbing b/icons/cursors/grabbing deleted file mode 100644 index 2133d77..0000000 Binary files a/icons/cursors/grabbing and /dev/null differ diff --git a/icons/cursors/h_double_arrow b/icons/cursors/h_double_arrow deleted file mode 120000 index baba492..0000000 --- a/icons/cursors/h_double_arrow +++ /dev/null @@ -1 +0,0 @@ -sb_h_double_arrow \ No newline at end of file diff --git a/icons/cursors/hand b/icons/cursors/hand deleted file mode 120000 index 0b08654..0000000 --- a/icons/cursors/hand +++ /dev/null @@ -1 +0,0 @@ -hand2 \ No newline at end of file diff --git a/icons/cursors/hand1 b/icons/cursors/hand1 deleted file mode 120000 index 0b08654..0000000 --- a/icons/cursors/hand1 +++ /dev/null @@ -1 +0,0 @@ -hand2 \ No newline at end of file diff --git a/icons/cursors/hand2 b/icons/cursors/hand2 deleted file mode 100644 index 34fd40c..0000000 Binary files a/icons/cursors/hand2 and /dev/null differ diff --git a/icons/cursors/help b/icons/cursors/help deleted file mode 120000 index cc9a7ed..0000000 --- a/icons/cursors/help +++ /dev/null @@ -1 +0,0 @@ -question_arrow \ No newline at end of file diff --git a/icons/cursors/icon b/icons/cursors/icon deleted file mode 120000 index def8590..0000000 --- a/icons/cursors/icon +++ /dev/null @@ -1 +0,0 @@ -dotbox \ No newline at end of file diff --git a/icons/cursors/left_ptr b/icons/cursors/left_ptr deleted file mode 100644 index bdcdf9b..0000000 Binary files a/icons/cursors/left_ptr and /dev/null differ diff --git a/icons/cursors/left_ptr_help b/icons/cursors/left_ptr_help deleted file mode 100644 index bb7407c..0000000 Binary files a/icons/cursors/left_ptr_help and /dev/null differ diff --git a/icons/cursors/left_ptr_watch b/icons/cursors/left_ptr_watch deleted file mode 100644 index cc93372..0000000 Binary files a/icons/cursors/left_ptr_watch and /dev/null differ diff --git a/icons/cursors/left_side b/icons/cursors/left_side deleted file mode 100644 index 341c3e6..0000000 Binary files a/icons/cursors/left_side and /dev/null differ diff --git a/icons/cursors/left_tee b/icons/cursors/left_tee deleted file mode 100644 index 673a0e1..0000000 Binary files a/icons/cursors/left_tee and /dev/null differ diff --git a/icons/cursors/link b/icons/cursors/link deleted file mode 100644 index ee33bea..0000000 Binary files a/icons/cursors/link and /dev/null differ diff --git a/icons/cursors/ll_angle b/icons/cursors/ll_angle deleted file mode 100644 index 68a8e73..0000000 Binary files a/icons/cursors/ll_angle and /dev/null differ diff --git a/icons/cursors/lr_angle b/icons/cursors/lr_angle deleted file mode 100644 index e13a7c3..0000000 Binary files a/icons/cursors/lr_angle and /dev/null differ diff --git a/icons/cursors/move b/icons/cursors/move deleted file mode 100644 index 4a01647..0000000 Binary files a/icons/cursors/move and /dev/null differ diff --git a/icons/cursors/pencil b/icons/cursors/pencil deleted file mode 100644 index 188d73f..0000000 Binary files a/icons/cursors/pencil and /dev/null differ diff --git a/icons/cursors/pirate b/icons/cursors/pirate deleted file mode 120000 index 7b84daf..0000000 --- a/icons/cursors/pirate +++ /dev/null @@ -1 +0,0 @@ -X_cursor \ No newline at end of file diff --git a/icons/cursors/plus b/icons/cursors/plus deleted file mode 100644 index 894ace4..0000000 Binary files a/icons/cursors/plus and /dev/null differ diff --git a/icons/cursors/question_arrow b/icons/cursors/question_arrow deleted file mode 100644 index f7479fb..0000000 Binary files a/icons/cursors/question_arrow and /dev/null differ diff --git a/icons/cursors/right_ptr b/icons/cursors/right_ptr deleted file mode 100644 index f4a0b4c..0000000 Binary files a/icons/cursors/right_ptr and /dev/null differ diff --git a/icons/cursors/right_side b/icons/cursors/right_side deleted file mode 120000 index 1d46245..0000000 --- a/icons/cursors/right_side +++ /dev/null @@ -1 +0,0 @@ -left_side \ No newline at end of file diff --git a/icons/cursors/right_tee b/icons/cursors/right_tee deleted file mode 100644 index bc528c5..0000000 Binary files a/icons/cursors/right_tee and /dev/null differ diff --git a/icons/cursors/sb_down_arrow b/icons/cursors/sb_down_arrow deleted file mode 100644 index 59ca02e..0000000 Binary files a/icons/cursors/sb_down_arrow and /dev/null differ diff --git a/icons/cursors/sb_h_double_arrow b/icons/cursors/sb_h_double_arrow deleted file mode 120000 index 1d46245..0000000 --- a/icons/cursors/sb_h_double_arrow +++ /dev/null @@ -1 +0,0 @@ -left_side \ No newline at end of file diff --git a/icons/cursors/sb_left_arrow b/icons/cursors/sb_left_arrow deleted file mode 100644 index fc6c526..0000000 Binary files a/icons/cursors/sb_left_arrow and /dev/null differ diff --git a/icons/cursors/sb_right_arrow b/icons/cursors/sb_right_arrow deleted file mode 100644 index 1b79604..0000000 Binary files a/icons/cursors/sb_right_arrow and /dev/null differ diff --git a/icons/cursors/sb_up_arrow b/icons/cursors/sb_up_arrow deleted file mode 100644 index 6358205..0000000 Binary files a/icons/cursors/sb_up_arrow and /dev/null differ diff --git a/icons/cursors/sb_v_double_arrow b/icons/cursors/sb_v_double_arrow deleted file mode 120000 index 83cc946..0000000 --- a/icons/cursors/sb_v_double_arrow +++ /dev/null @@ -1 +0,0 @@ -top_side \ No newline at end of file diff --git a/icons/cursors/target b/icons/cursors/target deleted file mode 120000 index def8590..0000000 --- a/icons/cursors/target +++ /dev/null @@ -1 +0,0 @@ -dotbox \ No newline at end of file diff --git a/icons/cursors/tcross b/icons/cursors/tcross deleted file mode 120000 index 982ae30..0000000 --- a/icons/cursors/tcross +++ /dev/null @@ -1 +0,0 @@ -cross \ No newline at end of file diff --git a/icons/cursors/top_left_arrow b/icons/cursors/top_left_arrow deleted file mode 120000 index 0de4e80..0000000 --- a/icons/cursors/top_left_arrow +++ /dev/null @@ -1 +0,0 @@ -left_ptr \ No newline at end of file diff --git a/icons/cursors/top_left_corner b/icons/cursors/top_left_corner deleted file mode 100644 index 3f32ac1..0000000 Binary files a/icons/cursors/top_left_corner and /dev/null differ diff --git a/icons/cursors/top_right_corner b/icons/cursors/top_right_corner deleted file mode 100644 index ed5617e..0000000 Binary files a/icons/cursors/top_right_corner and /dev/null differ diff --git a/icons/cursors/top_side b/icons/cursors/top_side deleted file mode 100644 index 64f988f..0000000 Binary files a/icons/cursors/top_side and /dev/null differ diff --git a/icons/cursors/top_tee b/icons/cursors/top_tee deleted file mode 100644 index 05cf3b6..0000000 Binary files a/icons/cursors/top_tee and /dev/null differ diff --git a/icons/cursors/ul_angle b/icons/cursors/ul_angle deleted file mode 100644 index e2e2015..0000000 Binary files a/icons/cursors/ul_angle and /dev/null differ diff --git a/icons/cursors/ur_angle b/icons/cursors/ur_angle deleted file mode 100644 index 17bb213..0000000 Binary files a/icons/cursors/ur_angle and /dev/null differ diff --git a/icons/cursors/v_double_arrow b/icons/cursors/v_double_arrow deleted file mode 120000 index a3693c3..0000000 --- a/icons/cursors/v_double_arrow +++ /dev/null @@ -1 +0,0 @@ -sb_v_double_arrow \ No newline at end of file diff --git a/icons/cursors/watch b/icons/cursors/watch deleted file mode 100644 index 7c8c16d..0000000 Binary files a/icons/cursors/watch and /dev/null differ diff --git a/icons/cursors/xterm b/icons/cursors/xterm deleted file mode 100644 index 4d89809..0000000 Binary files a/icons/cursors/xterm and /dev/null differ diff --git a/icons/index.theme b/icons/index.theme deleted file mode 100644 index c6a4957..0000000 --- a/icons/index.theme +++ /dev/null @@ -1,3 +0,0 @@ -[Icon Theme] -Name=pixelfun3 -Comment=Good white modern-looking theme with a piece of nostalgia diff --git a/profile b/profile index ea368ac..125007f 100644 --- a/profile +++ b/profile @@ -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 diff --git a/scripts/ddc-switch-inputs b/scripts/ddc-switch-inputs index 9bd3682..8f10c65 100755 --- 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 diff --git a/scripts/iommu.sh b/scripts/iommu.sh new file mode 100755 index 0000000..d971665 --- /dev/null +++ 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; diff --git a/scripts/kaomoji b/scripts/kaomoji new file mode 100644 index 0000000..6c8d1d3 --- /dev/null +++ b/scripts/kaomoji @@ -0,0 +1,453 @@ +ʕ•ₒ•ʔ Bear Shocked +ʕ•ᴥ•ʔ Bear +ʕ ·ᴥ·ʔ RBear +ʕ·ᴥ· ʔ LBear +ʕ ꈍᴥꈍʔ Bear Sob +ʕ – ᴥ – ʔ Bear Sleep + ʕノ•ᴥ•ʔノ ︵ ┻━┻ Bear Flip +ʕ╮•ᴥ•ʔ╮┳━━┳ Bear Unflip +ʕ; •`ᴥ•´ʔ Bear Angry +ʕ♡˙ᴥ˙♡ʔ Bear Love +ʕ•ᴥ•ʔ?? Bear Confused +(◕‿◕) Happy (1) +(^▽^) Joy (2) +(¬‿¬) Smug Happy +(´・ᴗ・`) Joy (4) +(⌒‿⌒) Joy (5) +(^‿^) Joy (6) +(☆▽☆) Joy (7) +(❛ᴗ❛) Joy (8) +(´♡‿♡`) Love (1) +(◕‿◕)♡ Love (2) +(─‿‿─)♡ Love (3) +(⌒_⌒;) Ashamed +(--_--) Unimpressed +((╬◣﹏◢)) Angry (1) +(#`Д´) Angry (2) +(◕︵◕) Sad (1) +(-_-) Sad (2) +(╥_╥) Cry (1) +(╥﹏╥) Cry (2) +(×﹏×) Dead +(;;;o_o) Fear +┐( ̄ヘ ̄)┌ Shrug (1) +╮(︶︿︶)╭ Shrug (2) +┐(︶▽︶)┌ Shrug +┐( ˘_˘ )┌ Shrug Small +ᕕ( ᐛ )ᕗ Joyful March +(•ิ_•ิ)? Confused +(¬_¬) Doubt +(⊙_⊙) Shock Raw +(°▽°)/ Greet (1) +(^-^*)/ Greet (2) +( ̄▽ ̄)/ Greet (3) +ヾ(・ω・*) Greet (4) +ʕ•ᴥ•ʔ/ Bear Greet +(^_<) Wink (1) +(-_・) Wink (2) +( ̄ハ ̄*) Nosebleed +┬┴┬┴┤( ͡° ͜ʖ├┬┴┬┴ Hiding +ε===(っ≧ω≦)っ Fart +(-_-)zzZ Sleep +╰( ͡° ͜ʖ ͡°)つ──☆*:・゚ Magic +(˘ɜ˘)♬♪♫ Whistle +(〜 ̄▽ ̄)〜 Dance R +〜( ̄▽ ̄〜) Dance L +( ͡° ͜ʖ ͡°) LNeutral +( ͡°ʖ̯ ͡°) LSad +( ͠° ͟ʖ ͡°) LConcern +( ͡ᵔ ͜ʖ ͡ᵔ) LJoy +(⌐■_■) Cool +( ^▽^)っ✂╰⋃╯ NoMoreWilly +(╯°益°)╯彡┻━┻ TableRage +( ╯°□°)╯ ┻━━┻ Flip +(╮°-°)╮┳━━┳ Unflip +(◕ω◕) owo (1) +𝕠𝕨𝕠 owo (2) +ʕ•w•ʔ Bear owo +(ノ≧ ヮ ≦)ノ︵ ┻┻ CuteFlip +ಠ_ಠ Disaproval +(◕ᴗ◕✿) Flower Happy (1) +(◕ ω ◕✿) Flower owo +(◕∇◕✿) Flower Happy (2) +(◕ᱛ ◕✿) Flower Shocked +(◕︿◕✿) Flower Sad +(◕ﬦ ◕✿) Flower Disapointed +(◕‸ ◕✿) *pout* Flower Pout +(≖ ︿ ≖ ✿)ꐦꐦ Flower Angry +(╯✿◕益◕)╯︵ ┻━┻ Flower Flip +🗡⊂(ʘ‿ʘ✿) Flower Yandere +(´∀`) Laughing + ( ՞ ڡ ՞ ) Yum +(▀̿Ĺ̯▀̿ ̿) Boss +(/-(エ)-\) Scared Cowering 1 +(ΟΔΟ;;) Fear Shock Scared +(⊃д⊂) Scared 2 +(/_\) Scared Cowering +^•-•^ cat derp +(>‿<) squint happy closed eyes +♡ heart +♫ music +.‿. smol happy +^_^ Overjoyed (2) +(╯°□°)╯︵ ┻━┻ Flipping Table (3) +ლ(ಠ益ಠლ) But At What Cost +(//_^) Emo (5) +ʕ •ᴥ•ʔ Koala (3) +(っ^‿^)っ Kirby (5) +[¬º-°]¬ Zombie (2) +(●∈∋●) Bird (5) +ಠ_ಠ Disapproval +T.T Sad (2) +◤◡ᴥ◡◥  Dog (4) +(∩`-´)⊃━☆゚.*・。゚ Wizard +^-^ Happy (7) +ᕦ(ò_óˇ)ᕤ Flexing (3) +♪┏(・o・)┛♪ Dancing (8) +( ͡° ͜ʖ ͡°) Smiling (2) +/人◕ ‿‿ ◕人\ Kyubey +༼ ༎ຶ ෴ ༎ຶ༽ Distraught +ᒄ₍⁽ˆ⁰ˆ⁾₎ᒃ♪♬ Frosty the Snowman (2) +(╯°□°)╯︵ ┻━┻ Flipping table (2) +<(^oo^)> Pig (3) +¯\_(ツ)_/¯ Shrugging (2) +U=・ x ・=U Rabbit (2) +⊂((・▽・))⊃ Hug me (2) +V●ᴥ●V Doggy (2) +(=^_^=) Bunny (3) +<コ:彡 Squid (2) +-_-; Anime Sweat Drop (2) +(°̥̥̥̥̥̥̥̥ᴗ°̥̥̥̥̥̥̥̥) Happy crying +(=^・ェ・^=) Kitty (2) +(((༼•̫͡•༽))) Ghost (2) +(-‸ლ) Whoops +(=^ェ^=) Cat (4) +( ´-ω・)︻┻┳══━一 Sniper +⊆☉ᴥ☉⊇ Bear (7) +༼ つ ◕_◕ ༽つ Take my energy +(  ̄┏_┓ ̄) Mustache (2) +(;´Д`) Giving Up +( ͡° ʖ̯ ͡°) Disgruntled +✌(◕‿-)✌ Peace (3) +ಠ_ರೃ Monocle (2) +T^T Crying (5) +ᘛ⁐̤ᕐᐷ Chameleon +༼ つ ◕_◕ ༽つ Gimme +ლ(ಠ益ಠ)ლ Anger +(ง •̀_•́)ง Feisty +(っ⌒‿⌒)っ Hug (3) +ϵ( 'Θ' )϶ Fish (3) +(^▽^) Laughing (5) +¯\(°_o)/¯ Confused (4) +̿’̿’\̵͇̿̿\З=( ͠° ͟ʖ ͡°)=Ε/̵͇̿̿/’̿̿ ̿ ̿ ̿ ̿ ̿ Outlaw +o(^▽^)o Pumped (2) +.∵・(゚Д゚) Scared (2) +(*☉౪ ⊙。)ノ Imbecile (2) +d-(^.^)z Thumbs Up (2) +(>_<) Painful +(¬_¬") Annoyed (4) +(´╹〽╹`) Worried (4) +(o^-^o) Pikachu (2) +(▀̿Ĺ̯▀̿ ̿) Deal with it +(∩`-´)⊃━☆゚.*・。゚ Magic Attack +꒡ᘦ̲꒡ Sleeping (5) +(‾ʖ̫‾) Lethargic +^_^; Guilty +ヽ(`⌒´メ)ノ Angry (8) +^^ Blissful +^_^/ High Five (2) +ʕ•͡ᴥ•ʔ Polar bear +❆❅❉ Snowing +ヽ(★ω★)ノ Excited +U^ェ^U Puppy +⊂(^(工)^)⊃ Teddy bear +(≧∇≦)/ Joyful (2) +◦°˚\☺/˚°◦ Playing in the snow +(╯°□°)╯︵  ʞooqǝɔɐɟ Flipping Facebook +(;-_-)ノ Giving up +⊙▂⊙ Shocked +|∴め ϖ め∴| SpongeBob SquarePants +◔̯◔ Rolling Eyes +⊂(◜ᴥ◝)つ Teddy Bear +ε=(☉_☉) Accidental farting +(ಥ﹏ಥ) Devastated (2) +(•͡.•͡) Skeptical +ε=┏( >_<)┛ Running (5) +┬─┬︵/(.□.)╯ Table Flips You +〠_〠 Tired (3) +∊ಠ_ಠ∍ Distressed +V=(° °)=V Crab (2) +ᶘ ᵒᴥᵒᶅ Seal (2) +Ƹ̵̡Ӝ̵̨̄Ʒ Butterfly +(- o - ) zzZ ☽ Sleepy +◯0o。(ー。ー)y Smoking (4) +(。々°) Herp Derp +-_-* Frustrated (3) +(+[__]∙:∙) PlayStation Portable +(V) (°,,,,°) (V) Zoidberg +/|\( ;,; )/|\ Bat +◖㈠ ω ㈠◗ Panda +\m/d(^_^)b\m/ Rocking Out +ヽ(゚Д゚)ノ Freak Out (2) +(ノ゚0゚)ノ~ Yoo-Hoo +¤\( `⌂´ )/¤ Lifting weights +(ò_ó) Furious +( ˘ ³˘)♥ Kiss me +(^▽^) Cheerful (3) +(⌒ ͜ʖ⌒)b Attentive +ᕦ❍ᴗ❍ᕤ Muscular Person +(´>_●)メ(●_<`) Sword Fighting +:-Þ Teasing +=( ^o^)ノ___o Bowling +(#×_×) Dead (2) +(。・_・)ノ”【】 Painting +(/。\) Shy (5) +⎰≀.☮-☮≀⎰ John Lennon +─=≡Σ(([ ⊐•̀⌂•́]⊐ Superhero +(¬з¬)σ Pointing (2) +(・д・)} On The Phone (3) +㐈⦁ཽし⦁ཽ㐈  Larry David +⨌⨀_⨀⨌ Benjamin Franklin +(☄ฺ◣д◢)☄ฺ Scaring +ƪ(˘▽˘ƪ) Worshiping +[•.•ิ] Huh +(◐‿◑) Crazy +\(-_- ) Thank You +(_ε_) Kiss my butt +(⊃‿⊂) Anticipation +(* ̄m ̄) Dissatisfied +Q('.'Q) Put Em Up +\(^o)(^0^)(o^)/ Caroling +( ̄~ ̄) Unimpressed +༼ঢ_༽ঢ༽ Perplexed +(。♥‿♥。) Smitten +( ̄□ ̄;) Surprised +(^o^) Singing (3) +(:3 っ)っ Walrus +( `_)乂(_' ) Arm wrestle +(ง •̀ゝ•́)ง Fighting (2) +uwu Happy Anime Face +└(^o^ )X( ^o^)┘ Best buddies +d^_^b DJ +( --)/ ==卍 Ninja Star +C:。ミ Octopus +(´・ω・`) Snubbing (2) +♪(●′▽`)ノ Good Night +(#^.^#) Embarrassed (3) +ಥ_ಥ Bawling (3) +†_(゚ー゚*)β Exorcism +੯ू•́ू ໒꒱⁼³₌₃ Sonic the Hedgehog +(^‿◕) Winking (3) +(″・ิ_・ิ)っ Wait (3) +。◕‿◕。 Gleeful +ヽ( ★ω★)ノ Pumped up +_〆(。。) Writing (2) +(∿°○°)∿ ︵ ǝʌol Heartbroken +^;;^ Spider +(⓪益⓪) Staring (2) +( ̄┏∞┓ ̄) Fu Manchu Man +( • ∀•)っθΘʘ Hiding Easter eggs +_φ( °-°)/ Doing Homework +◖ර◞ʖ◟ර◗ Grandma +¬.¬ Whatever (3) +⫷ °⧭° ⫸ Clown +(♥_♥) In Love +>.< Upset (2) +( ◢д◣) Depressed (4) +ᕕ( ᐛ )ᕗ Celebrating +(¬‿¬) Cunning +└(^o^)┐ Grooving (3) +~゜・_・゜~ Raving +ᕦ◉▿◉ᕤ Owl (2) +\(^O^)/ Celebrate +(*’(OO)’*) Piggy (2) +˃ʍ˂ Enraged (2) +(ू˃̣̣̣̣̣̣︿˂̣̣̣̣̣̣ ू) Sobbing (3) +( ^^)人(^^ ) Best Buds +└@(・ェ・)@┐ Beefcake +(☉__☉”) Yikes +(╯˘ -˘ )╯ Praying (2) +ε=┌( ≧▽)┘ Elated +( •_•)O °Q(•_• ) Playing Ping Pong +∋(°O°)∈ Blowfish +(;一_一) Ashamed (4) +{♥‿♥} Lovestruck +๏-) Cyclops +(o ̄∇ ̄)=◯)`ν゜)・ Punching (6) +┬─┬ノ( º _ ºノ) Putting Table Back (2) +(~_(]=--Z(◡˘) Pie Fight +((((((^_^;) Evading +(/o^)/°⊥\(^o\) Volleyball +-{'''|'''|'''|''']=[] Syringe +[^._.^]ノ彡 Nyan Cat +---(o_ _)o Tripping (2) +┬┴┬┴┤(・_├┬┴┬┴ Snooper +(ㆆ_ㆆ) Unamused +(✿◠‿◠)  Hippie +ヾ(* ̄O ̄)ツ Yelling +(ɔ◔‿◔)ɔ ♥ Loving +(ノ-o-)ノ 中 Olympic Hammer Throw +(/ω・\) Peering +(´・ω・)っ由 Gift +[-_-]~ Ninja +(シ_ _)シ Apology (2) +∋∞(●゚v゚)∞∈ Pigtails +‎(>o<)ρミ┳┷┳゜ Table Tennis +(^̮^) Pleased (2) +♪~( ̄ε ̄;) Whistling +( ̄▼ ̄) Big Grin +⋟^≏^⋞ Kitty Cat +( ̄へ ̄) Discontent +(*・_・)ノ⌒* Throwing Away +(*@_*#) Beaten Up +(p_-) Thinking +(。_°)☆ Punched +♥‿♥ Enamored +ε-(´・`) フ Phew +༼ঢ_㇁ঢ༽ Bad hair day +(づ ̄ ³ ̄)づ Smooch (3) +O(<>'<>)O Aang +(_ _)..ooOO Dreaming +┳┻┳° Ping Pong table +^o^ Mog +(゚皿゚)r┏┳-* Shooting (2) +m( ゚皿゚)m★━━ Laser +٩◔̯◔۶ Eye Roll With Hands Up +ヽ(´Д`ヽミノ´Д`)ノ Frantic (2) +(-ε- ) Pucker up (3) +ヽ(⌐■_■)ノ♪♬ Boogie down +「(°ヘ°) Puzzled +d(^_^)b Listening to Music +( -_-)旦~ Drinking +<_< Looking (4) +(( _ _)☆ ≡〇 Header +^)_(^ Chubby +(๑´•.̫ • `๑) Blushing +(。▼皿▼) Darth Vader +(╬☉Д⊙ฺ) Cyborg +(ʘ‿ʘ) Smile +ε=ε=ε=┌(๑ʘ∀ʘ)┘ Sprinting +ƪ(˘⌣˘)ʃ Raise the roof +( ˘︹˘ ) Smug +(▰˘◡˘▰) Satisfied +(¬、¬) Shifty +¯(°_o)/¯ Confused shrug +✖‿✖ Dead person +(。_°☆\(- – ) Punch +(ɔˆ ³(ˆ⌣ˆc) Loving couple +(*▿▿* ƪ) Vampire +o(^^o)(o^^)o Hopeful +___ψ(‥ ) Studying +_φ(°-°=) Doing homework +@( o・ω・)@ Monkey +(╭ರ_•́) Inquisitive +੯ू‵ू ໒꒱ Poodle +(*^^)^*) Kiss (5) +(^~^) Meh +(/。\) Frightened +:þ Playful +(>^_^)><(^o^<) Hugging +(-_ゞ Groggy +(*^o^)人(^o^*) Buddies +(●´ノω`)コ Whispering (2) +o(´^`)o Reluctant +( つ Д `) Wiping Tears +(o´・Υ・)ノ・ Help (2) +(。・ˇдˇ・。) Pompous +(´∪`*) Friendly +ヘ(。□°)ヘ Psycho +(人’∀’) Precious +(っ˘ڡ˘ς) Yummy +┗(・ω・;)┛ How Should I Know +(о^ω^о) Giggling +(´ー`)┌フッ Golf Clap +\\(<.<|>.>)// Panicking +^(#`∀´)_Ψ Demon +(╯‵Д′)╯ Scary +:-{  -__-: Stinky +ಠᴗಠ Scheming +<(; ̄ ・ ̄) Scratching +\(^ ^)/ Glad +(╯_╰) Bummed out +┗( ●-﹏ `。)づ Hurt (2) +(-_-)# Girl +8(>_<)8 Jealous +(*°∀°)=3 Infatuated (3) +( ^_^)/ Waving +o(^_-)O Boxer +{{|└(>o< )┘|}} Up In Arms +(^^)// Applause (2) +( `_)?(_' ) Dueling +(´~`) Weary +v(^_^)v Victory (3) +(ノ_ _)ノ Surrender +<( ・ェ-)<} Bow and Arrow +( `o´)_θ☆ Kicking +(-□-)︵* Blowing a Kiss +|д・) Hiding (4) +(´Д゜)/゜⌒。 Discarding +ʕʔ Bread +(ɔ˘з˘)ɔ Romantic +ʕ •́؈•̀) Winnie the Pooh +(ó ì_í)=óò=(ì_í ò) Bro Pound +ヾ(`ε´)ノ Booing +|̲̅̅●̲̅̅|̲̅̅=̲̅̅|̲̅̅●̲̅̅| Stereo +ʘ‿ʘ Eager +:(¦) Frog +( ^)/占~~~ Banksy +(;´༎ຶД༎ຶ`) Weeping (2) +⊂ •͡˘∠•͡˘ ⊃ Suspicious +( ° ᴗ°)~ð  Proposal +(๑╹ڡ╹๑) Tasty +(¬_¬ ) Neglected +ʕु•̫͡•ʔु Bear cub (2) +┌|°з°|┘ Cutting a rug +(⊙_◎) Crazed +(✖╭╮✖) Deceased +←~(o `▽´ )oΨ Satan +˙ ͜ʟ˙ Content +( ˇ෴ˇ ) Hipster +♫.(◠౪◠).♫ Jamming to music +∊♡_ᴥ_♡∍ Puppy Love +L(´□`L) Oh No! (2) +(;´ρ`) Yawning +(╯ნ_㇁ნ)╯ Defeated +(.〜◍`皿′◍〜.) Livid (2) +ᡊ|◔じ◔|ᡊ  Woody Allen +✌(გ_㇁გ)✌ Ringo Starr +╹﹏╹ Cold +☉ϖ☉ Lobster +(๑≖ิิ益≖ิ๑) Evil Laugh +(((☎))) Phone +(○`д´)ノシ Σ(っ゚Д゚)っ Chasing +o(>< )o⌒* Mad (3) +ლ(´ڡ`ლ) Licking +⪿ ↂ ˒̫̮ ↂ ⫀ Elton John +(•ᴥ• )́`́'́`́'́⻍ Porcupine +且_(゚◇゚;)ノ゙ Waiter +◖⎚∠⎚◗ Geek Nerd +-ˆ ω ˆ- Kitten +•:_:• Nagato +ε=┌(^-^)┘ Skipping +(+.+)(-.-)(_ _) Falling Asleep +[ ± _ ± ] Sick +〜〜(/ ̄▽)/ 〜ф Chasing A Butterfly +\(`0´)/ Fed Up +¥[*.*]¥ Robot +(*・)σσ(*゜O゜) Poking +( ̄ー ̄(_ _( Nodding +▼o・_・o▼ Hello +(`_^) Wink +/( _0_) ̄θ☆≡≡○ Scissor Kick +ヽ(´ー`)┌ Mellow +(^ _ ^)/~~ Goodbye +(*・)「」「」 Magic Casting +( `皿´)。ミ/ Hitting +[]゛7(∀゜*) Dialing +(((((^_^) Teleporting +( ̄ー ̄)//”” Clapping +(。。;)\(-_-) Comforting +(*  ̄)( ̄ *)  Kissing +(;^_^)ッ☆( ゜o゜) Slapping +\(~O~)/ Good Morning +\_(´▽`)♪_/ Bathtub diff --git a/scripts/start-mpd b/scripts/start-mpd index 33f6ad5..7b4f9a2 100755 --- a/scripts/start-mpd +++ b/scripts/start-mpd @@ -1,4 +1,4 @@ #!/bin/sh -[ ! -s ~/.config/mpd/pid ] && mpd .config/mpd/mpd.conf +pidof mpd || mpd .config/mpd/mpd.conf pidof mpdscribble || mpdscribble --conf .config/mpdscribble/mpdscribble.conf pidof mpd-rpc || mpd-rpc --no-idle --fork diff --git a/scripts/vfetch b/scripts/vfetch new file mode 100755 index 0000000..e0018e3 --- /dev/null +++ b/scripts/vfetch @@ -0,0 +1,288 @@ +#!/usr/bin/env python3 + +from xdg.BaseDirectory import xdg_config_home +from enum import Enum +import subprocess +import platform +import distro +import json +import re +import os +import wmctrl + +colors = [ + # Regular colors. + "\u001b[30m", + "\u001b[31m", + "\u001b[32m", + "\u001b[33m", + "\u001b[34m", + "\u001b[35m", + "\u001b[36m", + "\u001b[37m", + + # Bright colors. + "\u001b[30;1m", + "\u001b[31;1m", + "\u001b[32;1m", + "\u001b[33;1m", + "\u001b[34;1m", + "\u001b[35;1m", + "\u001b[36;1m", + "\u001b[37;1m", + + # Reset. + "\u001b[0m" +] + +decorations = [ + "\u001b[1m", # Bold. + "\u001b[4m", # Underline. + "\u001b[7m" # Reversed. +] + +# Creates a copy of the specified string with color and decorations added. +def colored(string, colorIndex, decorationIndices=[]): + newString = colors[colorIndex] + for decorationIndex in decorationIndices: + newString += decorations[decorationIndex] + newString += string + colors[len(colors)-1] + return newString + +# Enum for the different data types. +class Type(str, Enum): + os = 'os' + kernel = 'kernel' + wm = 'wm' + packages = 'packages' + uptime = 'uptime' + +# Enum for the different align modes. +class AlignMode(str, Enum): + spaces = 'spaces' + center = 'center' + +# Loads the settings from the configuration file. +# First checks for a configuration file in ~/.config/vfetch/vfetch.conf, +# else it defaults to the configuration file in the same folder as the script. +def loadSettings(): + try: + file = open(xdg_config_home + '/vfetch/vfetch.conf', 'r') + except FileNotFoundError: + file = open(os.path.dirname(os.path.realpath(__file__)) + '/vfetch.conf', 'r') + content = file.read() + settings = json.loads(content) + file.close() + return settings + +# Prints string without ending with a new line. +def printn(string): + print(string, end="") + +# Prints string at a specified position. +def printAt(string, *position): + if len(position) == 1: + x = position[0][0] + y = position[0][1] + else: + x = position[0] + y = position[1] + printn("\x1b7\x1b[%d;%df%s\x1b8" % (y+1, x+1, string)) + +# Prints the data lines. +def printLines(lines, colorIndex, offsetX, offsetY, alignMode, alignSpace): + longestName = 0 + dataPosition = 0 + + if alignMode is AlignMode.spaces: + for line in lines: + position = len(line[0]) + alignSpace + if position > dataPosition: + dataPosition = position + else: + # Finds the length of the longest name. + longestName = len(max(lines, key = lambda data: len(data[0]))[0]) + + y = 0 + x = offsetX + # Prints the lines and formats them accordingly. + for line in lines: + if alignMode is AlignMode.spaces: + printAt(line[1], x + dataPosition, y+offsetY) + elif alignMode is AlignMode.center: + line[0] = ' ' * (longestName - len(line[0])) + line[0] + + printAt(colored(line[0], colorIndex, [0]), x, y+offsetY) + if alignMode is AlignMode.center: + printAt(' ~ ' + line[1], x+len(line[0]), y+offsetY) + y += 1 + +# Sets the cursor position. +def setCursorPosition(*position, newLine=False): + if len(position) == 1: + x = position[0][0] + y = position[0][1] + else: + x = position[0] + y = position[1] + string = '\033[%d;%dH' % (y, x) + if newLine: + print(string) + else: + printn(string) + +# Runs the specified terminal command. +def termRun(command, arguments): + output = subprocess.run([command, arguments], text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + return output.stdout + +# Prints ascii image. +def printAscii(position, asciiImage): + setCursorPosition(position) + lines = asciiImage.split('\n') + for line in lines: + print(line) + +# Gets the operating system. +def getOS(architecture=False, removeLinux=False): + os = distro.linux_distribution()[0] + if removeLinux: + os = re.sub('linux', '', os, flags=re.IGNORECASE) + os = os.rstrip() + if architecture: + os += ' ' + platform.machine() + return os + +# Gets the kernel. +def getKernel(fullName=True): + kernel = platform.release() + if not fullName: + kernel = kernel.split('-')[0] + return kernel + +# Gets the window manager. +def getWM(): + try: + return wmctrl.os.environ.get('DESKTOP_SESSION') + except: + pass + try: + return wmctrl.os.environ.get('XDG_SESSION_DESKTOP') + except: + return None + +# Gets the number of packages. +def getPackages(displayPackageManager=False): + try: + packages = termRun('pacman', '-Qq') + string = str(len(packages.split('\n'))) + if displayPackageManager: + string += ' (pacman)' + return string + except: + return None + +# Gets the machine uptime. +def getUptime(): + with open('/proc/uptime', 'r') as f: + uptime_seconds = float(f.readline().split()[0]) + hours = uptime_seconds / 3600 + minutes = (hours - int(hours)) * 60 + hours = int(hours) + minutes = int(minutes) + string = '' + if hours != 0: + string += str(hours) + 'h ' + if minutes != 0 or hours == 0: + string += str(minutes) + 'm' + return string + +# Gets the data for the specified data type. +def getData(type, settings): + data = { + Type.os: getOS(settings['displayArchitecture'], settings['removeLinux']), + Type.kernel: getKernel(settings['kernelFullName']), + Type.wm: getWM(), + Type.packages: getPackages(settings['displayPackageManager']), + Type.uptime: getUptime() + }.get(type, None) + + if data is None: + return None + + name = { + Type.os: [ 'OS', '' ], + Type.kernel: [ 'Kernel', '' ], + Type.wm: [ 'WM', '缾' ], + Type.packages: [ 'Packages', '' ], + Type.uptime: [ 'Uptime', '' ] + }.get(type, None)[int(settings['iconMode'])] + + if settings['lowercase']: + name = name.lower() + data = data.lower() + + return [name, data] + +# Gets the size of the specified ascii image. +def asciiSize(asciiImage): + x = 0 + split = asciiImage.split('\n') + for line in split: + if len(line) > x: + x = len(line) + return [x, len(split)] + +# Trims the specified ascii image of empty lines and trailing whitespaces. +def trimAscii(asciiImage): + lines = asciiImage.split('\n') + string = '' + for line in lines: + trimmedString = line.rstrip() + if len(trimmedString) != 0: + string += trimmedString + '\n' + string = string[:-1] # Removes last newline. + return string + +# Loads the ascii image at the specified path. +def loadAsciiImage(path): + file = open(path, 'r') + asciiImage = trimAscii(file.read()) + file.close() + return asciiImage + +settings = loadSettings() + +displayAscii = settings['displayAscii'] +offset = settings['offset'] + +# Loads the data lines. If the data is invalid (None) it does not get added. +lines = [] +for dataType in settings['data']: + data = getData(dataType, settings) + if data is not None: + lines.append(data) + +# Loads the ascii image if the option is set for it. +if displayAscii: + asciiImage = loadAsciiImage(settings['asciiImage']) + size = asciiSize(asciiImage) + offset[0] += size[0] + finalPosition = [0, size[1]] +else: + finalPosition = [0, len(lines)+offset[1]] + +# Makes the prompt after the script finishes have a blank line before it. +finalPosition[1] += 1 + +os.system('clear') + +if displayAscii: + printAscii([0,0], asciiImage) + +alignMode = AlignMode(settings['alignMode']) + +printLines(lines, settings['colorIndex'], offset[0], offset[1], alignMode, settings['alignSpace']) + +# Sets the final cursor position for the prompt to end up at. +setCursorPosition(finalPosition, newLine=True)