diff options
author | Joe <rrbo@proton.me> | 2023-01-31 11:46:19 +0100 |
---|---|---|
committer | Joe <rrbo@proton.me> | 2023-01-31 11:46:19 +0100 |
commit | 7eabc900314cd93042f78123fe12ad2771050333 (patch) | |
tree | b3f6129c0d01a403be68fb5ff156a21204b00ea4 | |
parent | up (diff) | |
download | dotfiles-bsd-7eabc900314cd93042f78123fe12ad2771050333.tar.gz dotfiles-bsd-7eabc900314cd93042f78123fe12ad2771050333.tar.bz2 dotfiles-bsd-7eabc900314cd93042f78123fe12ad2771050333.tar.xz dotfiles-bsd-7eabc900314cd93042f78123fe12ad2771050333.tar.zst dotfiles-bsd-7eabc900314cd93042f78123fe12ad2771050333.zip |
Pop update
Diffstat (limited to '')
33 files changed, 434 insertions, 290 deletions
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 6b60e38..1e647af 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -106,7 +106,8 @@ font: # - (Windows) Consolas # family: DejaVuSansMono Nerd Font # family: mononoki Nerd Font - family: UbuntuMono Nerd Font + # family: UbuntuMono Nerd Font + family: TerminessTTF Nerd Font # The `style` can be specified to pick a specific face. style: Regular @@ -147,7 +148,8 @@ font: # Point size # size: 11.0 # size: 12.0 - size: 13.0 + # size: 13.0 + size: 15.0 # Offset is the extra space around each character. `offset.y` can be thought of # as modifying the line spacing, and `offset.x` as modifying the letter spacing. @@ -292,7 +294,7 @@ selection: save_to_clipboard: false # Allow terminal applications to change Alacritty's window title. -#dynamic_title: true +dynamic_title: true cursor: # Cursor style diff --git a/.config/conkyrc b/.config/conkyrc index e69a172..4b95633 100644 --- a/.config/conkyrc +++ b/.config/conkyrc @@ -11,7 +11,7 @@ conky.config = { use_spacer = 'none', use_xft = true, xftalpha = 1, - font = 'Cantarell Mono:size=14', + font = 'NotoSansMono Nerd Font:size=14', font1 = 'Hack Nerd Font Mono:bold:size=11', font2 = 'Hack Nerd Font Mono:bold:size=10', template0 = '\\n', @@ -58,49 +58,41 @@ ${font1}${color white}${goto 140}${mpd_artist} ${goto 140}${scroll wait 25 3 1 ${mpd_title}} ${goto 140}${mpd_elapsed}/${mpd_length} ${mpd_bar} ${execi 5 ~/.local/bin/conky_cover.sh >/dev/null 2>&1}${image /tmp/conkyCover.png -p 20,150 -n} -${hr}${endif}${if_up re0} +${hr}${endif}${if_up enx4ce1734c425a} ${font2}${color white}${alignc}${execi 1800 curl wttr.in/Lyon?T0 --silent --max-time 3}${font} ${hr}${endif} -${color grey}${alignc}New mails${template0}\ -${if_match ${new_mails /var/mail/jozan/gmail_br/INBOX}>0}${color grey}GMail BR: ${font1}${color white}${new_mails /var/mail/jozan/gmail_br/INBOX}${font}${template0}${endif}\ -${if_match ${new_mails /var/mail/jozan/gmail_oon/INBOX}>0}${color grey}${color grey}GMail OON: ${font1}${color white}${new_mails /var/mail/jozan/gmail_oon/INBOX}${font}${template0}${endif}\ -${if_match ${new_mails /var/mail/jozan/gmail_tos/INBOX}>0}${color grey}${color grey}GMail TOS: ${font1}${color white}${new_mails /var/mail/jozan/gmail_tos/INBOX}${font}${template0}${endif}${hr} -${color grey}Battery: ${font1}${color white}${if_match ${battery_percent}<15}${color red}${endif}${battery_percent}% ${battery_bar}${font} +${color grey}CPU: ${font1}${color white} ${freq_g} GHz ${color white}${cpu}% +${offset 4}${cpugraph bfbfbf c0c0c0} +${color grey}1:${color white} ${cpu cpu0}% ${cpubar cpu0}${color white} +${color grey}2:${color white} ${cpu cpu1}% ${cpubar cpu1}${color white} +${color grey}3:${color white} ${cpu cpu2}% ${cpubar cpu2}${color white} +${color grey}4:${color white} ${cpu cpu3}% ${cpubar cpu3}${color white} +${color grey}5:${color white} ${cpu cpu4}% ${cpubar cpu4}${color white} +${color grey}6:${color white} ${cpu cpu5}% ${cpubar cpu5}${color white}${font} ${hr} -${color grey}CPU: ${font1}${color white} ${freq_g} GHz ${color white}${if_match ${cpu}>80}${color red}${else}${endif}${cpu}% -${offset 4}${cpugraph bfbfbf c0c0c0}${color white} -${color grey}1:${color white} ${if_match ${cpu cpu0}>80}${color red}${else}${endif}${cpu cpu0}% ${cpubar cpu0}${color white} -${color grey}2:${color white} ${if_match ${cpu cpu1}>80}${color red}${else}${endif}${cpu cpu1}% ${cpubar cpu1}${color white} -${color grey}3:${color white} ${if_match ${cpu cpu2}>80}${color red}${else}${endif}${cpu cpu2}% ${cpubar cpu2}${color white} -${color grey}4:${color white} ${if_match ${cpu cpu3}>80}${color red}${else}${endif}${cpu cpu3}% ${cpubar cpu3}${color white} -${color grey}5:${color white} ${if_match ${cpu cpu4}>80}${color red}${else}${endif}${cpu cpu4}% ${cpubar cpu4}${color white} -${color grey}6:${color white} ${if_match ${cpu cpu5}>80}${color red}${else}${endif}${cpu cpu5}% ${cpubar cpu5}${color white} -${color grey}7:${color white} ${if_match ${cpu cpu6}>80}${color red}${else}${endif}${cpu cpu6}% ${cpubar cpu6}${color white} -${color grey}8:${color white} ${if_match ${cpu cpu7}>80}${color red}${else}${endif}${cpu cpu7}% ${cpubar cpu7}${color white}${font} +${color grey}RAM: ${font1}${color white}${mem} / ${memmax} ${color white}${memperc}% ${membar 4}${font} +${offset 4}${memgraph bfbfbf c0c0c0} +${color grey}SWAP: ${font1}${color white}${swap} / ${swapmax} ${color white}${swapperc}% ${swapbar 4}${font} ${hr} -${color grey}RAM: ${font1}${color white}${mem} / ${memmax} ${color white}${if_match ${memperc}>80}${color red}${else}${endif}${memperc}% ${membar 4}${font} -${offset 4}${memgraph bfbfbf c0c0c0}${color white} -${color grey}SWAP: ${font1}${color white}${swap} / ${swapmax} ${color white}${if_match ${swapperc}>80}${color red}${else}${endif}${swapperc}% ${swapbar 4}${font} -${hr} -${color grey}SSD: ${font1}${color white}${if_match ${fs_free_perc /}<20}${color red}${else}${endif}${fs_free_perc /}% ${fs_bar 6 /}${font} +${color grey}SSD: ${font1}${color white}${fs_free_perc /}% ${fs_bar 6 /}${font} ${hr} ${color grey}Process:${color grey}${alignr}PID CPU MEM -${font1}${color white}${top name 1} ${alignr}${top pid 1} ${top cpu 1} ${top mem 1} -${font1}${color grey}${top name 2} ${alignr}${top pid 2} ${top cpu 2} ${top mem 2} -${font1}${color white}${top name 3} ${alignr}${top pid 3} ${top cpu 3} ${top mem 3} -${font1}${color grey}${top name 4} ${alignr}${top pid 4} ${top cpu 4} ${top mem 4}${font} +${font1}${color white}${top_mem name 1} ${alignr}${top_mem pid 1} ${top_mem cpu 1} ${top_mem mem_res 1} +${font1}${color grey}${top_mem name 2} ${alignr}${top_mem pid 2} ${top_mem cpu 2} ${top_mem mem_res 2} +${font1}${color white}${top_mem name 3} ${alignr}${top_mem pid 3} ${top_mem cpu 3} ${top_mem mem_res 3} +${font1}${color grey}${top_mem name 4} ${alignr}${top_mem pid 4} ${top_mem cpu 4} ${top_mem mem_res 4}${font} ${color grey}--------- ${color grey}Processes: ${color white}${processes} -${hr}${if_up re0} -${color grey}LAN IP: ${font1}${color white}${addr re0}${font} +${hr}${if_up enx4ce1734c425a} +${color grey}LAN IP: ${font1}${color white}${addr enx4ce1734c425a}${font} ${color grey}--------- ${color grey}VPN IP: ${font1}${color white}${addr proton0}${font} ${color grey}--------- ${color grey}Public IP: ${color white}${font1}${execi 300 curl -s https://ifconfig.me || echo No Address}${font}${color grey} ${hr} -${color grey}Down: ${color white}${font1}${downspeed re0} ${font}${color grey}- Up: ${color white}${font1}${upspeed re0}${font} -${color grey}Down: ${color white}${downspeedgraph re0 bfbfbf c0c0c0 125829120} -${color grey}Up: ${color white}${upspeedgraph re0 bfbfbf c0c0c0 125829120} +${color grey}Down: ${color white}${font1}${downspeed enx4ce1734c425a} ${font}${color grey}- Up: ${color white}${font1}${upspeed enx4ce1734c425a}${font} +${color grey}Down: ${color white}${downspeedgraph enx4ce1734c425a bfbfbf c0c0c0 125829120} +${color grey}Up: ${color white}${upspeedgraph enx4ce1734c425a bfbfbf c0c0c0 125829120} ${hr} ${color grey}${alignc}DNS ${font1}${color white}${nameserver 0}${font} diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index 655f6b0..4fecd8b 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -1,13 +1,13 @@ [global] monitor = 0 follow = none - width = (200, 600) - height = 500 - origin = top-right - offset = 40x40 + geometry = 800x500-40+40 + # width = 200 + # height = 500 + # origin = top-right indicate_hidden = yes shrink = yes - transparency = 0 + transparency = 15 separator_height = 4 padding = 2 horizontal_padding = 10 @@ -28,7 +28,7 @@ sort = yes idle_threshold = 0 - font = "UbuntuMono Nerd Font 17" + font = "NotoSans Nerd Font 17" line_height = 0 markup = full @@ -83,16 +83,16 @@ #icon = /path/to/icon [urgency_normal] - background = "#614266" - foreground = "#ebdbb2" - frame_color = "#a89984" + background = "#728CAB" + foreground = "#F7F6F2" + frame_color = "#ebdbb2" timeout = 10 [urgency_critical] background = "#cc241d" foreground = "#ebdbb2" frame_color = "#b77901" - timeout = 0 + timeout = 20 # Every section that isn't one of the above is interpreted as a rules to # override settings for certain messages. diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 818046b..a44dc87 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -1,5 +1,4 @@ (require 'org) -(setenv "HOME" "/usr/home/jozan") (org-babel-load-file (expand-file-name "org/config.org" user-emacs-directory)) @@ -15,7 +14,7 @@ '(ccls-sem-parameter-faces [ccls-sem-parameter-face-0 ccls-sem-parameter-face-1 ccls-sem-parameter-face-2 ccls-sem-parameter-face-3 ccls-sem-parameter-face-4 ccls-sem-parameter-face-5 ccls-sem-parameter-face-6 ccls-sem-parameter-face-7 ccls-sem-parameter-face-8 ccls-sem-parameter-face-9]) '(custom-safe-themes - '("d80952c58cf1b06d936b1392c38230b74ae1a2a6729594770762dc0779ac66b7" "f028e1985041fd072fa9063221ee9c9368a570d26bd6660edbd00052d112e8bb" "969a67341a68becdccc9101dc87f5071b2767b75c0b199e0ded35bd8359ecd69" "147fcba1e6277e4b9a3d07ba90d822dabc0510d6576514967a55afd71393000d" "6b5c518d1c250a8ce17463b7e435e9e20faa84f3f7defba8b579d4f5925f60c1" default)) + '("d80952c58cf1b06d936b1392c38230b74ae1a2a6729594770762dc0779ac66b7" efault)) '(fci-rule-color "#676E95") '(hl-todo-keyword-faces '(("TODO" . "#dc752f") diff --git a/.config/emacs/org/config.org b/.config/emacs/org/config.org index a308a52..2915ea0 100644 --- a/.config/emacs/org/config.org +++ b/.config/emacs/org/config.org @@ -72,7 +72,7 @@ (setq package-selected-packages '( evil evil-collection evil-leader - evil-search-highlight-persist evil-mc evil-surround evil-ediff + evil-search-highlight-persist evil-mc evil-surround evil-visual-mark-mode evil-nerd-commenter evil-vimish-fold evil-numbers evil-quickscope lsp-mode lsp-ui diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index 604ccd5..528ec57 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -4,19 +4,19 @@ <alias> <family>serif</family> <prefer> - <family>UbuntuMono Nerd Font</family> + <family>NotoSerif Nerd Font</family> </prefer> </alias> <alias> <family>sans-serif</family> <prefer> - <family>UbuntuMono Nerd Font</family> + <family>NotoSans Nerd Font</family> </prefer> </alias> <alias> <family>monospace</family> <prefer> - <family>mononoki Nerd Font Mono</family> + <family>UbuntuMono Nerd Font Mono</family> </prefer> </alias> </fontconfig> diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/.config/gtk-2.0/gtkfilechooser.ini index 6c77e17..072e4e6 100644 --- a/.config/gtk-2.0/gtkfilechooser.ini +++ b/.config/gtk-2.0/gtkfilechooser.ini @@ -2,8 +2,8 @@ LocationMode=path-bar ShowHidden=true ShowSizeColumn=true -GeometryX=2727 -GeometryY=769 +GeometryX=3350 +GeometryY=432 GeometryWidth=948 GeometryHeight=641 SortColumn=name diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks index 675f8f7..6ca084b 100644 --- a/.config/gtk-3.0/bookmarks +++ b/.config/gtk-3.0/bookmarks @@ -1,5 +1,3 @@ -file:///home/jozan/somdiaa file:///tmp -file:///home/jozan/pics/garbage file:///home/jozan/pics/profile file:///home/jozan/pics/scrot diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 1a83790..7a78f7b 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,15 +1,17 @@ [Settings] -gtk-font-name=sans-serif 12 -gtk-icon-theme-name=Faenza -gtk-theme-name=Clearlooks-Joe -gtk-cursor-theme-size=0 -gtk-toolbar-style=GTK_TOOLBAR_BOTH +gtk-font-name=Fira Sans Semi-Light 10 +gtk-icon-theme-name=Faba +gtk-theme-name=Clearlooks +gtk-cursor-theme-size=24 +gtk-toolbar-style=GTK_TOOLBAR_ICONS gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=1 -gtk-menu-images=1 +gtk-button-images=0 +gtk-menu-images=0 gtk-enable-event-sounds=1 -gtk-enable-input-feedback-sounds=1 +gtk-enable-input-feedback-sounds=0 gtk-xft-antialias=1 gtk-xft-hinting=1 gtk-xft-hintstyle=hintslight gtk-xft-rgba=rgb +gtk-cursor-theme-name=Adwaita +gtk-modules=canberra-gtk-module diff --git a/.config/lf/lfrc b/.config/lf/lfrc index 5c7c519..c4871ea 100644 --- a/.config/lf/lfrc +++ b/.config/lf/lfrc @@ -24,7 +24,7 @@ cmd open ${{ image/x-xcf) bsdsetsid gimp $f >/dev/null 2>&1 ;; image/svg+xml) display -- $f ;; image/*) rotdir $f | grep -i "\.\(png\|jpg\|jpeg\|gif\|webp\|tif\|ico\)\(_large\)*$" | - bsdsetsid nsxiv -aibof 2>/dev/null | while read -r file; do + nsxiv -aibof 2>/dev/null | while read -r file; do [ -z "$file" ] && continue lf -remote "send select \"$file\"" lf -remote "send toggle" diff --git a/.config/mimeapps.list b/.config/mimeapps.list index f7806cf..b619835 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -26,7 +26,7 @@ video/mpeg=mpv.desktop video/ogg=mpv.desktop video/webm=mpv.desktop inode/directory=pcmanfm.desktop -text/plain=emacs.desktop +text/plain=nvim.desktop application/x-shellscript=emacs.desktop text/english=emacs.desktop text/x-c=emacs.desktop @@ -39,6 +39,7 @@ text/x-java=emacs.desktop text/x-makefile=emacs.desktop text/x-readme=emacs.desktop text/x-tcl=emacs.desktop +x-scheme-handler/msteams=teams.desktop [Added Associations] x-scheme-handler/https=userapp-Firefox-NVLWI0.desktop; @@ -52,3 +53,5 @@ application/xhtml+xml=userapp-Firefox-NVLWI0.desktop; application/x-extension-xhtml=userapp-Firefox-NVLWI0.desktop; application/x-extension-xht=userapp-Firefox-NVLWI0.desktop; application/pdf=org.pwmt.zathura-pdf-mupdf.desktop; +video/webm=mpv.desktop; +text/plain=nvim.desktop;vim.desktop;org.gnome.gedit.desktop; diff --git a/.config/mpv/input.conf b/.config/mpv/input.conf index d614b15..01d010b 100644 --- a/.config/mpv/input.conf +++ b/.config/mpv/input.conf @@ -3,3 +3,5 @@ h seek -5 j seek -60 k seek 60 S cycle sub +Ctrl+f script-binding quality_menu/video_formats_toggle #! Stream Quality > Video +Alt+f script-binding quality_menu/audio_formats_toggle #! Stream Quality > Audio diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 63c4387..496fc47 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -11,7 +11,7 @@ " == ===== ==== == " ======================== -set runtimepath^=/home/jozan/.config/nvim runtimepath+=/home/jozan/.config/nvim/after +set runtimepath^=/home/r_bousset/.config/nvim runtimepath+=/home/jozan/.config/nvim/after let &packpath = &runtimepath if ! filereadable(system('echo -n "$XDG_DATA_HOME/nvim/autoload/plug.vim"')) echo "Downloading junegunn/vim-plug to manage plugins..." diff --git a/.config/nvim/plug.vim b/.config/nvim/plug.vim index bd725c9..8b03e57 100644 --- a/.config/nvim/plug.vim +++ b/.config/nvim/plug.vim @@ -34,4 +34,5 @@ Plug 'vim-airline/vim-airline-themes' Plug 'vim-scripts/grep.vim' Plug 'voldikss/fzf-floaterm' Plug 'voldikss/vim-floaterm' +Plug 'chrisbra/csv.vim' call plug#end() diff --git a/.config/openbox/autostart b/.config/openbox/autostart index 4bc1506..0be8a58 100755 --- a/.config/openbox/autostart +++ b/.config/openbox/autostart @@ -15,3 +15,43 @@ # If you want to use XFCE config tools... # #xfce-mcs-manager & +startif() { + pgrep "$(basename "$1")" >/dev/null || "$@" >/dev/null 2>&1 & +} + +delay_desktop() { + sleep 5 + startif conky -d -c "$HOME"/.config/conkyrc + startif tint2 + # startif cairo-clock -x 900 -y 20 --width 300 --height 300 --theme zen + # startif cairo-dock + startif plank + startif idesk +} + +export LANG='en_US.UTF-8' +pgrep musicpd >/dev/null || musicpd >/dev/null 2>&1 +"$HOME"/.local/bin/setwp "$HOME"/pics/wp.jpg +"$HOME"/.local/bin/kb +xset s off +xset -dpms +if xrandr | grep -F 'DisplayPort-0 connected' >/dev/null 2>&1; then + "$HOME"/.local/bin/scr +else + "$HOME"/.local/bin/dscr +fi +# xsetroot -name 'Loading bar...' +startif dunst +startif picom +# startif lowbat +# startif mpd-notification +startif xscreensaver +delay_desktop & +# startif dwmblocks +# startif sb-updatempd +# /compat/linux/usr/lib/protonmail/bridge/proton-bridge --noninteractive +# ekb +cd "$HOME" +xrdb "$HOME"/.config/x11/xresources +notify-send -u normal 'Welcome' " Welcome back, partner\!" +# dbus-launch openbox diff --git a/.config/openbox/menu.xml b/.config/openbox/menu.xml index b92c1c0..02e7c88 100755 --- a/.config/openbox/menu.xml +++ b/.config/openbox/menu.xml @@ -16,6 +16,11 @@ <command>pcmanfm</command> </action> </item> + <item label="Qalculate!"> + <action name="Execute"> + <command>qalculate-gtk</command> + </action> + </item> </menu> <menu id="apps-editors-menu" label="Editors"> @@ -80,21 +85,31 @@ </menu> <menu id="system-menu" label="System"> - <item label="Openbox Configuration Manager"> + <item label="Openbox configuration"> <action name="Execute"> <command>obconf</command> </action> </item> - <item label="tint2 Configuration Manager"> + <item label="tint2 configuration"> <action name="Execute"> <command>tint2conf</command> </action> </item> - <item label="Theme Manager"> + <item label="Theme manager"> <action name="Execute"> <command>lxappearance</command> </action> </item> + <item label="XScreenSaver configuration"> + <action name="Execute"> + <command>xscreensaver-settings</command> + </action> + </item> + <item label="Displays configuration"> + <action name="Execute"> + <command>arandr</command> + </action> + </item> <separator /> <item label="Reconfigure Openbox"> <action name="Reconfigure" /> @@ -113,9 +128,9 @@ <command>pcmanfm</command> </action> </item> - <item label="Iridium"> + <item label="Firefox"> <action name="Execute"> - <command>iridium-browser --force-dark-mode</command> + <command>firefox</command> </action> </item> <separator /> @@ -128,7 +143,7 @@ <separator label="System" /> <menu id="system-menu"/> <separator /> - <item label="Reload"> + <item label="Reconfigure Openbox"> <action name="Reconfigure" /> </item> <item label="Lock screen"> @@ -138,7 +153,7 @@ </item> <item label="Sleep"> <action name="Execute"> - <command>sh -c "notify-send -u normal reboot \" G'night, partner!\"; sleep 2; acpiconf -s 3"</command> + <command>sh -c "notify-send -u normal reboot \" G'night, partner!\"; sleep 2; acpiconf -s 3"</command> </action> </item> <item label="Log Out"> @@ -148,12 +163,12 @@ </item> <item label="Reboot"> <action name="Execute"> - <command>sh -c "emacsclient -e '\"(save-buffers-kill-emacs)\"'; notify-send -u normal reboot \" Rebootin' now!\"; sleep 2; shutdown -r now"</command> + <command>sh -c "emacsclient -e '\"(save-buffers-kill-emacs)\"'; notify-send -u normal reboot \" Rebootin' now!\"; sleep 2; systemctl reboot</command> </action> </item> <item label="Shutdown"> <action name="Execute"> - <command>sh -c "emacsclient -e '\"(save-buffers-kill-emacs)\"'; notify-send -u normal shutdown ' Farewell, partner!'; sleep 2; shutdown -p now"</command> + <command>sh -c "emacsclient -e '\"(save-buffers-kill-emacs)\"'; notify-send -u normal shutdown ' Farewell, partner!'; sleep 2; systemctl poweroff</command> </action> </item> </menu> diff --git a/.config/openbox/rc.xml b/.config/openbox/rc.xml index 2609807..9450afe 100755 --- a/.config/openbox/rc.xml +++ b/.config/openbox/rc.xml @@ -42,7 +42,7 @@ 'Active' - where the active window is --> </placement> <theme> - <name>Clearlooks-Joe</name> + <name>Clearlooks</name> <titleLayout>SNLIMC</titleLayout> <!-- available characters are NDSLIMC, each can occur at most once. @@ -57,7 +57,7 @@ <keepBorder>yes</keepBorder> <animateIconify>yes</animateIconify> <font place="ActiveWindow"> - <name>Cantarell Medium</name> + <name>NotoSans Nerd Font</name> <size>11</size> <!-- font size in points --> <weight>Normal</weight> @@ -66,7 +66,7 @@ <!-- 'italic' or 'normal' --> </font> <font place="InactiveWindow"> - <name>Cantarell Medium</name> + <name>NotoSans Nerd Font</name> <size>11</size> <!-- font size in points --> <weight>Normal</weight> @@ -75,7 +75,7 @@ <!-- 'italic' or 'normal' --> </font> <font place="MenuHeader"> - <name>Cantarell Medium</name> + <name>NotoSans Nerd Font</name> <size>14</size> <!-- font size in points --> <weight>Normal</weight> @@ -84,7 +84,7 @@ <!-- 'italic' or 'normal' --> </font> <font place="MenuItem"> - <name>Cantarell Medium</name> + <name>NotoSans Nerd Font</name> <size>14</size> <!-- font size in points --> <weight>Normal</weight> @@ -93,7 +93,7 @@ <!-- 'italic' or 'normal' --> </font> <font place="ActiveOnScreenDisplay"> - <name>Cantarell Medium</name> + <name>NotoSans Nerd Font</name> <size>11</size> <!-- font size in points --> <weight>Normal</weight> @@ -102,7 +102,7 @@ <!-- 'italic' or 'normal' --> </font> <font place="InactiveOnScreenDisplay"> - <name>Cantarell Medium</name> + <name>NotoSans Nerd Font</name> <size>11</size> <!-- font size in points --> <weight>Normal</weight> @@ -122,18 +122,13 @@ and back in --> <number>4</number> <firstdesk>1</firstdesk> - <names> - <!-- set names up here if you want to, like this: - <name>desktop 1</name> - <name>desktop 2</name> - --> - </names> + <names/> <popupTime>500</popupTime> <!-- The number of milliseconds to show the popup for when switching desktops. Set this to 0 to disable the popup. --> </desktops> <resize> - <drawContents>yes</drawContents> + <drawContents>no</drawContents> <popupShow>Nonpixel</popupShow> <!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) --> <popupPosition>Center</popupPosition> @@ -229,11 +224,6 @@ <to>9</to> </action> </keybind> - <keybind key="W-0"> - <action name="GoToDesktop"> - <to>10</to> - </action> - </keybind> <keybind key="W-S-1"> <action name="SendToDesktop"> <to>1</to> @@ -289,11 +279,30 @@ </action> </keybind> <keybind key="W-S-0"> + <action name="ToggleOmnipresent"/> + </keybind> + <keybind key="W-S-h"> <action name="SendToDesktop"> - <to>10</to> + <to>previous</to> <wrap>no</wrap> </action> </keybind> + <keybind key="W-S-l"> + <action name="SendToDesktop"> + <to>next</to> + <wrap>no</wrap> + </action> + </keybind> + <keybind key="W-C-h"> + <action name="MoveResizeTo"> + <monitor>next</monitor> + </action> + </keybind> + <keybind key="W-C-l"> + <action name="MoveResizeTo"> + <monitor>prev</monitor> + </action> + </keybind> <!-- <keybind key="W-d"> --> <!-- <action name="ToggleShowDesktop"/> --> <!-- </keybind> --> @@ -396,7 +405,7 @@ </keybind> <keybind key="W-F3"> <action name="Execute"> - <command>iridium-browser --force-dark-mode</command> + <command>firefox</command> </action> </keybind> <keybind key="W-S-F3"> @@ -422,7 +431,7 @@ </keybind> <keybind key="W-F7"> <action name="Execute"> - <command>alacritty -e calcurse -C /home/jozan/.config/calcurse -D /home/jozan/.local/share/calcurse</command> + <command>alacritty -e calcurse -C ~/.config/calcurse -D ~/.local/share/calcurse</command> </action> </keybind> <keybind key="W-F8"> @@ -472,77 +481,77 @@ </keybind> <keybind key="W-S-F10"> <action name="Execute"> - <command>/home/jozan/.local/bin/mixer-set toggle</command> + <command>~/.local/bin/mixer-set toggle</command> </action> </keybind> <keybind key="W-S-F11"> <action name="Execute"> - <command>/home/jozan/.local/bin/mixer-set lower</command> + <command>~/.local/bin/mixer-set lower</command> </action> </keybind> <keybind key="W-S-F12"> <action name="Execute"> - <command>/home/jozan/.local/bin/mixer-set raise</command> + <command>~/.local/bin/mixer-set raise</command> </action> </keybind> <keybind key="W-S-Delete"> <action name="Execute"> - <command>/home/jozan/.local/bin/mic</command> + <command>~/.local/bin/mic</command> </action> </keybind> <keybind key="W-C-F9"> <action name="Execute"> - <command>/home/jozan/.local/bin/dmkill</command> + <command>~/.local/bin/dmkill</command> </action> </keybind> <keybind key="W-C-F10"> <action name="Execute"> - <command>/home/jozan/.local/bin/dmscrot</command> + <command>~/.local/bin/dmscrot</command> </action> </keybind> <keybind key="W-C-F11"> <action name="Execute"> - <command>/home/jozan/.local/bin/dmsearch</command> + <command>~/.local/bin/dmsearch</command> </action> </keybind> <keybind key="W-C-F12"> <action name="Execute"> - <command>/home/jozan/.local/bin/dmlog</command> + <command>~/.local/bin/dmlog</command> </action> </keybind> <keybind key="W-BackSpace"> <action name="Execute"> - <command>/home/jozan/.local/bin/dmpc</command> + <command>~/.local/bin/dmpc</command> </action> </keybind> <keybind key="W-C-BackSpace"> <action name="Execute"> - <command>/home/jozan/.local/bin/dmlog</command> + <command>~/.local/bin/dmlog</command> </action> </keybind> <keybind key="W-C-p"> <action name="Execute"> - <command>/home/jozan/.local/bin/dmpass</command> + <command>~/.local/bin/dmpass</command> </action> </keybind> <keybind key="W-C-S-p"> <action name="Execute"> - <command>/home/jozan/.local/bin/dmpass --full</command> + <command>~/.local/bin/dmpass --full</command> </action> </keybind> <keybind key="W-C-o"> <action name="Execute"> - <command>/home/jozan/.local/bin/dmotp</command> + <command>~/.local/bin/dmotp</command> </action> </keybind> <keybind key="W-End"> <action name="Execute"> - <command>/home/jozan/.local/bin/ndate</command> + <command>~/.local/bin/ndate</command> </action> </keybind> <keybind key="W-Delete"> <action name="Execute"> - <command>/home/jozan/.local/bin/shutup</command> + <command>~/.local/bin/shutup</command> </action> </keybind> <keybind key="W-S-e"> @@ -558,6 +567,11 @@ <menu>root-menu</menu> </action> </keybind> + <keybind key="W-o"> + <action name="ShowMenu"> + <menu>client-list-combined-menu</menu> + </action> + </keybind> <keybind key="W-w"> <action name="Move"/> </keybind> diff --git a/.config/picom.conf b/.config/picom.conf index 4c024b6..d120c47 100644 --- a/.config/picom.conf +++ b/.config/picom.conf @@ -11,7 +11,7 @@ no-use-damage = true; # inactive-dim = 0.10; # inactive-dim-fixed = true; -corner-radius=5; +corner-radius=7; rounded-corners-exclude= [ "window_type = 'menu'", "window_type = 'dropdown_menu'", diff --git a/.config/pipe-viewer/gtk-pipe-viewer.conf b/.config/pipe-viewer/gtk-pipe-viewer.conf index 8838f4a..e6eb8c9 100644 --- a/.config/pipe-viewer/gtk-pipe-viewer.conf +++ b/.config/pipe-viewer/gtk-pipe-viewer.conf @@ -68,7 +68,7 @@ our $CONFIG = { mpv => { arg => "--really-quiet --force-media-title=*TITLE* *VIDEO*", audio => "--audio-file=*AUDIO*", - cmd => "/usr/local/bin/mpv", + cmd => "mpv", fs => "--fullscreen", srt => "--sub-file=*SUB*", }, diff --git a/.config/pipe-viewer/pipe-viewer.conf b/.config/pipe-viewer/pipe-viewer.conf index df1ff80..1fcc063 100644 --- a/.config/pipe-viewer/pipe-viewer.conf +++ b/.config/pipe-viewer/pipe-viewer.conf @@ -102,7 +102,7 @@ our $CONFIG = { mpv => { arg => "--really-quiet --force-media-title=*TITLE* *VIDEO*", audio => "--audio-file=*AUDIO*", - cmd => "/usr/local/bin/mpv", + cmd => "mpv", fs => "--fullscreen", novideo => "--no-video", srt => "--sub-file=*SUB*", @@ -124,7 +124,7 @@ our $CONFIG = { youtube_playlist_url => "https://www.youtube.com/playlist?list=%s", youtube_video_url => "https://www.youtube.com/watch?v=%s", ytdl => 1, - ytdl_cmd => "/usr/local/bin/yt-dlp", + ytdl_cmd => "/usr/bin/yt-dlp", ytdlp_comments => 0, ytdlp_max_comments => 10, ytdlp_max_replies => 3, diff --git a/.config/tint2/tint2rc b/.config/tint2/tint2rc index 10747a8..4d0d666 100755 --- a/.config/tint2/tint2rc +++ b/.config/tint2/tint2rc @@ -1,87 +1,161 @@ -#---- Generated by tint2conf 5578 ---- +#---- Generated by tint2conf 2613 ---- # See https://gitlab.com/o9000/tint2/wikis/Configure for # full documentation of the configuration options. #------------------------------------- # Gradients +# Gradient 1 +gradient = vertical +start_color = #99c1f1 100 +end_color = #1a5fb4 100 + #------------------------------------- # Backgrounds -# Background 1: Active taskbar, Default task, Iconified task, Inactive taskbar, Normal task, Panel +# Background 1: rounded = 0 border_width = 1 border_sides = TBLR border_content_tint_weight = 0 background_content_tint_weight = 0 -background_color = #cecece 100 -border_color = #4a4a4a 100 -background_color_hover = #ffa5a5 100 -border_color_hover = #4a4a4a 100 -background_color_pressed = #c75555 100 -border_color_pressed = #4a4a4a 100 - -# Background 2: -rounded = 0 +background_color = #eeeeee 0 +border_color = #bbbbbb 10 +background_color_hover = #eeeeee 0 +border_color_hover = #bbbbbb 10 +background_color_pressed = #eeeeee 0 +border_color_pressed = #bbbbbb 10 + +# Background 2: Barre des tâches active +rounded = 5 border_width = 0 border_sides = TBLR border_content_tint_weight = 0 background_content_tint_weight = 0 -background_color = #83a7e0 100 -border_color = #000000 100 -background_color_hover = #8fb6f3 100 -border_color_hover = #000000 100 -background_color_pressed = #bdd1f1 100 -border_color_pressed = #000000 100 - -# Background 3: Urgent task -rounded = 0 -border_width = 0 +background_color = #eeeeee 4 +border_color = #cccccc 44 +gradient_id = 0 +background_color_hover = #eeeeee 22 +border_color_hover = #eaeaea 44 +background_color_pressed = #dddddd 4 +border_color_pressed = #eaeaea 44 + +# Background 3: Tâche active +rounded = 5 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #dddddd 4 +border_color = #dbdbdb 100 +background_color_hover = #eeeeee 22 +border_color_hover = #999999 100 +background_color_pressed = #dddddd 4 +border_color_pressed = #999999 100 + +# Background 4: Tâche urgente +rounded = 5 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #ffa348 100 +border_color = #aa7733 100 +background_color_hover = #ffa348 100 +border_color_hover = #aa7733 100 +background_color_pressed = #ffa348 100 +border_color_pressed = #aa7733 100 + +# Background 5: Infobulle +rounded = 2 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #ffffaa 100 +border_color = #999999 100 +background_color_hover = #ffffaa 100 +border_color_hover = #999999 100 +background_color_pressed = #ffffaa 100 +border_color_pressed = #999999 100 + +# Background 6: Nom du bureau inactif +rounded = 2 +border_width = 1 border_sides = TBLR border_content_tint_weight = 0 background_content_tint_weight = 0 -background_color = #ffd462 100 -border_color = #000000 100 -background_color_hover = #ffd462 100 -border_color_hover = #000000 100 -background_color_pressed = #f1e3bd 100 -border_color_pressed = #000000 100 - -# Background 4: Active task +background_color = #eeeeee 4 +border_color = #cccccc 30 +background_color_hover = #eeeeee 22 +border_color_hover = #999999 30 +background_color_pressed = #dddddd 4 +border_color_pressed = #999999 30 + +# Background 7: +rounded = 2 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #dddddd 3 +border_color = #999999 100 +background_color_hover = #dddddd 3 +border_color_hover = #999999 100 +background_color_pressed = #dddddd 3 +border_color_pressed = #999999 100 + +# Background 8: Panel rounded = 0 -border_width = 0 +border_width = 1 border_sides = TBLR border_content_tint_weight = 0 background_content_tint_weight = 0 -background_color = #9a0300 100 -border_color = #000000 100 +background_color = #eeeeee 4 +border_color = #cccccc 44 +gradient_id = 1 +background_color_hover = #eeeeee 22 +border_color_hover = #eaeaea 44 +gradient_id_hover = 0 +background_color_pressed = #dddddd 4 +border_color_pressed = #eaeaea 44 +gradient_id_pressed = 0 + +# Background 9: Bouton, Nom du bureau actif, Tâche icônifiée, Tâche par défaut +rounded = 5 +border_width = 1 +border_sides = TBLR +border_content_tint_weight = 0 +background_content_tint_weight = 0 +background_color = #eeeeee 4 +border_color = #cccccc 44 gradient_id = 0 -background_color_hover = #be0300 100 -border_color_hover = #000000 100 -background_color_pressed = #be403e 100 -border_color_pressed = #000000 100 +background_color_hover = #eeeeee 22 +border_color_hover = #eaeaea 44 +background_color_pressed = #dddddd 4 +border_color_pressed = #eaeaea 44 #------------------------------------- # Panel -panel_items = L:T:S:B:C -panel_size = 100% 25 +panel_items = PTSBC +panel_size = 100% 32 panel_margin = 0 0 -panel_padding = 0 0 0 -panel_background_id = 1 +panel_padding = 4 2 4 +panel_background_id = 8 wm_menu = 1 panel_dock = 0 panel_pivot_struts = 0 panel_position = top center horizontal -panel_layer = bottom +panel_layer = normal panel_monitor = all panel_shrink = 0 autohide = 0 autohide_show_timeout = 0 -autohide_hide_timeout = 0 -autohide_height = 1 +autohide_hide_timeout = 0.5 +autohide_height = 2 strut_policy = follow_size panel_window_name = tint2 -disable_transparency = 1 +disable_transparency = 0 mouse_effects = 1 font_shadow = 0 -mouse_hover_icon_asb = 100 -2 10 +mouse_hover_icon_asb = 100 0 10 mouse_pressed_icon_asb = 100 0 0 scale_relative_to_dpi = 0 scale_relative_to_screen_height = 0 @@ -90,158 +164,144 @@ scale_relative_to_screen_height = 0 # Taskbar taskbar_mode = single_desktop taskbar_hide_if_empty = 0 -taskbar_padding = 0 0 0 -taskbar_background_id = 1 -taskbar_active_background_id = 1 +taskbar_padding = 1 0 2 +taskbar_background_id = 0 +taskbar_active_background_id = 2 taskbar_name = 1 taskbar_hide_inactive_tasks = 0 taskbar_hide_different_monitor = 1 taskbar_hide_different_desktop = 1 taskbar_always_show_all_desktop_tasks = 0 -taskbar_name_padding = 0 0 -taskbar_name_background_id = 0 -taskbar_name_active_background_id = 0 -taskbar_name_font = Cantarell Medium 10 -taskbar_name_font_color = #000000 100 -taskbar_name_active_font_color = #000000 100 -taskbar_distribute_size = 0 -taskbar_sort_order = none +taskbar_name_padding = 6 3 +taskbar_name_background_id = 6 +taskbar_name_active_background_id = 9 +taskbar_name_font = sans Bold 9 +taskbar_name_font_color = #ffffff 100 +taskbar_name_active_font_color = #ffffff 100 +taskbar_distribute_size = 1 +taskbar_sort_order = application task_align = left #------------------------------------- # Task task_text = 1 task_icon = 1 -task_centered = 0 -urgent_nb_of_blink = 0 -task_maximum_size = 0 0 -task_padding = 0 0 0 +task_centered = 1 +urgent_nb_of_blink = 100000 +task_maximum_size = 180 40 +task_padding = 4 4 4 +task_font = Sans 9 task_tooltip = 1 task_thumbnail = 1 -task_thumbnail_size = 300 -task_font_color = #000000 100 +task_thumbnail_size = 210 +task_font_color = #eeeeee 100 task_active_font_color = #ffffff 100 -task_background_id = 1 -task_normal_background_id = 1 -task_active_background_id = 4 -task_urgent_background_id = 3 -task_iconified_background_id = 1 +task_iconified_font_color = #ffffff 66 +task_icon_asb = 100 0 -15 +task_active_icon_asb = 100 0 0 +task_iconified_icon_asb = 70 -50 -50 +task_background_id = 9 +task_active_background_id = 3 +task_urgent_background_id = 4 +task_iconified_background_id = 9 mouse_left = toggle_iconify mouse_middle = none -mouse_right = toggle_iconify +mouse_right = none mouse_scroll_up = none mouse_scroll_down = none #------------------------------------- # System tray (notification area) -systray_padding = 0 0 0 +systray_padding = 4 0 2 systray_background_id = 0 systray_sort = ascending -systray_icon_size = 0 +systray_icon_size = 22 systray_icon_asb = 100 0 0 -systray_monitor = 1 +systray_monitor = primary systray_name_filter = #------------------------------------- # Launcher -launcher_padding = 0 0 5 +launcher_padding = 0 0 2 launcher_background_id = 0 launcher_icon_background_id = 0 -launcher_icon_size = 0 +launcher_icon_size = 22 launcher_icon_asb = 100 0 0 launcher_icon_theme_override = 0 -startup_notifications = 0 -launcher_tooltip = 0 +startup_notifications = 1 +launcher_tooltip = 1 launcher_item_app = /usr/share/applications/pcmanfm.desktop -launcher_item_app = /usr/share/applications/Alacritty.desktop -launcher_item_app = /usr/share/applications/iridium-browser.desktop -launcher_item_app = /usr/share/applications/steam.desktop -launcher_item_app = /usr/share/applications/net.lutris.Lutris.desktop -launcher_item_app = /usr/share/applications/discord.desktop -launcher_item_app = /usr/local/share/applications/pcmanfm.desktop -launcher_item_app = /usr/local/share/applications/Alacritty.desktop -launcher_item_app = /usr/local/share/applications/iridium-browser.desktop +launcher_item_app = /usr/share/applications/com.alacritty.Alacritty.desktop +launcher_item_app = /usr/share/applications/emacs.desktop +launcher_item_app = /usr/share/applications/ario.desktop +launcher_item_app = firefox.desktop +launcher_item_app = /usr/share/applications/thunderbird.desktop #------------------------------------- # Clock time1_format = %H:%M -time2_format = -time1_font = Cantarell 11 +time2_format = %A %d %B +time1_font = sans Bold 10 time1_timezone = time2_timezone = -clock_font_color = #000000 100 -clock_padding = 0 0 +time2_font = sans 7 +clock_font_color = #ffffff 100 +clock_padding = 1 0 clock_background_id = 0 clock_tooltip = clock_tooltip_timezone = -clock_lclick_command = ndate -clock_rclick_command = +clock_lclick_command = zenity --calendar --text "" +clock_rclick_command = thunderbird -calendar clock_mclick_command = clock_uwheel_command = clock_dwheel_command = #------------------------------------- # Battery -battery_tooltip = 0 -battery_low_status = 0 -battery_low_cmd = -battery_full_cmd = -bat1_font = Cantarell Medium 9 -battery_font_color = #000000 100 +battery_tooltip = 1 +battery_low_status = 10 +battery_low_cmd = notify-send -u critical 'Battery low!' +battery_full_cmd = notify-send -u normal 'Battery full' +bat1_font = Sans Bold 10 +bat2_font = sans 6 +battery_font_color = #ffffff 100 bat1_format = %p -bat2_format = %s -battery_padding = 0 0 +bat2_format = %s - %h:%m +battery_padding = 1 0 battery_background_id = 0 -battery_hide = 100 +battery_hide = 101 battery_lclick_command = battery_rclick_command = battery_mclick_command = battery_uwheel_command = battery_dwheel_command = -ac_connected_cmd = notify-send -u low batter 'AC plugged' -ac_disconnected_cmd = notify-send -u low batter 'AC unplugged' - -#------------------------------------- -# Separator 1 -separator = new -separator_background_id = 0 -separator_color = #777777 86 -separator_style = empty -separator_size = 6 -separator_padding = 1 0 - -#------------------------------------- -# Separator 2 -separator = new -separator_background_id = 0 -separator_color = #777777 86 -separator_style = empty -separator_size = 6 -separator_padding = 1 0 - -#------------------------------------- -# Separator 3 -separator = new -separator_background_id = 0 -separator_color = #777777 86 -separator_style = empty -separator_size = 6 -separator_padding = 1 0 +ac_connected_cmd = +ac_disconnected_cmd = #------------------------------------- -# Separator 4 -separator = new -separator_background_id = 0 -separator_color = #777777 51 -separator_style = empty -separator_size = 6 -separator_padding = 1 0 +# Button 1 +button = new +button_icon = Pop/24x24/places/pop-os.svg +button_text = Menu +button_tooltip = Start +button_lclick_command = xdotool key super+space +button_rclick_command = xdotool key super+space +button_mclick_command = xdotool key super+o +button_uwheel_command = +button_dwheel_command = +button_font = NotoSans Nerd Font Medium Semi-Condensed 11 +button_font_color = #ffffff 100 +button_padding = 0 0 +button_background_id = 9 +button_centered = 0 +button_max_icon_size = 0 #------------------------------------- # Tooltip -tooltip_show_timeout = 0 -tooltip_hide_timeout = 0 -tooltip_padding = 0 0 -tooltip_background_id = 0 -tooltip_font_color = #000000 100 +tooltip_show_timeout = 0.5 +tooltip_hide_timeout = 0.1 +tooltip_padding = 2 2 +tooltip_background_id = 5 +tooltip_font_color = #222222 100 +tooltip_font = sans 9 diff --git a/.config/x11/xinitrc b/.config/x11/xinitrc index a61f84d..fc2fa90 100644 --- a/.config/x11/xinitrc +++ b/.config/x11/xinitrc @@ -8,8 +8,9 @@ delay_desktop() { sleep 5 startif conky -d -c "$HOME"/.config/conkyrc startif tint2 - startif cairo-clock -x 900 -y 20 --width 300 --height 300 --theme zen - startif cairo-dock + # startif cairo-clock -x 900 -y 20 --width 300 --height 300 --theme zen + # startif cairo-dock + startif plank startif idesk } @@ -21,11 +22,16 @@ xrandr --output HDMI-1 --primary --mode 2560x1440 --pos 1920x347 --rotate normal xset s off xset -dpms # xsetroot -name 'Loading bar...' +# if xrandr | grep -F 'DisplayPort-0 connected' >/dev/null 2>&1; then +# "$HOME"/.local/bin/scr +# else +# "$HOME"/.local/bin/dscr +# fi startif dunst startif picom -startif lowbat -startif mpd-notification -startif xscreensaver --no-splash +# startif lowbat +# startif mpd-notification +startif xscreensaver delay_desktop & # startif dwmblocks # startif sb-updatempd @@ -33,5 +39,5 @@ delay_desktop & # ekb cd "$HOME" xrdb "$HOME"/.config/x11/xresources -notify-send -u normal 'Welcome' " Welcome back, partner\!" -dbus-launch openbox +notify-send -u normal 'Welcome' " Welcome back, partner\!" +# dbus-launch openbox diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 6af7f1d..df8e9de 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -102,5 +102,5 @@ bindkey -v "^ " globalias bindkey -v " " magic-space bindkey -M isearch " " magic-space -PROMPT="%B%{$fg[red]%}%M %{$fg[blue]%}%c%{$fg[red]%}%#%{$reset_color%} " +PROMPT="%B%{$fg[blue]%}%m %{$fg[cyan]%}%c%{$fg[blue]%}%#%{$reset_color%} " RPROMPT="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}" diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh index 52dea29..58e0d6d 100644 --- a/.config/zsh/alias.zsh +++ b/.config/zsh/alias.zsh @@ -61,6 +61,7 @@ alias \ gt='gpg-tui' \ lg='lazygit' \ gjdo='/home/jozan/dev/perl/gitjoe-scripts/gitjoe-do.pl' \ + ddgit='git --git-dir=$HOME/docs/redot --work-tree=$HOME' \ dgit='git --git-dir=$HOME/docs/dotfiles-bsd --work-tree=$HOME' \ confgit='git --git-dir=$HOME/docs/conffiles-bsd --work-tree=/' bssh() { @@ -195,6 +196,7 @@ twi() { alias nb='newsboat' \ mutt='neomutt' \ sxiv='nsxiv -b -a' \ + nsxiv='nsxiv -b -a' \ pinfo='pkg info -x' \ psearch='pkg search' \ pinstall='doas pkg install' \ @@ -9,7 +9,7 @@ table Config ToolTip.CaptionOnHover: false ToolTip.CaptionPlacement: Right Locked: false - Transparency: 75 + Transparency: 0 Shadow: false ShadowColor: #9d0000 ShadowX: 1 diff --git a/.idesktop/ario.lnk b/.idesktop/ario.lnk index bf96a4b..a11b9ad 100644 --- a/.idesktop/ario.lnk +++ b/.idesktop/ario.lnk @@ -1,10 +1,10 @@ table Icon Caption: Ario ToolTip.Caption: GTK MPD client - Icon: /usr/local/share/icons/hicolor/64x64/apps/ario.png + Icon: /usr/share/icons/hicolor/64x64/apps/ario.png Width: 64 Height: 64 - X: 704 + X: 1984 Y: 576 Command[0]: ario end diff --git a/.idesktop/firefox.lnk b/.idesktop/firefox.lnk index 9645f93..ea6a808 100644 --- a/.idesktop/firefox.lnk +++ b/.idesktop/firefox.lnk @@ -1,10 +1,10 @@ table Icon Caption: Firefox ToolTip.Caption: Firefox Web Browser - Icon: /usr/local/share/icons/nuoveXT2/64x64/apps/mozilla-firefox.png + Icon: /usr/share/icons/hicolor/64x64/apps/firefox.png Width: 64 Height: 64 - X: 704 + X: 1984 Y: 320 Command[0]: firefox Command[1]: torify firefox diff --git a/.idesktop/home.lnk b/.idesktop/home.lnk index 6b24717..1f130ca 100644 --- a/.idesktop/home.lnk +++ b/.idesktop/home.lnk @@ -1,10 +1,10 @@ table Icon Caption: Home ToolTip.Caption: Open PCManFM in the home directory - Icon: /usr/local/share/icons/Faenza/places/64/folder-home.png + Icon: /usr/share/icons/Faenza/places/64/folder-home.png Width: 64 Height: 64 - X: 704 + X: 1984 Y: 192 Command[0]: pcmanfm ~/ end diff --git a/.idesktop/iridium.lnk b/.idesktop/iridium.lnk deleted file mode 100644 index 6c0a781..0000000 --- a/.idesktop/iridium.lnk +++ /dev/null @@ -1,12 +0,0 @@ -table Icon - Caption: Iridium - ToolTip.Caption: Iridium Web Browser - Icon: /usr/local/share/icons/hicolor/64x64/apps/iridium.png - Width: 64 - Height: 64 - X: 704 - Y: 448 - Command[0]: iridium-browser - Command[1]: torify iridium-browser -end - diff --git a/.idesktop/openbox.lnk b/.idesktop/openbox.lnk index f39c3e9..8749357 100644 --- a/.idesktop/openbox.lnk +++ b/.idesktop/openbox.lnk @@ -1,10 +1,10 @@ table Icon Caption: Openbox ToolTip.Caption: Openbox menu - Icon: /usr/local/share/icons/matefaenza/apps/64/mate-panel-launcher.png + Icon: /usr/share/icons/Faenza/apps/64/gnome-panel-launcher.png Width: 64 Height: 64 - X: 704 + X: 1984 Y: 64 Command[0]: xdotool key super+space end diff --git a/.idesktop/thunderbird.lnk b/.idesktop/thunderbird.lnk new file mode 100644 index 0000000..235ce12 --- /dev/null +++ b/.idesktop/thunderbird.lnk @@ -0,0 +1,11 @@ +table Icon + Caption: Thunderbird + ToolTip.Caption: Thunderbird Mail Client + Icon: /usr/share/icons/hicolor/64x64/apps/thunderbird.png + Width: 64 + Height: 64 + X: 1984 + Y: 448 + Command[0]: thunderbird +end + diff --git a/.local/bin/dmlog b/.local/bin/dmlog index 3d6ccc1..a4c0182 100755 --- a/.local/bin/dmlog +++ b/.local/bin/dmlog @@ -62,11 +62,11 @@ sub action '-u', 'normal', 'shutdown', - ' G\'night, partner!' + ' G\'night, partner!' ); sleep 2; if (OS eq 'Linux') { - exec(LOGINCTL_PATH, 'suspend'); + exec('systemctl', 'suspend'); } exec(ACPI_PATH, '-s', '3'); } @@ -84,8 +84,15 @@ sub action if (confirm($var) == 1) { system(EMACS_PATH, '-e', '"(save-buffers-kill-terminal)"'); if (OS eq 'Linux') { - exec(LOGINCTL_PATH, 'reboot'); + exec('systemctl', 'reboot'); } + system( + NOTIF_PATH, + '-u', + 'normal', + 'shutdown', + ' Rebootin\', partner!' + ); exec(SHUTDOWN_PATH, '-r', 'now'); } } @@ -97,11 +104,11 @@ sub action '-u', 'normal', 'shutdown', - ' Farewell, partner!' + ' Farewell, partner!' ); sleep 2; if (OS eq 'Linux') { - exec(LOGINCTL_PATH, 'poweroff'); + exec('systemctl', 'poweroff'); } exec(SHUTDOWN_PATH, '-p', 'now'); } diff --git a/.local/bin/dmpass b/.local/bin/dmpass index 11725c7..6836d41 100755 --- a/.local/bin/dmpass +++ b/.local/bin/dmpass @@ -23,13 +23,15 @@ password=$(printf "%s\n" "${password_files}" | "$dmenu" -i -l 15 -m 0) [ -n "$password" ] || exit +p="$(pass show "$password")" + if [ $full -eq 1 ]; then id=$(printf "%s" "$password" | sed 's/.*___//') printf "%s\n" $id | { IFS= read -r pass; printf %s "$id"; } | $xdotool xdotool key Tab - pass show "$password" | { IFS= read -r pass; printf %s "$pass"; } | $xdotool + printf "%s\n" "$p" | { IFS= read -r pass; printf %s "$pass"; } | $xdotool xdotool key Return exit fi -pass show "$password" | { IFS= read -r pass; printf %s "$pass"; } | $xdotool +printf "%s\n" "$p" | { IFS= read -r pass; printf %s "$pass"; } | $xdotool |