From b711acc8ed889728d660d59e47caa30c7e19047e Mon Sep 17 00:00:00 2001 From: Harri Lahtinen Date: Sun, 12 Jan 2020 00:29:57 +0200 Subject: [PATCH] compton -> picom etc. --- .config/i3/config | 24 +++++++-------- .config/kitty/kitty.conf | 33 +++++++++++---------- .config/nvim/config/main.vim | 2 +- .config/nvim/config/plugin-settings.vim | 2 +- .config/{compton.conf => picom.conf} | 32 ++++++++++---------- .config/polybar/config | 28 ++++++++--------- .config/wpg/templates/config_i3_config.base | 12 ++++---- .profile | 10 +++---- .tmux.conf | 1 + .zaliases | 1 + addons/yay-packages | 8 +++-- 11 files changed, 80 insertions(+), 73 deletions(-) rename .config/{compton.conf => picom.conf} (95%) diff --git a/.config/i3/config b/.config/i3/config index 670c248..66022ac 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -51,11 +51,11 @@ bindsym $mod+Shift+c sticky toggle ######### COLORS ########## # BORDER BACKGROUND TEXT INDICATOR CHILD_BORDER -client.focused #364665 #3B4C91 #07060A #364665 #682E8C -client.unfocused #682E8C #364665 #c79acb #682E8C #07060A -client.focused_inactive #07060A #8b6b8e #c79acb #682E8C #07060A -client.urgent #504E71 #504E71 #07060A #504E71 #504E71 -client.background #8b6b8e +client.focused #88C0D0 #EBCB8B #2E3440 #88C0D0 #5E81AC +client.unfocused #5E81AC #88C0D0 #E5E9F0 #5E81AC #2E3440 +client.focused_inactive #2E3440 #4C566A #E5E9F0 #5E81AC #2E3440 +client.urgent #BF616A #BF616A #2E3440 #BF616A #BF616A +client.background #4C566A ###---Starting External Scripts---### @@ -76,8 +76,8 @@ exec --no-startup-id ~/.config/wpg/wp_init.sh #exec --no-startup-id conky -d -c ~/.config/conky/conkybg & #Clipster exec --no-startup-id clipster -d -#Compton -exec --no-startup-id compton -b +#Picom +exec --no-startup-id picom -b #Gnome privileges exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 #Launch Polybar where appropriate: @@ -132,8 +132,8 @@ bindsym Mod1+Shift+s exec ~/.config/Scripts/i3-resurrect-save-all bindsym Mod1+Shift+r exec ~/.config/Scripts/i3-resurrect-restore-all #Composite manager: -bindsym $mod+b exec --no-startup-id pkill compton -bindsym $mod+Ctrl+b exec --no-startup-id compton -b -f +bindsym $mod+b exec --no-startup-id pkill picom +bindsym $mod+Ctrl+b exec --no-startup-id picom -b ###---Basic Bindings---### bindsym $mod+Return exec $term @@ -149,7 +149,7 @@ bindsym $mod+BackSpace exec $flash bindsym $mod+Shift+BackSpace exec ~/.config/Scripts/on # Show selection: -bindsym Mod1+c exec clipster -sp +#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 @@ -162,7 +162,7 @@ bindsym $mod+Shift+q kill bindsym $mod+w exec pcmanfm bindsym $mod+Shift+w exec --no-startup-id $BROWSER -bindsym $mod+e exec $term -e neomutt +#bindsym $mod+e exec $term -e neomutt #bindsym $mod+Shift+e # always pop standard shell, without the menu @@ -197,7 +197,7 @@ bindsym $mod+s gaps inner current plus 5 bindsym $mod+Shift+s gaps inner current minus 5 #bindsym $mod+d exec rofi -config ~/.config/rofi/config -show drun -bindsym $mod+d exec dmenu_run -fn 'Ubuntu Mono derivative Powerline-18' -h '35' -nb '#635D94' -sf '#07060A' -sb '#504E71' -nf '#c79acb' +bindsym $mod+d exec dmenu_run -fn 'Ubuntu Mono derivative Powerline-18' -h '35' -nb '#A3BE8C' -sf '#2E3440' -sb '#BF616A' -nf '#8FBCBB' bindsym Mod1+d exec ~/.config/Scripts/rofi-bangs.sh bindsym $mod+Shift+d gaps inner current set 0; gaps outer current set 0 diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 568b8c5..50c6051 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -13,7 +13,7 @@ include ~/.cache/wal/colors-kitty.conf font_family Ubuntu Mono derivative Powerline italic_font Ubuntu Mono derivative Powerline Italic bold_font Ubuntu Mono derivative Powerline Bold -bold_italic_font Ubuntu Mono derivative Powerline +bold_italic_font Ubuntu Mono derivative Powerline Bold Italic # Font size (in pts) font_size 10.0 @@ -123,7 +123,7 @@ window_margin_width 4 # Tab-bar colors #active_tab_foreground #000 #active_tab_background #eee -active_tab_font_style italic +active_tab_font_style bold-italic #inactive_tab_foreground #444 #inactive_tab_background #999 inactive_tab_font_style normal @@ -169,23 +169,23 @@ tab_bar_style powerline # For a list of modifier names, see: http://www.glfw.org/docs/latest/group__mods.html # You can use the special action no_op to unmap a keyboard shortcut that is # assigned in the default configuration. - +kitty_mod ctrl+shift # Clipboard -map super+v paste_from_clipboard -map ctrl+shift+s paste_from_selection -map super+c copy_to_clipboard +map kitty_mod+v paste_from_clipboard +map alt+v paste_from_selection +map alt+c copy_to_clipboard map shift+insert paste_from_selection # Scrolling -map ctrl+shift+up scroll_line_up -map ctrl+shift+down scroll_line_down -map ctrl+shift+k scroll_line_up -map ctrl+shift+j scroll_line_down -map ctrl+shift+page_up scroll_page_up -map ctrl+shift+page_down scroll_page_down -map ctrl+shift+home scroll_home -map ctrl+shift+end scroll_end -map ctrl+shift+h show_scrollback +map kitty_mod+up scroll_line_up +map kitty_mod+down scroll_line_down +map kitty_mod+k scroll_line_up +map kitty_mod+j scroll_line_down +map kitty_mod+page_up scroll_page_up +map kitty_mod+page_down scroll_page_down +map kitty_mod+home scroll_home +map kitty_mod+end scroll_end +map kitty_mod+h show_scrollback # Window management map super+n new_os_window @@ -221,6 +221,9 @@ map ctrl+shift+up increase_font_size map ctrl+shift+down decrease_font_size map ctrl+shift+backspace restore_font_size +# Background opacity +background_opacity 1.0 +dynamic_background_opacity yes # Symbol mapping (special font for specified unicode code points). Map the # specified unicode codepoints to a particular font. Useful if you need special # rendering for some symbols, such as for Powerline. Avoids the need for diff --git a/.config/nvim/config/main.vim b/.config/nvim/config/main.vim index 3938f87..4d56c0a 100644 --- a/.config/nvim/config/main.vim +++ b/.config/nvim/config/main.vim @@ -10,7 +10,7 @@ " Colorscheme -colorscheme wpgtkAlt +colorscheme nord augroup specify_filetype autocmd! diff --git a/.config/nvim/config/plugin-settings.vim b/.config/nvim/config/plugin-settings.vim index a8e91e1..4e0feec 100644 --- a/.config/nvim/config/plugin-settings.vim +++ b/.config/nvim/config/plugin-settings.vim @@ -98,7 +98,7 @@ let g:NERDTreeIndicatorMapCustom = { "Airline " """""""""""" "main settings -let g:airline_theme='wpgtk' +let g:airline_theme='nord' let g:airline_powerline_fonts = 1 let g:airline_symbols = {} let g:airline_skip_empty_sections = 1 diff --git a/.config/compton.conf b/.config/picom.conf similarity index 95% rename from .config/compton.conf rename to .config/picom.conf index 76fdba9..d67b92b 100644 --- a/.config/compton.conf +++ b/.config/picom.conf @@ -56,7 +56,7 @@ use-damage = true; # Useless with --glx-use-copysubbuffermesa. # Partially breaks --resize-damage. # Defaults to undefined. -glx-swap-method = "undefined"; +#glx-swap-method = "undefined"; ################################# # @@ -67,11 +67,11 @@ glx-swap-method = "undefined"; # Enabled client-side shadows on windows. shadow = true; # Don't draw shadows on DND windows. -no-dnd-shadow = true; +#no-dnd-shadow = true; # Avoid drawing shadows on dock/panel windows. -no-dock-shadow = true; +#no-dock-shadow = true; # Zero the part of the shadow's mask behind the window. Fix some weirdness with ARGB windows. -clear-shadow = true; +#clear-shadow = true; # The blur radius for shadows. (default 12) shadow-radius = 7; # The left offset for shadows. (default -15) @@ -112,16 +112,16 @@ shadow-ignore-shaped = true; # ################################# -menu-opacity = 1; -inactive-opacity = 1; -active-opacity = 1; -frame-opacity = 1; -inactive-opacity-override = false; -alpha-step = 0.06; +#menu-opacity = 1; +#inactive-opacity = 1; +#active-opacity = 1; +#frame-opacity = 1; +#inactive-opacity-override = false; +#alpha-step = 0.06; blur-kern = "7x7box"; -blur-method = "kawase"; -blur-strength = 15; +blur-method = "dual_kawase"; +blur-strength = 12; opacity-rule = [ "90:class_g = 'St' && focused", @@ -129,8 +129,8 @@ opacity-rule = [ "90:class_g = 'Alacritty' && focused", "60:class_g = 'Alacritty' && !focused", "99:class_g = 'mpv'", - "90:class_g = 'kitty' && focused", - "60:class_g = 'kitty' && !focused", + "60:class_g = 'kitty' && focused", + "90:class_g = 'kitty' && !focused", "0:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_HIDDEN'", "0:_NET_WM_STATE@[1]:32a = '_NET_WM_STATE_HIDDEN'", "0:_NET_WM_STATE@[2]:32a = '_NET_WM_STATE_HIDDEN'", @@ -220,13 +220,13 @@ refresh-rate = 60; # opengl-swc: Try to VSync with SGI_swap_control OpenGL extension. Only work on some drivers. Works only with GLX backend. Known to be most effective on many drivers. Does not actually control paint timing, only buffer swap is affected, so it doesn’t have the effect of --sw-opti unlike other methods. Experimental. # opengl-mswc: Try to VSync with MESA_swap_control OpenGL extension. Basically the same as opengl-swc above, except the extension we use. # (Note some VSync methods may not be enabled at compile time.) -vsync = "opengl-swc"; +vsync = "true"; # Enable DBE painting mode, intended to use with VSync to (hopefully) eliminate tearing. # Reported to have no effect, though. dbe = true; # Painting on X Composite overlay window. Recommended. -paint-on-overlay = true; +#paint-on-overlay = true; # Limit compton to repaint at most once every 1 / refresh_rate second to boost performance. # This should not be used with --vsync drm/opengl/opengl-oml as they essentially does --sw-opti's job already, diff --git a/.config/polybar/config b/.config/polybar/config index 31f9b24..2b7b8da 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -5,21 +5,21 @@ ; [colors] background = #00000000 -background-alt = #364665 -foreground = #682E8C -foreground-alt = #8B4883 -highlight = #c79acb -error = #504E71 -red = #504E71 -yellow = #3B4C91 -green = #635D94 -darkblue = #682E8C +background-alt = #88C0D0 +foreground = #5E81AC +foreground-alt = #D08770 +highlight = #E5E9F0 +error = #BF616A +red = #BF616A +yellow = #EBCB8B +green = #A3BE8C +darkblue = #5E81AC alert = #FF0000 -lightblue = #c79acb -orange = #8B4883 -blue = #364665 -black = #07060A -grey = #8b6b8e +lightblue = #8FBCBB +orange = #D08770 +blue = #88C0D0 +black = #2E3440 +grey = #4C566A [bar/top] monitor = ${env:MONITOR:eDP-1} diff --git a/.config/wpg/templates/config_i3_config.base b/.config/wpg/templates/config_i3_config.base index 95abec2..ceb0799 100644 --- a/.config/wpg/templates/config_i3_config.base +++ b/.config/wpg/templates/config_i3_config.base @@ -76,8 +76,8 @@ exec --no-startup-id ~/.config/wpg/wp_init.sh #exec --no-startup-id conky -d -c ~/.config/conky/conkybg & #Clipster exec --no-startup-id clipster -d -#Compton -exec --no-startup-id compton -b +#Picom +exec --no-startup-id picom -b #Gnome privileges exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 #Launch Polybar where appropriate: @@ -132,8 +132,8 @@ bindsym Mod1+Shift+s exec ~/.config/Scripts/i3-resurrect-save-all bindsym Mod1+Shift+r exec ~/.config/Scripts/i3-resurrect-restore-all #Composite manager: -bindsym $mod+b exec --no-startup-id pkill compton -bindsym $mod+Ctrl+b exec --no-startup-id compton -b -f +bindsym $mod+b exec --no-startup-id pkill picom +bindsym $mod+Ctrl+b exec --no-startup-id picom -b ###---Basic Bindings---### bindsym $mod+Return exec $term @@ -149,7 +149,7 @@ bindsym $mod+BackSpace exec $flash bindsym $mod+Shift+BackSpace exec ~/.config/Scripts/on # Show selection: -bindsym Mod1+c exec clipster -sp +#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 @@ -162,7 +162,7 @@ bindsym $mod+Shift+q kill bindsym $mod+w exec pcmanfm bindsym $mod+Shift+w exec --no-startup-id $BROWSER -bindsym $mod+e exec $term -e neomutt +#bindsym $mod+e exec $term -e neomutt #bindsym $mod+Shift+e # always pop standard shell, without the menu diff --git a/.profile b/.profile index eb62d5b..4d756b4 100644 --- a/.profile +++ b/.profile @@ -15,11 +15,11 @@ export SSH_KEY_PATH="~/.ssh/id_rsa" export TERMINAL="kitty" #fzf -export FZF_CTRL_R_OPTS='--sort --exact' -export FZF_ALT_C_OPTS="--preview 'tree -C {} | head -200'" -export FZF_DEFAULT_COMMAND='fd --type f --hidden' -export FZF_DEFAULT_OPTS="--layout=reverse --inline-info" -export FZF_CTRL_T_OPTS="--preview '(highlight -O ansi -l {} 2> /dev/null || bat {} || tree -C {}) 2> /dev/null | head -200'" +#export FZF_CTRL_R_OPTS='--sort --exact' +#export FZF_ALT_C_OPTS="--preview 'tree -C {} | head -200'" +#export FZF_DEFAULT_COMMAND='fd --type f --hidden' +#export FZF_DEFAULT_OPTS="--layout=reverse --inline-info" +#export FZF_CTRL_T_OPTS="--preview '(highlight -O ansi -l {} 2> /dev/null || bat {} || tree -C {}) 2> /dev/null | head -200'" # Compilation flags export ARCHFLAGS="-arch x86_64" diff --git a/.tmux.conf b/.tmux.conf index b614868..f30cf2a 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -169,6 +169,7 @@ set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-continuum' set -g @plugin 'nhdaly/tmux-better-mouse-mode' set -g @plugin 'tmux-plugins/tmux-sidebar' +set -g @plugin "arcticicestudio/nord-tmux" ########################################################################## # Plugins settings ########################################################################## diff --git a/.zaliases b/.zaliases index f6ac823..6d2a7b3 100644 --- a/.zaliases +++ b/.zaliases @@ -17,6 +17,7 @@ alias gcp='gcloud compute ssh instance-1' alias blist='borg list ssh://borg@alpine0.home.hartzan.com:2222/backup/xps' alias contabo='ssh hate@164.68.120.85' alias yv='googler -w youtube.com --url-handler mpv $argv' +alias rollback='sudo pacback --snapback' #Check the weather: weath() { curl wttr.in/Hameenlinna ;} diff --git a/addons/yay-packages b/addons/yay-packages index f29644e..0282ee3 100644 --- a/addons/yay-packages +++ b/addons/yay-packages @@ -6,12 +6,9 @@ breeze-snow-cursor-theme chkservice chromium-vaapi-bin chromium-widevine -compton-tryone-git dell-bios-fan-control-git dmenu2 -downgrader dtrx-git -etcher-bin expac-git expressvpn fasd-git @@ -32,6 +29,8 @@ networkmanager-dmenu-git networkmanager-iwd oomox-git otf-powerline-symbols-git +pacback +picom-tryone-git polybar-git powerline-fonts-git python-ueberzug @@ -39,6 +38,9 @@ ranger-git remmina-git st-luke-git systemd-boot-pacman-hook +tlp-git +tlp-rdw-git +tlpui-git ttf-weather-icons twmn-git universal-ctags-git