Ranger trash fix, also kitty previews

bin/hyprlock

@@ -0,0 +1,2 @@
+#!/bin/dash
+swaylock --screenshots --clock --indicator --indicator-radius 100 --indicator-thickness 7 --effect-blur 7x5 --effect-vignette 0.5:0.5 --ring-color bb00cc --key-hl-color 880033 --line-color 00000000 --inside-color 00000088 --separator-color 00000000 --grace 2 --fade-in 0.2 --submit-on-touch

hyprland/.config/hypr/autostart.sh

@@ -4,4 +4,5 @@ swww init;
 flameshot & disown;
 /usr/lib/mate-polkit/polkit-mate-authentication-agent-1 &
 wayvnc & disown;
+touchegg & disown;
 $HOME/.config/waybar/launcher.sh

hyprland/.config/hypr/hyprland.conf

@@ -77,14 +77,20 @@ bind=SUPER,Z,exec,alacritty
 bind=SUPERSHIFT,Z,exec,kitty
 bind=SUPER,X,killactive,
 bind=SUPER_SHIFT,Q,exit,
+
 bind=SUPER,E,exec,nemo
+bind=SUPERSHIFT,E,exec,kitty ranger
+
 bind=SUPER,F,fullscreen,1
 bind=SUPERSHIFT,F,fullscreen,0
-bind=SUPERSHIFT,L,exec,gtklock
+
+bind=SUPERSHIFT,L,exec,hyprlock
+
 bind=SUPER,T,togglefloating,
 bind=SUPER,R,exec,wofi --show drun -o DP-3
 bind=SUPER,P,pseudo,
 bind=SUPER,SPACE,exec,rofi -modi drun,run,window,calc -show drun
+bind=SUPER,C,pin
 
 bind=SUPERSHIFT,R,hyprload,reload
 bind=SUPERSHIFT,U,hyprload,update
@@ -147,6 +153,22 @@ windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$
 windowrulev2 = pin,class:^(scrcpy)$
 windowrulev2 = move onscreen 100%-30,class:^(scrcpy)$
 
+windowrulev2 = float,class:^(flameshot)$
+windowrulev2 = pin,class:^(flameshot)$
+
+windowrulev2 = opacity 0.0 override 0.0 override,title:^(Espanso Sync Tool)$
+windowrulev2 = float,title:^(Espanso Sync Tool)$
+windowrulev2 = size 0.1 0.1,title:^(Espanso Sync Tool)$
+windowrulev2 = move 100% 100%,title:^(Espanso Sync Tool)$
+
+# Envars; to play along with wayland nicely
+
+env = QT_QPA_PLATFORM,wayland;xcb
+env = CLUTTER_BACKEND,wayland
+env = GDK_BACKEND,wayland,x11
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+env = QT_QPA_PLATFORMTHEME,qt5ct
+
 plugin:hyprfocus {
     enabled = yes
 

kitty/.config/kitty/current-theme.conf

@@ -0,0 +1,80 @@
+# vim:ft=kitty
+
+## name:     Catppuccin-Macchiato
+## author:   Pocco81 (https://github.com/Pocco81)
+## license:  MIT
+## upstream: https://github.com/catppuccin/kitty/blob/main/macchiato.conf
+## blurb:    Soothing pastel theme for the high-spirited!
+
+
+
+# The basic colors
+foreground              #CAD3F5
+background              #24273A
+selection_foreground    #24273A
+selection_background    #F4DBD6
+
+# Cursor colors
+cursor                  #F4DBD6
+cursor_text_color       #24273A
+
+# URL underline color when hovering with mouse
+url_color               #F4DBD6
+
+# Kitty window border colors
+active_border_color     #B7BDF8
+inactive_border_color   #6E738D
+bell_border_color       #EED49F
+
+# OS Window titlebar colors
+wayland_titlebar_color system
+macos_titlebar_color system
+
+# Tab bar colors
+active_tab_foreground   #181926
+active_tab_background   #C6A0F6
+inactive_tab_foreground #CAD3F5
+inactive_tab_background #1E2030
+tab_bar_background      #181926
+
+# Colors for marks (marked text in the terminal)
+mark1_foreground #24273A
+mark1_background #B7BDF8
+mark2_foreground #24273A
+mark2_background #C6A0F6
+mark3_foreground #24273A
+mark3_background #7DC4E4
+
+# The 16 terminal colors
+
+# black
+color0 #494D64
+color8 #5B6078
+
+# red
+color1 #ED8796
+color9 #ED8796
+
+# green
+color2  #A6DA95
+color10 #A6DA95
+
+# yellow
+color3  #EED49F
+color11 #EED49F
+
+# blue
+color4  #8AADF4
+color12 #8AADF4
+
+# magenta
+color5  #F5BDE6
+color13 #F5BDE6
+
+# cyan
+color6  #8BD5CA
+color14 #8BD5CA
+
+# white
+color7  #B8C0E0
+color15 #A5ADCB

nvim/.config/nvim/init.vim

@@ -71,7 +71,7 @@ Plug 'antoinemadec/FixCursorHold.nvim'
 
 Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } }
 
