From 9d99b8470d9750d88e66fad19e28ef1ad769ce46 Mon Sep 17 00:00:00 2001 From: lanxu Date: Sun, 6 Dec 2020 23:08:50 +0200 Subject: [PATCH] Updated fontconfiguration and many other --- .config/fontconfig/fonts.conf | 4 ++- .config/i3/config | 45 +++++++++++++++++++------------ .config/i3/i3status.conf | 5 +++- .config/mpv/mpv.conf | 7 +++-- .config/ranger/rc.conf | 3 ++- .config/ranger/scope.sh | 13 +++++---- .config/rofi/scripts/powermenu.sh | 3 +++ .vimrc | 8 +++--- .zprofile | 9 ++++--- .zshrc | 11 +++++--- backup/backup.sh | 4 ++- 11 files changed, 73 insertions(+), 39 deletions(-) diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf index b74635a..4e426ca 100644 --- a/.config/fontconfig/fonts.conf +++ b/.config/fontconfig/fonts.conf @@ -2,12 +2,14 @@ + true true lcddefault hintnone - + true rgb diff --git a/.config/i3/config b/.config/i3/config index 2eb746a..7d4a7f1 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -38,15 +38,16 @@ for_window [class=".*"] border pixel 0 # Services exec --no-startup-id "mpd /home/lanxu/.config/mpd/mpd.conf" # Music Player Daemon -exec --no-startup-id "xscreensaver -no-splash" # Screensaver -exec --no-startup-id "./Scripts/xscreensaverstopper.sh" # Screensaver inhibitor +#exec --no-startup-id "./Scripts/screensaver.sh" # Screensaver +#exec --no-startup-id "xscreensaver -no-splash" # Screensaver +#exec --no-startup-id "./Scripts/xscreensaverstopper.sh" # Screensaver inhibitor exec --no-startup-id "compton -b" # Compositor exec --no-startup-id "nitrogen --restore" # Wallpaper exec --no-startup-id "udiskie --notify --automount" # Automounter # dunst is used for notifications # Background software -exec --no-startup-id "blueman-manager" # Bluetooth +#exec --no-startup-id "blueman-manager" # Bluetooth exec --no-startup-id "cantata" exec --no-startup-id "boincmgr" exec --no-startup-id "nextcloud" @@ -57,7 +58,7 @@ exec --no-startup-id "keepassxc" # Password manager exec --no-startup-id "telegram-desktop" # Set manual layout for tray workspace -exec --no-startup-id "i3-msg 'workspace 10:tray; append_layout /home/lanxu/.config/i3/tray.json'" +#exec --no-startup-id "i3-msg 'workspace 10:tray; append_layout /home/lanxu/.config/i3/tray.json'" set $refresh_i3status killall -SIGUSR1 i3status bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status @@ -236,6 +237,22 @@ bindsym Mod4+o move workspace to output left # Please remove the following exec line: ####################################################################### #exec i3-config-wizard + +# Assignments +assign [class="^firefox$"] → $ws3 +assign [class="^krita$"] → $ws4 +assign [class="^Blender$"] → $ws4 +assign [class="^Gimp$"] → $ws4 +assign [class="^Lutris$"] → $ws6 +assign [class="^Nextcloud$"] → $ws10 +assign [class="^Blueman-manager$"] → $ws10 +assign [class="^Pavucontrol$"] → $ws10 +assign [class="^cantata$"] → $ws10 +assign [class="^Boincmgr$"] → $ws10 +assign [class="^KeePassXC$"] → $ws9 + +# Modifiers +for_window [class="^firefox$"] layout tabbed for_window [class="Arandr"] floating enable for_window [title="^Telegram$"] floating enable, move scratchpad for_window [class="itch"] floating enable @@ -244,23 +261,16 @@ for_window [class="mpv"] floating enable, move position center for_window [class="vlc"] floating enable for_window [class="Mumble"] floating enable, move position center for_window [class="Sxiv"] floating enable -for_window [class="Lutris"] move container to workspace $ws6 -for_window [class="Gimp"] move container to workspace $ws4 -for_window [class="Blender"] move container to workspace $ws4 -for_window [class="krita"] move container to workspace $ws4 -for_window [class="firefox"] move container to workspace $ws3 # services -for_window [class="Nextcloud"] floating disable, move container to workspace $ws10 -for_window [class="Blueman-manager"] move container to workspace $ws10 -for_window [class="Pavucontrol"] move container to workspace $ws10e -for_window [class="cantata"] floating disable, move container to workspace $ws10 -for_window [class="boincmgr"] floating disable, move container to workspace $ws10 -for_window [class="KeePassXC"] move container to workspace $ws9 +#for_window [class="Nextcloud"] floating enable, move position center, move scratchpad +for_window [class="cantata"] floating disable +for_window [class="boincmgr"] floating disable # Games for_window [class="kfgame.exe"] floating enable for_window [class="Wine"] floating enable +for_window [class="xscreensaver-demo"] floating enable # Steam # https://github.com/ValveSoftware/steam-for-linux/issues/1040 @@ -275,12 +285,13 @@ for_window [class="^Steam$" title="^Screenshot Uploader$"] floating enable for_window [class="^Steam$" title="^Steam Guard - Computer Authorization Required$"] floating enable for_window [title="^Steam Keyboard$"] floating enable for_window [class="^Steam$"] move container to workspace $ws5 -# for_window [title="^Friends List$"] move container to workspace $ws5, resize set width 400px +for_window [title="^Friends List$"] move container to workspace $ws5, floating enable, resize set width 400px mouse_warping none # Special keysyms bindsym Mod4+t [class="TelegramDesktop"] scratchpad show +bindsym Mod4+n [class="^Nextcloud"] scratchpad show # gaps smart_borders on @@ -342,7 +353,7 @@ bar { position top i3bar_command i3bar -t tray_output none - separator_symbol ❰ + separator_symbol " " colors { background $base00 diff --git a/.config/i3/i3status.conf b/.config/i3/i3status.conf index 07c560f..93cd2d5 100644 --- a/.config/i3/i3status.conf +++ b/.config/i3/i3status.conf @@ -26,7 +26,8 @@ time { } mpd_status { - format = "{name} [[[{artist} - ]{title}]|[{file}]]" + format = "[[[{artist} - ]{title}]|[{file}]]" + max_width = 30 } volume_status { @@ -37,8 +38,10 @@ weather_owm { api_key = "4e3b7bbd3da07052c4fed6d342e48707" city = "Tampere" unit_temperature = "C" + format_temperature = "[\?color=all {current:.0f}°{unit}]" format = "{city} {icon} {temperature}" } + order += "dpms" order += "volume_status" order += "sysdata" diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 234be4d..2c9a9d5 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,4 +1,7 @@ -profile=opengl-hq -hwdec=auto +hwdec=vaapi +vo=gpu osd-font-size=14 ao=pulse + +[extension.webm] +loop-file=inf diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf index 295243e..0f977d9 100644 --- a/.config/ranger/rc.conf +++ b/.config/ranger/rc.conf @@ -114,7 +114,8 @@ set preview_images true # Preview images in full color with the external command "ueberzug". # Images are shown by using a child window. # Only for users who run X11 in GNU/Linux. -set preview_images_method kitty +#set preview_images_method ueberzug +set preview_images_method w3m # Delay in seconds before displaying an image with the w3m method. # Increase it in case of experiencing display corruption. diff --git a/.config/ranger/scope.sh b/.config/ranger/scope.sh index b2825fb..d2a786c 100755 --- a/.config/ranger/scope.sh +++ b/.config/ranger/scope.sh @@ -162,10 +162,10 @@ handle_image() { exit 7;; ## Video - # video/*) - # # Thumbnail - # ffmpegthumbnailer -i "${FILE_PATH}" -o "${IMAGE_CACHE_PATH}" -s 0 && exit 6 - # exit 1;; + video/*) + # Thumbnail + ffmpegthumbnailer -i "${FILE_PATH}" -o "${IMAGE_CACHE_PATH}" -s 0 && exit 6 + exit 1;; ## PDF # application/pdf) @@ -327,7 +327,10 @@ handle_mime() { ## Image image/*) ## Preview as text conversion - img2txt --gamma=0.6 --width="${PV_WIDTH}" -- "${FILE_PATH}" && exit 4 + #img2txt --gamma=0.6 --width="${PV_WIDTH}" -- "${FILE_PATH}" && exit 4 + viu -w "${PV_WIDTH}" -- "${FILE_PATH}" && exit 4 + #catimg -t -w "${PV_WIDTH}" "${FILE_PATH}" && exit 5 + #catimg -w "${PV_WIDTH}" "${FILE_PATH}" && exit 4 #exiftool "${FILE_PATH}" && exit 5 exit 1;; diff --git a/.config/rofi/scripts/powermenu.sh b/.config/rofi/scripts/powermenu.sh index bdab0a3..e8350fb 100755 --- a/.config/rofi/scripts/powermenu.sh +++ b/.config/rofi/scripts/powermenu.sh @@ -25,6 +25,9 @@ then Hibernate) systemctl hibernate ;; + Lock) + WINDOW=:0 xscreensaver-command -lock + ;; *) ;; esac diff --git a/.vimrc b/.vimrc index 0491eac..90e787a 100644 --- a/.vimrc +++ b/.vimrc @@ -68,10 +68,12 @@ set hlsearch " Highlight search set modeline set modelines=5 "set sessionoptions=blank,buffers,curdir,folds,globals,help,localoptions,options,resize,tabpages,winsize,winpos +set swapfile set autochdir " Change directory automatically -"set backupdir=~/.vim/temp/ " Save temporary backups to temp dir -"set directory=~/.vim/temp/ " Save temporary files to temp dir -"set hidden " Allow changing buffers eventhough they're not saved +set backupdir=~/.vim/temp/ " Save temporary backups to temp dir +set directory=~/.vim/temp/ " Save temporary files to temp dir +set dir=~/.vim/temp/ " Save temporary files to temp dir +set hidden " Allow changing buffers eventhough they're not saved "set autowrite " Automatically save the buffer when changing to another buffers "set autowriteall " Automatically save ALL buffers when changing to another buffers "set wildchar= wildmenu wildmode=full " Show possible commands by pressing TAB diff --git a/.zprofile b/.zprofile index 2d97e8b..7863034 100644 --- a/.zprofile +++ b/.zprofile @@ -29,8 +29,9 @@ export PATH=$LANXU_SCRIPTS_ROOT:$PATH # Other export XDG_CURRENT_DESKTOP=gnome -#export QT_STYLE_OVERRIDE='gtk2' -export QT_QPA_PLATFORMTHEME=gtk2 +# export QT_STYLE_OVERRIDE='adwaita' +# qt5-styleplugins must be installed to set this to gtk2 +export QT_QPA_PLATFORMTHEME=qt5ct export WINEARCH=win64 # Set default winearch to win64 export WINEDLLOVERRIDES=winemenubuilder.exe=d # No more desktop files! @@ -60,10 +61,10 @@ export CAFFE_DIR="${HOME}/Koodit/github/caffe/build/install" # Terminal export TERMINAL=kitty -#export TERMINAL=alacritty +#export TERMINAL=alacritty # Does not support ligatures / Fira Code export TERMCMD=$TERMINAL # Start X on tty1 automatically if systemctl -q is-active graphical.target && [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then exec startx fi - +export WORKON_HOME="${HOME}/Envs" diff --git a/.zshrc b/.zshrc index 9fdeb03..338ca54 100644 --- a/.zshrc +++ b/.zshrc @@ -37,6 +37,8 @@ fi # Syntax highlighting source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh source ~/.zplugins +# Autosuggestions +source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh alias top=htop alias ll="ls -lh" @@ -56,12 +58,13 @@ alias runwinesteam="MESA_GL_VERSION_OVERRIDE=3.3COMPAT PULSE_LATENCY_MSEC=60 run alias rbackup="restic -r rclone:hubic:ChimeraLinux" alias bat="bat --theme base16" alias wine32="WINEPREFIX=~/.wine32 wine" -alias steam="DBUS_SESSION_BUS_ADDRESS=unix:abstract=/dev/null steam" +alias resetkbcolors="/usr/bin/g512-led -p /etc/g810-led/profile" +# alias steam="DBUS_SESSION_BUS_ADDRESS=unix:abstract=/dev/null steam" # https://github.com/chriskempson/base16-shell # git clone https://github.com/chriskempson/base16-shell.git ~/.config/base16-shell -#source $HOME/.config/base16-shell/scripts/base16-default-dark.sh +source $HOME/.config/base16-shell/scripts/base16-default-dark.sh #source $HOME/.config/base16-shell/scripts/base16-solarized-light.sh -source $HOME/.config/base16-shell/scripts/base16-solarized-dark.sh +#source $HOME/.config/base16-shell/scripts/base16-solarized-dark.sh # Emscripten #source /home/lanxu/Koodit/github/emsdk/emsdk_env.sh @@ -73,7 +76,7 @@ source $HOME/.config/base16-shell/scripts/base16-solarized-dark.sh function auradd { pkg=$1 - aur sync --no-view --no-confirm --database custom "$pkg" >&2 + aur sync --no-view --no-confirm --rebuild --database custom "$pkg" >&2 sudo pacman -Sy "$pkg" } diff --git a/backup/backup.sh b/backup/backup.sh index 94ba61e..7a615ee 100644 --- a/backup/backup.sh +++ b/backup/backup.sh @@ -3,5 +3,7 @@ while read line do echo $line - restic -r rclone:hubic:ChimeraLinux backup $line --exclude-file restic-exclude.txt --password-file /home/lanxu/restic-pass.txt + # restic -r rclone:jottacloud:ChimeraLinux backup $line --exclude-file restic-exclude.txt --password-file /home/lanxu/restic-pass.txt + + restic -r sftp:lanxu@localhost:/mnt/backup/chimeralinux backup $line --exclude-file restic-exclude.txt --password-file /home/lanxu/restic-pass.txt done < restic-include.txt