From 28d0faf2817da30a9f76ceaf1678e15f89ba8ffd Mon Sep 17 00:00:00 2001 From: Dominic Reich Date: Sat, 25 Feb 2023 21:42:05 +0100 Subject: [PATCH] general updates --- .abook/abookrc | 2 +- .config/alacritty/alacritty.yml | 13 +++++---- .config/alacritty/neomutt.yml | 47 ++++++++++++++++-------------- .config/fish/config.fish | 4 +++ .config/git/config | 4 +-- .config/gtk-2.0/gtkfilechooser.ini | 4 +-- .config/i3/config | 9 ++++-- .config/ncmpcpp/config | 2 +- .config/neofetch/config.conf | 9 +++--- .config/neomutt/mailcap | 23 ++++++++------- .config/nitrogen/bg-saved.cfg | 2 +- .config/nitrogen/nitrogen.cfg | 4 +-- .zprezto | 2 +- bin/backup.sh | 1 + 14 files changed, 71 insertions(+), 55 deletions(-) diff --git a/.abook/abookrc b/.abook/abookrc index 3c7f41e..e507ca8 100755 --- a/.abook/abookrc +++ b/.abook/abookrc @@ -67,7 +67,7 @@ set mutt_return_all_emails=true set print_command=lp # Command used to start the web browser -set www_command=firefox +set www_command=librewolf # address style [eu|us|uk] set address_style=eu diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 09f9248..db838e2 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -32,7 +32,7 @@ env: TERM: xterm-256color shell: - program: /usr/bin/fish + program: /usr/bin/zsh args: - --login window: @@ -48,21 +48,24 @@ window: #startup_mode: Windowed # opacity: 0.96 # opacity: 1.0 - opacity: 0.8 + opacity: 0.93 scrolling: history: 10000 multiplier: 1 font: normal: - family: 'FantasqueSansMono Nerd Font' + family: "MesloLGS NF" + # family: 'FantasqueSansMono Nerd Font' # style: Retina,Regular style: Regular bold: - family: 'FantasqueSansMono Nerd Font' + family: "MesloLGS NF" + # family: 'FantasqueSansMono Nerd Font' # style: Retina,Regular style: Bold italic: - family: 'FantasqueSansMono Nerd Font' + family: "MesloLGS NF" + # family: 'FantasqueSansMono Nerd Font' # style: Retina,Regular style: Italic size: 12 diff --git a/.config/alacritty/neomutt.yml b/.config/alacritty/neomutt.yml index f381093..2e1be61 100644 --- a/.config/alacritty/neomutt.yml +++ b/.config/alacritty/neomutt.yml @@ -32,7 +32,7 @@ env: TERM: xterm-256color shell: - program: /usr/bin/fish + program: /usr/bin/zsh args: - --login window: @@ -44,28 +44,31 @@ window: y: 8 dynamic_padding: true dynamic_title: true - decorations: none - startup_mode: Windowed + #decorations: none + #startup_mode: Windowed # opacity: 0.96 - # opacity: 0.9 - opacity: 0.8 + # opacity: 1.0 + opacity: 0.93 scrolling: history: 10000 multiplier: 1 font: normal: - family: 'FantasqueSansMono Nerd Font' + family: "MesloLGS NF" + # family: 'FantasqueSansMono Nerd Font' # style: Retina,Regular style: Regular bold: - family: 'FantasqueSansMono Nerd Font' + family: "MesloLGS NF" + # family: 'FantasqueSansMono Nerd Font' # style: Retina,Regular style: Bold italic: - family: 'FantasqueSansMono Nerd Font' + family: "MesloLGS NF" + # family: 'FantasqueSansMono Nerd Font' # style: Retina,Regular style: Italic - size: 14.0 + size: 11.5 offset: x: 0 y: 0 @@ -116,24 +119,24 @@ bell: animation: Linear duration: 0 color: '0x320F09' -mouse_bindings: - - { mouse: Middle, action: None } +# mouse_bindings: + # - { mouse: Middle, action: None } mouse: double_click: { threshold: 300 } triple_click: { threshold: 300 } hide_when_typing: false # hints: - # enabled: - # - regex: "(ipfs:|ipns:|magnet:|mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)\ - # [^\u0000-\u001F\u007F-\u009F<>\"\\s{-}\\^⟨⟩`]+" - # command: xdg-open - # post_processing: true - # mouse: - # enabled: true - # mods: None - # binding: - # key: U - # mods: Control|Shift + # enabled: + # - regex: "(ipfs:|ipns:|magnet:|mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)\ + # [^\u0000-\u001F\u007F-\u009F<>\"\\s{-}\\^⟨⟩`]+" + # command: xdg-open + # post_processing: true + # mouse: + # enabled: true + # mods: None + # binding: + # key: U + # mods: Control|Shift selection: semantic_escape_chars: ",│`|:\"' ()[]{}<>" save_to_clipboard: false diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 5d172a9..e5e4f8d 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -160,6 +160,10 @@ if type -q "geld" set -x GELD_DB ~/.config/geld.db end +if type -q "ncmpcpp" + set -x MPD_HOST ~/.config/mpd/socket +end + # Ensure that GPG Agent is used as the SSH agent set -e SSH_AUTH_SOCK #set -U -x SSH_AUTH_SOCK ~/.gnupg/S.gpg-agent.ssh diff --git a/.config/git/config b/.config/git/config index 6e05a81..9cfe0e1 100644 --- a/.config/git/config +++ b/.config/git/config @@ -155,8 +155,8 @@ # ╔════════════════════════════════════════════════════════════════════════════╗ # ║ GitLab ║ # ╚════════════════════════════════════════════════════════════════════════════╝ -[url "ssh://git@gitlab.com/"] - insteadOf = https://gitlab.com/ +#[url "ssh://git@gitlab.com/"] +# insteadOf = https://gitlab.com/ # ╔════════════════════════════════════════════════════════════════════════════╗ # ║ Codeberg ║ diff --git a/.config/gtk-2.0/gtkfilechooser.ini b/.config/gtk-2.0/gtkfilechooser.ini index cb289d2..cd9ee48 100644 --- a/.config/gtk-2.0/gtkfilechooser.ini +++ b/.config/gtk-2.0/gtkfilechooser.ini @@ -2,8 +2,8 @@ LocationMode=path-bar ShowHidden=false ShowSizeColumn=true -GeometryX=28 -GeometryY=254 +GeometryX=456 +GeometryY=207 GeometryWidth=1008 GeometryHeight=692 SortColumn=name diff --git a/.config/i3/config b/.config/i3/config index e06bbbb..e7d973b 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -287,8 +287,8 @@ mode "$mode_system" { bindsym l exec --no-startup-id i3exit lock, mode "default" bindsym s exec --no-startup-id i3exit suspend, mode "default" bindsym u exec --no-startup-id i3exit switch_user, mode "default" - # bindsym e exec --no-startup-id i3exit logout, mode "default" - bindsym e exec --no-startup-id pkill X + bindsym e exec --no-startup-id i3exit logout, mode "default" + # bindsym e exec --no-startup-id pkill X bindsym h exec --no-startup-id i3exit hibernate, mode "default" bindsym r exec --no-startup-id i3exit reboot, mode "default" bindsym Shift+s exec --no-startup-id i3exit shutdown, mode "default" @@ -334,6 +334,9 @@ exec --no-startup-id nm-applet # USB Stick management exec --no-startup-id udiskie --no-automount --notify --tray +# solaar logitech (instead of logiops) +exec --no-startup-id solaar -w hide + # enable touchpad tap to click # done this in X11 config /etx/X11/xorg....d/ #exec --no-startup-id xinput set-prop 11 306 1 @@ -346,7 +349,7 @@ exec_always --no-startup-id autotiling -l 2 exec --no-startup-id numlockx on #exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 # TODO disabled this for now -#exec --no-startup-id /sbin/lxpolkit +exec --no-startup-id /sbin/lxpolkit exec --no-startup-id nitrogen --restore; sleep 1; picom -b --vsync #exec --no-startup-id manjaro-hello #exec --no-startup-id nm-applet diff --git a/.config/ncmpcpp/config b/.config/ncmpcpp/config index 83a05ca..8d3e78c 100644 --- a/.config/ncmpcpp/config +++ b/.config/ncmpcpp/config @@ -31,7 +31,7 @@ # ## Needed for tag editor and file operations to work. ## -#mpd_music_dir = ~/music +mpd_music_dir = ~/cloud/music # mpd_crossfade_time = 3 # diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf index 572bf0b..7bcbd6f 100644 --- a/.config/neofetch/config.conf +++ b/.config/neofetch/config.conf @@ -9,10 +9,11 @@ print_info() { prin "${cl4}┌─────────\n Software Information \n──────────┐" # info " ​ ​  " users - info " ​ ​  " distro +# info " ​ ​  " distro + info " ​ ​  " distro # Just get your distro's logo off nerdfonts.com info " ​ ​  " kernel -# info " ​ ​  " de + info " ​ ​  " de info " ​ ​  " wm info " ​ ​  " shell info " ​ ​  " term @@ -21,7 +22,7 @@ print_info() { info " ​ ​  " icons info " ​ ​  " packages info " ​ ​  " uptime -# info " ​ ​  " gpu_driver # Linux/macOS only + info " ​ ​  " gpu_driver # Linux/macOS only # info " ​ ​  " cpu_usage # info " ​ ​ ﱘ " song # [[ "$player" ]] && prin "Music Player" "$player" @@ -35,7 +36,7 @@ print_info() { # info " ​ ​  " disk info " ​ ​ 塞" memory info " ​ ​  " resolution -# info " ​ ​ 󱈑 " battery + info " ​ ​ 󱈑 " battery prin "${cl4}└─────────────────────────────────────────┘" info cols prin "\n \n \n \n \n ${cl3} \n \n ${cl5} \n \n ${cl2} \n \n ${cl6} \n \n ${cl4} \n \n ${cl1} \n \n ${cl7} \n \n ${cl0}" diff --git a/.config/neomutt/mailcap b/.config/neomutt/mailcap index 9f229c8..0016858 100644 --- a/.config/neomutt/mailcap +++ b/.config/neomutt/mailcap @@ -1,21 +1,22 @@ image/*; sxiv -a -b %s; copiousoutput -#image/*; feh %s; copiousoutput -#text/plain; $EDITOR %s -#text/plain; nvim %s +# image/*; feh %s; copiousoutput +# text/plain; $EDITOR %s +# text/plain; nvim %s text/plain; bat %s; copiousoutput -#text/html; lynx -dump %s; nametemplate=%s.html; copiousoutput -#text/html; firefox --private-window '%s' &; test=test -n "$DISPLAY"; needsterminal -#text/html; lynx -g '%s'; test=test -n "$DISPLAY"; needsterminal -#text/html; links -g -force-html '%s'; test=test -n "$DISPLAY"; +# text/html; lynx -dump %s; nametemplate=%s.html; copiousoutput +# text/html; firefox --private-window '%s' &; test=test -n "$DISPLAY"; needsterminal +# text/html; lynx -g '%s'; test=test -n "$DISPLAY"; needsterminal +# text/html; links -g -force-html '%s'; test=test -n "$DISPLAY"; text/html; chromium --new-window --incognito '%s'; nametemplate=%s.html; test=test -n "$DISPLAY" -#text/html; nyxt '%s'; test=test -n "$DISPLAY"; +# text/html; qutebrowser '%s'; nametemplate=%s.html; test=test -n "$DISPLAY" +# text/html; nyxt '%s'; test=test -n "$DISPLAY"; text/html; w3m; nametemplate=%s.html; needsterminal text/html; w3m -graph -o display_borders=1 -o color=1 -o display_image=1 -o auto_image=1 -dump -I %{charset} -T text/html; copiousoutput -#audio/*; vlc %s -#video/*; vlc %s +# audio/*; vlc %s +# video/*; vlc %s audio/*; mpv %s video/*; mpv %s application/pdf; mupdf %s -#application/pdf; zathura %s +# application/pdf; zathura %s application/pgp-encrypted; gpg -d '%s'; copiousoutput diff --git a/.config/nitrogen/bg-saved.cfg b/.config/nitrogen/bg-saved.cfg index 6c0a19b..bddc010 100644 --- a/.config/nitrogen/bg-saved.cfg +++ b/.config/nitrogen/bg-saved.cfg @@ -1,4 +1,4 @@ [xin_-1] -file=/home/dominic/Bilder/backgrounds/UsX0Jmz.jpg +file=/home/dominic/Bilder/backgrounds/darkhousesfantasyatwaterfalls-1618057212168-4420.jpg mode=5 bgcolor=#002a36 diff --git a/.config/nitrogen/nitrogen.cfg b/.config/nitrogen/nitrogen.cfg index ece5b8b..de5e1c5 100644 --- a/.config/nitrogen/nitrogen.cfg +++ b/.config/nitrogen/nitrogen.cfg @@ -1,6 +1,6 @@ [geometry] -posx=149 -posy=302 +posx=326 +posy=377 sizex=760 sizey=547 diff --git a/.zprezto b/.zprezto index 769897d..e65cc54 160000 --- a/.zprezto +++ b/.zprezto @@ -1 +1 @@ -Subproject commit 769897d58e197c1c169e0e0077c184f187863cf0 +Subproject commit e65cc54c06a30a1bb879fd8473628edb70dacf6f diff --git a/bin/backup.sh b/bin/backup.sh index 17b69fe..2d156a5 100755 --- a/bin/backup.sh +++ b/bin/backup.sh @@ -20,6 +20,7 @@ sudo rsync -avzhRP --del --stats \ --exclude '_nas-*/***' \ --exclude 'Attack/***' \ --exclude 'material-design-icons/***' \ + --exclude '***/*.socket' \ '/./etc' \ '/./boot' \ '/./home' \