-Plug 'norcalli/nvim-colorizer.lua'
+Plug 'NvChad/nvim-colorizer.lua'
 
 Plug 'ms-jpq/chadtree', {'branch': 'chad', 'do': 'python3 -m chadtree deps'}
 Plug 'ms-jpq/coq_nvim', {'branch': 'coq'}
@@ -79,6 +79,8 @@ Plug 'ms-jpq/coq_nvim', {'branch': 'coq'}
 Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'}
 Plug 'ms-jpq/coq.thirdparty', {'branch': '3p'}
 
+Plug 'nvim-tree/nvim-web-devicons'
+Plug 'projekt0n/circles.nvim'
 
 Plug 'uga-rosa/translate.nvim'
 
@@ -134,9 +136,9 @@ nnoremap <F4> :Goyo<CR>
 nnoremap <F5> :MundoToggle<CR>
 
 ""Legacy" bindings for cut/copy/paste
-imap <C-X> "+x
-imap <C-C> "+y
-imap <C-V> "+gP
+"imap <C-X> "+x
+"imap <C-C> "+y
+"imap <C-V> "+gP
 
 
 
@@ -212,10 +214,11 @@ lsp.rust_analyzer.setup(coq.lsp_ensure_capabilities({
 
 EOF
 
-let g:catppuccin_flavour = "macchiato" " latte, frappe, macchiato, mocha
+let g:catppuccin_flavour = "macchiato"
 
 lua require("catppuccin").setup()
 lua require('colorizer').setup()
+lua require("circles").setup()
 colorscheme catppuccin
 
 autocmd VimEnter * execute 'COQnow -s'

ranger/.config/ranger/rc.conf

@@ -34,7 +34,7 @@ set column_ratios 1,3,4
 set hidden_filter ^\.|\.(?:pyc|pyo|bak|swp)$|^lost\+found$|^__(py)?cache__$
 
 # Show hidden files? You can toggle this by typing 'zh'
-set show_hidden false
+set show_hidden true
 
 # Ask for a confirmation when running the "delete" command?
 # Valid values are "always", "never", "multiple" (default)
@@ -57,7 +57,7 @@ set automatically_count_files true
 set open_all_images true
 
 # Be aware of version control systems and display information.
-set vcs_aware false
+set vcs_aware true
 
 # State of the four backends git, hg, bzr, svn. The possible states are
 # disabled, local (only show local info), enabled (show local and remote
@@ -71,7 +71,7 @@ set vcs_backend_svn disabled
 set vcs_msg_length 50
 
 # Use one of the supported image preview protocols
-set preview_images false
+set preview_images true
 
 # Set the preview image method. Supported methods:
 #
@@ -114,7 +114,7 @@ set preview_images false
 #   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 ueberzug
+set preview_images_method kitty
 
 # Delay in seconds before displaying an image with the w3m method.
 # Increase it in case of experiencing display corruption.
@@ -128,7 +128,7 @@ set iterm2_font_width 8
 set iterm2_font_height 11
 
 # Use a unicode "..." character to mark cut-off filenames?
-set unicode_ellipsis false
+set unicode_ellipsis true
 
 # BIDI support - try to properly display file names in RTL languages (Hebrew, Arabic).
 # Requires the python-bidi pip package
@@ -183,7 +183,7 @@ set display_free_space_in_status_bar true
 set display_tags_in_all_columns true
 
 # Set a title for the window? Updates both `WM_NAME` and `WM_ICON_NAME`
-set update_title false
+set update_title true
 
 # Set the tmux/screen window-name to "ranger"?
 set update_tmux_title true

ranger/.config/ranger/rifle.conf

@@ -280,5 +280,5 @@ label pager,  !mime ^text, !ext xml|json|csv|tex|py|pl|rb|js|sh|php  = "$PAGER"
 mime application/x-executable = "$1"
 
 # Move the file to trash using trash-cli.
-label trash, has trash-put = trash-put -- "$@"
+label trash, has trash-put = trash-put "$@"
 label trash = mkdir -p -- ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash; mv -- "$@" ${XDG_DATA_DIR:-$HOME/.ranger}/ranger-trash

waybar/.config/waybar/config

@@ -5,7 +5,7 @@
     // "width": 1280, // Waybar width
     "spacing": 4, // Gaps between modules (4px)
     // Choose the order of the modules
-    "modules-left": ["custom/archicon","hyprland/workspaces", "sway/mode", "sway/scratchpad", "custom/media"],
+    "modules-left": ["custom/archicon","hyprland/workspaces", "custom/media", ],
     "modules-center": ["hyprland/window"],
     "modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "clock", "tray"],
     // Modules configuration
@@ -80,8 +80,8 @@
     "idle_inhibitor": {
         "format": "{icon}",
         "format-icons": {
-            "activated": "",
-            "deactivated": ""
+            "activated": "󰅶",
+            "deactivated": "󰾪"
         }
     },
     "tray": {
@@ -90,8 +90,8 @@
     },
     "clock": {
         // "timezone": "America/New_York",
-        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%Y-%m-%d}"
+        "tooltip-format": "<big>{:%d %B %Y}</big>\n<tt><small>{calendar}</small></tt>",
+        "format-alt": "{:%Y-%m-%d}",
     },
     "cpu": {
         "format": "{usage}% ",
@@ -146,9 +146,9 @@
         "format-source": "{volume}% ",
         "format-source-muted": "",
         "format-icons": {
-            "headphone": "",
-            "hands-free": "",
-            "headset": "",
+            "headphone": "󰋋",
+            "hands-free": "󰟅",
+            "headset": "󰋎",
             "phone": "",
             "portable": "",
             "car": "",

waybar/.config/waybar/macchiato.css

@@ -0,0 +1,38 @@
+/*
+*
+* Catppuccin Macchiato palette
+* Maintainer: rubyowo
+*
+*/
+
+@define-color base   #24273a;
+@define-color mantle #1e2030;
+@define-color crust  #181926;
+
+@define-color text     #cad3f5;
+@define-color subtext0 #a5adcb;
+@define-color subtext1 #b8c0e0;
+
+@define-color surface0 #363a4f;
+@define-color surface1 #494d64;
+@define-color surface2 #5b6078;
+
+@define-color overlay0 #6e738d;
+@define-color overlay1 #8087a2;
+@define-color overlay2 #939ab7;
+
+@define-color blue      #8aadf4;
+@define-color lavender  #b7bdf8;
+@define-color sapphire  #7dc4e4;
+@define-color sky       #91d7e3;
+@define-color teal      #8bd5ca;
+@define-color green     #a6da95;
+@define-color yellow    #eed49f;
+@define-color peach     #f5a97f;
+@define-color maroon    #ee99a0;
+@define-color red       #ed8796;
+@define-color mauve     #c6a0f6;
+@define-color pink      #f5bde6;
+@define-color flamingo  #f0c6c6;
+@define-color rosewater #f4dbd6;
+

waybar/.config/waybar/style.css

@@ -1,12 +1,13 @@
+@import "macchiato.css";
 * {
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: "NotoSans NFP", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
+    font-family: "NotoSans Nerd Font Propo", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
     font-size: 13px;
 }
 
 window#waybar {
-    background-color: rgba(43, 48, 59, 0.5);
-    border-bottom: 3px solid rgba(100, 114, 125, 0.5);
+    background-color: shade(@base, 1);/* rgba(43, 48, 59, 0.5);*/
+    border-bottom: 3px solid shade(@overlay2, 0.5);
     color: #ffffff;
     transition-property: background-color;
     transition-duration: .5s;
@@ -30,10 +31,9 @@ window#waybar.termite {
 }
 
 window#waybar.chromium {
-    background-color: #000000;
+    background-color: @base;
     border: none;
 }
-
 button {
     /* Use box-shadow instead of border so the text isn't offset */
     box-shadow: inset 0 -3px transparent;
@@ -59,19 +59,19 @@ button:hover {
 }
 
 #workspaces button.active {
-    background-color: #64727D;
+    background-color: @overlay1;
     box-shadow: inset 0 -3px #ffffff;
 }
 
 #workspaces button.urgent {
-    background-color: #eb4d4b;
+    background-color: @red;
 }
 
 #mode {
     background-color: #64727D;
     border-bottom: 3px solid #ffffff;
 }
