From b6e9629154c89174113730f15efd3645b75841a3 Mon Sep 17 00:00:00 2001 From: Harri Lahtinen Date: Thu, 23 Jan 2020 01:03:21 +0200 Subject: [PATCH] new picom.conf, ranger stuff etc. --- .Xresources | 32 ++-- .config/i3/config | 36 ++-- .config/picom.conf | 172 +++++++++++--------- .config/ranger/commands.py | 34 ++++ .config/ranger/scope.sh | 16 +- .config/wpg/templates/config_i3_config.base | 36 ++-- .zaliases | 23 +++ .zshrc | 10 ++ addons/i915.conf | 2 +- addons/pacman-packages | 4 +- addons/yay-packages | 2 - 11 files changed, 228 insertions(+), 139 deletions(-) diff --git a/.Xresources b/.Xresources index 2585442..00be8da 100644 --- a/.Xresources +++ b/.Xresources @@ -6,22 +6,22 @@ Xcursor.theme: Bibata Ice Xcursor.size: 48 !/* !! gruvbox: */ -!/* *.color0: #1d2021 */ -!/* *.color1: #cc241d */ -!/* *.color2: #98971a */ -!/* *.color3: #d79921 */ -!/* *.color4: #458588 */ -!/* *.color5: #b16286 */ -!/* *.color6: #689d6a */ -!/* *.color7: #a89984 */ -!/* *.color8: #928374 */ -!/* *.color9: #fb4934 */ -!/* *.color10: #b8bb26 */ -!/* *.color11: #fabd2f */ -!/* *.color12: #83a598 */ -!/* *.color13: #d3869b */ -!/* *.color14: #8ec07c */ -!/* *.color15: #ebdbb2 */ +*color0: #1d2021 */ +*color1: #cc241d */ +*color2: #98971a */ +*color3: #d79921 */ +*color4: #458588 */ +*color5: #b16286 */ +*color6: #689d6a */ +*color7: #a89984 */ +*color8: #928374 */ +*color9: #fb4934 */ +*color10: #b8bb26 */ +*color11: #fabd2f */ +*color12: #83a598 */ +*color13: #d3869b */ +*color14: #8ec07c */ +*color15: #ebdbb2 */ !! Transparency (0-1): st.alpha: 0.9 diff --git a/.config/i3/config b/.config/i3/config index 43574b3..250066b 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -5,7 +5,7 @@ ###---Basic Definitions---### #Needed for i3-gaps hide_edge_borders both -for_window [class="^.*"] border pixel 1 +for_window [class="^.*"] border pixel 0 gaps inner 15 gaps outer 15 font pango:Ubuntu Mono derivative Powerline 10 @@ -17,7 +17,7 @@ smart_gaps on # Smart borders (draw borders around container only if it is not the only container on this workspace) # on|no_gaps (on=always activate and no_gaps=only activate if the gap size to the edge of the screen is 0) -smart_borders on +# smart_borders on # Set Xresources colors: #set_from_resource $darkblack color0 #000000 @@ -41,6 +41,9 @@ smart_borders on # Use Mouse+$mod to drag floating windows floating_modifier $mod +# Floating window minimum size +floating_minimum_size 1920x1080 + # change container layout (stacked, tabbed, toggle split) bindsym Mod1+s layout stacking bindsym Mod1+w layout tabbed @@ -50,19 +53,17 @@ bindsym Mod1+e layout toggle split bindsym $mod+Shift+c sticky toggle ######### COLORS ########## -# BORDER BACKGROUND TEXT INDICATOR CHILD_BORDER -client.focused #fb4934 #83a598 #282828 #fb4934 #fabd2f -client.unfocused #fabd2f #fb4934 #d5c4a1 #fabd2f #282828 -client.focused_inactive #282828 #665c54 #d5c4a1 #fabd2f #282828 -client.urgent #b8bb26 #b8bb26 #282828 #b8bb26 #b8bb26 -client.background #665c54 +# BORDER BACKGROUND TEXT INDICATOR CHILD_BORDER +client.focused #fb4934 #83a598 #282828 #fb4934 #fabd2f +client.unfocused #fabd2f #fb4934 #d5c4a1 #fabd2f #282828 +client.focused_inactive #282828 #665c54 #d5c4a1 #fabd2f #282828 +client.urgent #b8bb26 #b8bb26 #282828 #b8bb26 #b8bb26 +client.background #665c54 ###---Starting External Scripts---### #Load .Xresources exec --no-startup-id xrdb -merge .Xresources -#Restore wal colors -#exec_always --no-startup-id wal -i "$(< "${HOME}/.cache/wal/wal")" #Start mopidy #exec --no-startup-id mopidy & #Twmn @@ -74,8 +75,6 @@ exec --no-startup-id twmnd & exec --no-startup-id ~/.config/wpg/wp_init.sh #Conky #exec --no-startup-id conky -d -c ~/.config/conky/conkybg & -#Clipster -exec --no-startup-id clipster -d #Picom exec --no-startup-id picom -b --experimental-backends --dbus --config /home/hate/.config/picom.conf #Gnome privileges @@ -96,7 +95,7 @@ exec --no-startup-id python ~/.config/Scripts/gmail_notifier.py #exec --no-startup-id hideIt.sh -N '^polybar-top_eDP-1$' -p 3 -d top -H #exec --no-startup-id hideIt.sh -N '^polybar-bottom_eDP-1$' -p 3 -d bottom -H # PCmanFm daemon -exec --no-startup-id pcmanfm -d & +# exec --no-startup-id pcmanfm -d & # Libinput-gestures exec --no-startup-id libinput-gestures & @@ -148,13 +147,9 @@ bindsym $mod+Shift+Escape exec --no-startup-id prompt "Exit i3?" "i3-msg exit" bindsym $mod+BackSpace exec $flash bindsym $mod+Shift+BackSpace exec ~/.config/Scripts/on -# Show selection: -#bindsym Mod1+c exec clipster -sp - #STOP/HIDE EVERYTHING: bindsym $mod+Shift+Delete exec $truemute ; exec $truepause ; workspace lmao ; exec $term -e htop ; exec $term -e ranger - ###---Letter Key Bindings---### bindsym $mod+q kill bindsym $mod+Shift+q kill @@ -321,6 +316,13 @@ for_window [class="St"] floating enable, resize set 2560 1440, move position cen for_window [class="Pcmanfm"] floating enable, resize set 1920 1080 for_window [class="(G|g)oogle-chrome"] border none for_window [class="(G|g)oogle-chrome" window_role="pop-up"] floating enable, border normal +for_window [window_role="pop-up"] floating enable +for_window [window_role="bubble"] floating enable +for_window [window_role="task_dialog"] floating enable +for_window [window_role="Preferences"] floating enable +for_window [window_type="dialog"] floating enable +for_window [window_type="menu"] floating enable +for_window [title="Open With"] floating enable ###---Function Buttons---### diff --git a/.config/picom.conf b/.config/picom.conf index c6bbb49..4c94418 100644 --- a/.config/picom.conf +++ b/.config/picom.conf @@ -1,108 +1,128 @@ -# Shadow -shadow = false; +# +# COMPTON +# config for compton +# needs the patched dual_kawase fork +# +# file: ~/.config/compton.conf +# v0.4.2 / 2018.07.19 +# +# (c) 2018 Bernd Busse +# + +mark-wmwin-focused = true; +mark-ovredir-focused = true; +detect-rounded-corners = true; +detect-client-opacity = true; +# use-ewmh-active-win = true; + +backend = "glx" + +############### +### SHADOWS ### +############### +shadow = true; +#no-dnd-shadow = true; +no-dock-shadow = true; +clear-shadow = true; shadow-radius = 7; shadow-offset-x = -7; shadow-offset-y = -7; -log-level = "warn"; -# log-file = "/path/to/your/log/file"; -shadow-opacity = 0.0; +# shadow-opacity = 0.7; # shadow-red = 0.0; # shadow-green = 0.0; # shadow-blue = 0.0; shadow-exclude = [ - "name = 'Notification'", - "class_g = 'Conky'", - "class_g ?= 'Notify-osd'", - "class_g = 'Cairo-clock'", - "_GTK_FRAME_EXTENTS@:c", - "class_g = 'i3-frame'", - "_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'", - "_NET_WM_STATE@:32a *= '_NET_WM_STATE_STICKY'", - "!I3_FLOATING_WINDOW@:c" + "_GTK_FRAME_EXTENTS@:c", + "class_g = 'i3-frame'", + "WM_NAME@:s = 'Awesome drawin'", ]; # shadow-exclude = "n:e:Notification"; +shadow-ignore-shaped = false; # shadow-exclude-reg = "x10+0+0"; -# xinerama-shadow-crop = true; +xinerama-shadow-crop = true; -# Opacity -# inactive-opacity = 0.8; +############### +### OPACITY ### +############### +#menu-opacity = 0.8; +#inactive-opacity = 0.8; # active-opacity = 0.8; -# frame-opacity = 0.7; -# inactive-opacity-override = false; +#frame-opacity = 0.7; +#inactive-opacity-override = false; +#alpha-step = 0.06; # inactive-dim = 0.2; # inactive-dim-fixed = true; - +#blur-background = true; blur: { method = "dual_kawase"; strength = 7.0; # deviation = 1.0; # kernel = "11x11gaussian"; } - -# blur-background = true; -# blur-background-frame = true; -blur-kern = "3x3box"; -# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1"; -# blur-background-fixed = true; +#blur-background-frame = true; +blur-kern = "7x7box"; +# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1" +blur-background-fixed = true; blur-background-exclude = [ - "window_type = 'dock'", - "window_type = 'desktop'", - "_GTK_FRAME_EXTENTS@:c" + "window_type = 'dock'", + "window_type = 'desktop'", + "class_g = 'Chromium'", ]; -# opacity-rule = [ "80:class_g = 'URxvt'" ]; - opacity-rule = [ - "99:class_g = 'i3-frame'", - "90:class_g = 'St' && focused", - "60:class_g = 'St' && !focused", - "90:class_g = 'Alacritty' && focused", - "60:class_g = 'Alacritty' && !focused", - "99:class_g = 'mpv'", - "90:class_g = 'kitty' && focused", - "99:class_g = 'kitty' && !focused", + "90:class_g = 'kitty' && focused", + "0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'", + "99:class_g = 'kitty' && !focused", ]; -# max-brightness = 0.66 -# Fading -fading = true; +############## +### FADING ### +############## +#fading = true; # fade-delta = 30; -fade-in-step = 0.03; -fade-out-step = 0.03; +#fade-in-step = 0.03; +#fade-out-step = 0.03; # no-fading-openclose = true; -# no-fading-destroyed-argb = true; -fade-exclude = [ ]; +#fade-exclude = [ ]; -# Other -backend = "glx"; -mark-wmwin-focused = true; -mark-ovredir-focused = true; -use-ewmh-active-win = true; -detect-rounded-corners = true; -detect-client-opacity = true; -refresh-rate = 0; -vsync = true; -# sw-opti = true; -# unredir-if-possible = true; +############# +### OTHER ### +############# +# dbe = false; +paint-on-overlay = true; +sw-opti = true; +unredir-if-possible = true; # unredir-if-possible-delay = 5000; -# unredir-if-possible-exclude = [ ]; -focus-exclude = [ "class_g = 'Cairo-clock'" ]; + +unredir-if-possible-exclude = [ + "name *= 'Chrome'", + "name *= 'Chromium'", + "name *= 'mpv'" +]; + +focus-exclude = [ + "window_type = 'dock'", + "class_g = 'i3-frame'" +]; detect-transient = true; -detect-client-leader = true; -invert-color-include = [ ]; -# resize-damage = 1; +#detect-client-leader = true; +#invert-color-include = [ ]; +resize-damage = 5; -# GLX backend -# glx-no-stencil = true; -# glx-no-rebind-pixmap = true; -# xrender-sync-fence = true; -use-damage = true; +################### +### GLX BACKEND ### +################### +refresh-rate = 0; +vsync = "true"; +glx-no-stencil = true; +glx-copy-from-front = false; +#glx-use-copysubbuffermesa = true; +glx-no-rebind-pixmap = true; +#glx-swap-method = "3"; +#glx-use-gpushader4 = true; -# Window type settings -wintypes: -{ - tooltip = { fade = true; shadow = false; opacity = 0.75; focus = true; full-shadow = false; }; - dock = { shadow = false; } - dnd = { shadow = false; } - popup_menu = { opacity = 0.8; } - dropdown_menu = { opacity = 0.8; } -}; +########################### +### WINDOWTYPE SETTINGS ### +########################### +#wintypes: { +# tooltip = { fade = true; shadow = false; opacity = 0.75; focus = true; }; +#}; diff --git a/.config/ranger/commands.py b/.config/ranger/commands.py index fe8b65e..644d968 100644 --- a/.config/ranger/commands.py +++ b/.config/ranger/commands.py @@ -1929,3 +1929,37 @@ class yank(Command): in sorted(self.modes.keys()) if mode ) + +import os +from ranger.core.loader import CommandLoader + +class extracthere(Command): + def execute(self): + """ Extract copied files to current directory """ + copied_files = tuple(self.fm.copy_buffer) + + if not copied_files: + return + + def refresh(_): + cwd = self.fm.get_directory(original_path) + cwd.load_content() + + one_file = copied_files[0] + cwd = self.fm.thisdir + original_path = cwd.path + au_flags = ['-X', cwd.path] + au_flags += self.line.split()[1:] + au_flags += ['-e'] + + self.fm.copy_buffer.clear() + self.fm.cut_buffer = False + if len(copied_files) == 1: + descr = "extracting: " + os.path.basename(one_file.path) + else: + descr = "extracting files from: " + os.path.basename(one_file.dirname) + obj = CommandLoader(args=['aunpack'] + au_flags \ + + [f.path for f in copied_files], descr=descr, read=True) + + obj.signal_bind('after', refresh) + self.fm.loader.add(obj) diff --git a/.config/ranger/scope.sh b/.config/ranger/scope.sh index a1a6419..2624bdd 100755 --- a/.config/ranger/scope.sh +++ b/.config/ranger/scope.sh @@ -139,14 +139,14 @@ handle_image() { exit 1;; ## PDF - # application/pdf) - # pdftoppm -f 1 -l 1 \ - # -scale-to-x "${DEFAULT_SIZE%x*}" \ - # -scale-to-y -1 \ - # -singlefile \ - # -jpeg -tiffcompression jpeg \ - # -- "${FILE_PATH}" "${IMAGE_CACHE_PATH%.*}" \ - # && exit 6 || exit 1;; + application/pdf) + pdftoppm -f 1 -l 1 \ + -scale-to-x "${DEFAULT_SIZE%x*}" \ + -scale-to-y -1 \ + -singlefile \ + -jpeg -tiffcompression jpeg \ + -- "${FILE_PATH}" "${IMAGE_CACHE_PATH%.*}" \ + && exit 6 || exit 1;; ## ePub, MOBI, FB2 (using Calibre) diff --git a/.config/wpg/templates/config_i3_config.base b/.config/wpg/templates/config_i3_config.base index b3cbaba..8f947b4 100644 --- a/.config/wpg/templates/config_i3_config.base +++ b/.config/wpg/templates/config_i3_config.base @@ -5,7 +5,7 @@ ###---Basic Definitions---### #Needed for i3-gaps hide_edge_borders both -for_window [class="^.*"] border pixel 1 +for_window [class="^.*"] border pixel 0 gaps inner 15 gaps outer 15 font pango:Ubuntu Mono derivative Powerline 10 @@ -17,7 +17,7 @@ smart_gaps on # Smart borders (draw borders around container only if it is not the only container on this workspace) # on|no_gaps (on=always activate and no_gaps=only activate if the gap size to the edge of the screen is 0) -smart_borders on +# smart_borders on # Set Xresources colors: #set_from_resource $darkblack color0 #000000 @@ -41,6 +41,9 @@ smart_borders on # Use Mouse+$mod to drag floating windows floating_modifier $mod +# Floating window minimum size +floating_minimum_size 1920x1080 + # change container layout (stacked, tabbed, toggle split) bindsym Mod1+s layout stacking bindsym Mod1+w layout tabbed @@ -50,19 +53,17 @@ bindsym Mod1+e layout toggle split bindsym $mod+Shift+c sticky toggle ######### COLORS ########## -# BORDER BACKGROUND TEXT INDICATOR CHILD_BORDER -client.focused {color1} {color4} {color0} {color1} {color3} -client.unfocused {color3} {color1} {color7} {color3} {color0} -client.focused_inactive {color0} {color8} {color7} {color3} {color0} -client.urgent {color2} {color2} {color0} {color2} {color2} -client.background {color8} +# BORDER BACKGROUND TEXT INDICATOR CHILD_BORDER +client.focused {color1} {color4} {color0} {color1} {color3} +client.unfocused {color3} {color1} {color7} {color3} {color0} +client.focused_inactive {color0} {color8} {color7} {color3} {color0} +client.urgent {color2} {color2} {color0} {color2} {color2} +client.background {color8} ###---Starting External Scripts---### #Load .Xresources exec --no-startup-id xrdb -merge .Xresources -#Restore wal colors -#exec_always --no-startup-id wal -i "$(< "${{HOME}}/.cache/wal/wal")" #Start mopidy #exec --no-startup-id mopidy & #Twmn @@ -74,8 +75,6 @@ exec --no-startup-id twmnd & exec --no-startup-id ~/.config/wpg/wp_init.sh #Conky #exec --no-startup-id conky -d -c ~/.config/conky/conkybg & -#Clipster -exec --no-startup-id clipster -d #Picom exec --no-startup-id picom -b --experimental-backends --dbus --config /home/hate/.config/picom.conf #Gnome privileges @@ -96,7 +95,7 @@ exec --no-startup-id python ~/.config/Scripts/gmail_notifier.py #exec --no-startup-id hideIt.sh -N '^polybar-top_eDP-1$' -p 3 -d top -H #exec --no-startup-id hideIt.sh -N '^polybar-bottom_eDP-1$' -p 3 -d bottom -H # PCmanFm daemon -exec --no-startup-id pcmanfm -d & +# exec --no-startup-id pcmanfm -d & # Libinput-gestures exec --no-startup-id libinput-gestures & @@ -148,13 +147,9 @@ bindsym $mod+Shift+Escape exec --no-startup-id prompt "Exit i3?" "i3-msg exit" bindsym $mod+BackSpace exec $flash bindsym $mod+Shift+BackSpace exec ~/.config/Scripts/on -# Show selection: -#bindsym Mod1+c exec clipster -sp - #STOP/HIDE EVERYTHING: bindsym $mod+Shift+Delete exec $truemute ; exec $truepause ; workspace lmao ; exec $term -e htop ; exec $term -e ranger - ###---Letter Key Bindings---### bindsym $mod+q kill bindsym $mod+Shift+q kill @@ -321,6 +316,13 @@ for_window [class="St"] floating enable, resize set 2560 1440, move position cen for_window [class="Pcmanfm"] floating enable, resize set 1920 1080 for_window [class="(G|g)oogle-chrome"] border none for_window [class="(G|g)oogle-chrome" window_role="pop-up"] floating enable, border normal +for_window [window_role="pop-up"] floating enable +for_window [window_role="bubble"] floating enable +for_window [window_role="task_dialog"] floating enable +for_window [window_role="Preferences"] floating enable +for_window [window_type="dialog"] floating enable +for_window [window_type="menu"] floating enable +for_window [title="Open With"] floating enable ###---Function Buttons---### diff --git a/.zaliases b/.zaliases index 6d2a7b3..a025c54 100644 --- a/.zaliases +++ b/.zaliases @@ -69,3 +69,26 @@ fzf_kill() { alias fkill='fzf_kill' +extract () { + if [ -f $1 ] ; then + case $1 in + *.tar.bz2) tar xvjf $1 ;; + *.tar.gz) tar xvzf $1 ;; + *.tar.xz) tar xvJf $1 ;; + *.bz2) bunzip2 $1 ;; + *.rar) unrar x $1 ;; + *.gz) gunzip $1 ;; + *.tar) tar xvf $1 ;; + *.tbz2) tar xvjf $1 ;; + *.tgz) tar xvzf $1 ;; + *.zip) unzip $1 ;; + *.Z) uncompress $1 ;; + *.7z) 7z x $1 ;; + *.xz) unxz $1 ;; + *.exe) cabextract $1 ;; + *) echo "\`$1': unrecognized file compression" ;; + esac + else + echo "\`$1' is not a valid file" + fi +} diff --git a/.zshrc b/.zshrc index 42936f7..a8a8191 100644 --- a/.zshrc +++ b/.zshrc @@ -7,6 +7,16 @@ # ██████ ██████ ░██ ░██░ # ░░░░░░ ░░░░░░ ░░░ ░░░ +#------------------------------ +# TTY colors +#------------------------------ +if [ "$TERM" = "linux" ]; then + _SEDCMD='s/.*\*color\([0-9]\{1,\}\).*#\([0-9a-fA-F]\{6\}\).*/\1 \2/p' + for i in $(sed -n "$_SEDCMD" $HOME/.Xresources | awk '$1 < 16 {printf "\\e]P%X%s", $1, $2}'); do + echo -en "$i" + done + clear +fi #------------------------------ # Source config files #------------------------------ diff --git a/addons/i915.conf b/addons/i915.conf index d88b611..c8f52a5 100644 --- a/addons/i915.conf +++ b/addons/i915.conf @@ -1 +1 @@ -options i915 enable_guc=3 enable_psr=2 fastboot=1 +options i915 enable_guc=2 fastboot=1 diff --git a/addons/pacman-packages b/addons/pacman-packages index 40c765b..51aceb4 100644 --- a/addons/pacman-packages +++ b/addons/pacman-packages @@ -3,6 +3,7 @@ acpi_call alacritty alsa-utils arandr +atool autoconf autofs automake @@ -113,7 +114,6 @@ procps-ng psmisc pulseaudio-bluetooth python-cairo -python-dbus python-mpd2 python-musicbrainzngs python-mutagen @@ -122,13 +122,13 @@ python-pyqt5 python-pywal python-setuptools python-urwid -python2-dbus qt5-styleplugins reflector reiserfsprogs ripgrep rofi rpmextract +rsync s-nail s-tui scrot diff --git a/addons/yay-packages b/addons/yay-packages index ad65e35..143c96e 100644 --- a/addons/yay-packages +++ b/addons/yay-packages @@ -8,7 +8,6 @@ chromium-vaapi-bin chromium-widevine dell-bios-fan-control-git dmenu2 -dtrx-git expac-git expressvpn fasd-git @@ -36,7 +35,6 @@ polybar-git powerline-fonts-git python-ueberzug ranger-git -st-luke-git systemd-boot-pacman-hook tlp-git tlp-rdw-git