-
+#cava,
 #clock,
 #battery,
 #cpu,
@@ -89,7 +89,7 @@ button:hover {
 #scratchpad,
 #mpd {
     padding: 0 10px;
-    color: #ffffff;
+    color: @text;
 }
 
 #window,
@@ -108,23 +108,23 @@ button:hover {
 }
 
 #clock {
-    background-color: #64727D;
+		background-color: inherit;
 }
 
 #battery {
     background-color: #ffffff;
-    color: #000000;
+    color: @base;
 }
 
 #battery.charging, #battery.plugged {
-    color: #ffffff;
-    background-color: #26A65B;
+    color: @base;
+    background-color: @green;
 }
 
 @keyframes blink {
     to {
         background-color: #ffffff;
-        color: #000000;
+        color: @base;
     }
 }
 
@@ -139,16 +139,17 @@ button:hover {
 }
 
 label:focus {
-    background-color: #000000;
+    background-color: @base;
 }
 
 #cpu {
-    background-color: #2ecc71;
-    color: #000000;
+    background-color: @teal;
+    color: @surface0;
 }
 
 #memory {
-    background-color: #9b59b6;
+    background-color: @mauve;
+		color: @surface0;
 }
 
 #disk {
@@ -156,34 +157,36 @@ label:focus {
 }
 
 #backlight {
-    background-color: #90b1b1;
+    background-color: @teal;
+		color: @base;
 }
 
 #network {
-    background-color: #2980b9;
+    background-color: @sky;
+		color: @base;
 }
 
 #network.disconnected {
-    background-color: #f53c3c;
+    background-color: @red;
 }
 
 #pulseaudio {
-    background-color: #f1c40f;
-    color: #000000;
+    background-color: @yellow;
+    color: @base;
 }
 
 #pulseaudio.muted {
-    background-color: #90b1b1;
-    color: #2a5c45;
+    background-color: @peach;
+    color: @base;
 }
 
 #wireplumber {
-    background-color: #fff0f5;
-    color: #000000;
+    background-color: @yellow;
+    color: @base;
 }
 
 #wireplumber.muted {
-    background-color: #f53c3c;
+    background-color: @peach;
 }
 
 #custom-media {
@@ -202,6 +205,7 @@ label:focus {
 
 #temperature {
     background-color: #f0932b;
+		color: @base;
 }
 
 #temperature.critical {
@@ -209,7 +213,7 @@ label:focus {
 }
 
 #tray {
-    background-color: #2980b9;
+    /*background-color: @crust;*/
 }
 
 #tray > .passive {
@@ -218,7 +222,7 @@ label:focus {
 
 #tray > .needs-attention {
     -gtk-icon-effect: highlight;
-    background-color: #eb4d4b;
+    background-color: @maroon;
 }
 
 #idle_inhibitor {
@@ -256,8 +260,8 @@ label:focus {
 }
 
 #keyboard-state {
-    background: #97e1ad;
-    color: #000000;
+    background: @sky;
+    color: @base;
     padding: 0 0px;
     margin: 0 5px;
     min-width: 16px;

zsh/.aliases

@@ -89,7 +89,10 @@ alias please='sudo'
 alias simon-says='sudo'
 alias runhis="anyframe-widget-execute-history"
 
+alias gitup='for dir in $(find . -name ".git"); do cd ${dir%/*}; pwd ; git pull ; cd -; done'
+
 # Default xclip to use Ctrl-c/Ctrl-v clipboard
 alias xclip="xclip -selection c"
 alias :q="exit"
-alias mirrorup='sudo reflector --verbose -c Poland -c Germany -c France -l 10 -a 2 -p https --sort rate --save /etc/pacman.d/mirrorlist'
+alias mirrorup='sudo reflector --verbose -c Poland -c Germany -c France -l 25 -a 2 -p https --sort rate --save /etc/pacman.d/mirrorlist'
+alias lock="swaylock --screenshots --clock --indicator --indicator-radius 100 --indicator-thickness 7 --effect-blur 7x5 --effect-vignette 0.5:0.5 --ring-color bb00cc --key-hl-color 880033 --line-color 00000000 --inside-color 00000088 --separator-color 00000000 --grace 2 --fade-in 0.2"

zsh/.zshrc

@@ -202,7 +202,7 @@ gpg-connect-agent updatestartuptty /bye >/dev/null
 
 
 [ "$TERM" = "xterm-kitty" ] && (alias ssh="kitten ssh"; eval "kitten run-shell";)
-[ "$TERMUX_APK_RELEASE" = "F_DROID" ] && eval `okc-ssh-agent`
+[ "$TERMUX_APK_RELEASE" = "F_DROID" ] && (eval `okc-ssh-agent`)