Merge branch 'master' into cla

18 files changed, 131 insertions, 43 deletions

diff --git a/darkman/config.yaml b/darkman/config.yaml
new file mode 100644
index 0000000..5cf7ee4
--- /dev/null
+++ b/darkman/config.yaml
@@ -0,0 +1,3 @@
+usegeoclue: false
+dbusserver: true
+portal: true
diff --git a/environment.d/cursor.conf b/environment.d/cursor.conf
new file mode 100644
index 0000000..9b9ef2b
--- /dev/null
+++ b/environment.d/cursor.conf
@@ -0,0 +1,2 @@
+XCURSOR_THEME=BreezeX-Black
+XCURSOR_SIZE=32
diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index 2ef9da2..8c1d035 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -1,7 +1,7 @@
 # DO NOT EDIT! This file will be overwritten by nwg-look.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
-gtk-theme-name="Flat-Remix-GTK-White-Darkest-Solid"
+gtk-theme-name="Flat-Remix-GTK-Green-Darkest"
 gtk-icon-theme-name="Cosmic"
 gtk-font-name="Cantarell 11"
 gtk-cursor-theme-name="BreezeX-Black"
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 13770ec..87b4543 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,17 +1,3 @@
 [Settings]
-gtk-theme-name=Flat-Remix-GTK-White-Darkest-Solid
-gtk-icon-theme-name=Cosmic
-gtk-font-name=Cantarell 11
-gtk-cursor-theme-name=BreezeX-Black
-gtk-cursor-theme-size=36
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=0
-gtk-menu-images=0
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=0
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintslight
-gtk-xft-rgba=rgb
-gtk-application-prefer-dark-theme=0
+gtk-cursor-theme-name = BreezeX-Black
+gtk-cursor-theme-size = 32
diff --git a/handlr/handlr.toml b/handlr/handlr.toml
new file mode 100644
index 0000000..58e04ba
--- /dev/null
+++ b/handlr/handlr.toml
@@ -0,0 +1,4 @@
+enable_selector = false
+selector = "tofi -c ~/.conifg/tofi/cosmic --prompt-text 'Open With: '"
+term_exec_args = '-e'
+expand_wildcards = false
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index bd2aab2..b9925c6 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -41,8 +41,8 @@ env = XCURSOR_SIZE,32
 
 # Debug {{{
 debug {
-  enable_stdout_logs = true
-  disable_logs = false
+  enable_stdout_logs = false
+  disable_logs = true
 }
 # }}}
 
diff --git a/lf/cleaner b/lf/cleaner
new file mode 100755
index 0000000..af197ee
--- /dev/null
+++ b/lf/cleaner
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec kitten icat --clear --stdin no --transfer-mode memory </dev/null >/dev/tty
diff --git a/lf/lfrc b/lf/lfrc
index 19c6051..32c9a10 100644
--- a/lf/lfrc
+++ b/lf/lfrc
@@ -1,9 +1,8 @@
 set ratios 1:2:3
-set cleaner ctpvclear
-set previewer ctpv
-&ctpv -s $id .
-&ctpvquit $id
+set previewer ~/.config/lf/previewer
+set cleaner ~/.config/lf/cleaner
 # Basic Settings
+set sixel true
 set preview true
 set drawbox false
 set icons true
diff --git a/lf/previewer b/lf/previewer
new file mode 100755
index 0000000..24db043
--- /dev/null
+++ b/lf/previewer
@@ -0,0 +1,36 @@
+#!/bin/sh
+draw() {
+  kitten icat --stdin no --transfer-mode memory --place "${w}x${h}@${x}x${y}" "$1" </dev/null >/dev/tty
+  exit 1
+}
+
+file="$1"
+w="$2"
+h="$3"
+x="$4"
+y="$5"
+
+case "$(file -Lb --mime-type "$file")" in 
+  image/*)
+    draw "$file"
+    ;;
+  video/*)
+    # vidthumb is from here:
+    # https://raw.githubusercontent.com/duganchen/kitty-pistol-previewer/main/vidthumb
+    draw "$(vidthumb "$file")"
+    ;;
+  application/pdf)
+    CACHE=$(mktemp /tmp/thumbcache.XXXXX)
+    pdftoppm -png -f 1 -singlefile "$1" "$CACHE"
+    draw "$CACHE.png"
+    rm -f "$CACHE" "$CACHE.png"
+    ;;
+  application/epub+zip|application/epub)
+    CACHE=$(mktemp /tmp/thumbcache.XXXXX)
+    epub-thumbnailer "$1" "$CACHE" 1024
+    $HOME/.config/lf/image draw "$CACHE"
+    rm -f "$CACHE" "$CACHE.png"
+    ;;
+esac
+
+pistol "$file"
diff --git a/nvim/after/ftplugin/rust.vim b/nvim/after/ftplugin/rust.vim
new file mode 100644
index 0000000..7a152a7
--- /dev/null
+++ b/nvim/after/ftplugin/rust.vim
@@ -0,0 +1,2 @@
+:set formatoptions+=t
+:set textwidth=80
diff --git a/qt5ct/qt5ct.conf b/qt5ct/qt5ct.conf
index 516eaab..964da53 100644
--- a/qt5ct/qt5ct.conf
+++ b/qt5ct/qt5ct.conf
@@ -1,13 +1,13 @@
 [Appearance]
-color_scheme_path=/usr/share/qt5ct/colors/darker.conf
-custom_palette=false
-icon_theme=Mint-X-Grey
-standard_dialogs=xdgdesktopportal
+color_scheme_path=/home/zachir/.config/qt5ct/style-colors.conf
+custom_palette=true
+icon_theme=Cosmic
+standard_dialogs=gtk2
 style=gtk2
 
 [Fonts]
-fixed=@Variant(\0\0\0@\0\0\0\x1e\0\x44\0\x65\0j\0\x61\0V\0u\0 \0L\0G\0\x43\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
-general=@Variant(\0\0\0@\0\0\0\x1e\0\x44\0\x65\0j\0\x61\0V\0u\0 \0L\0G\0\x43\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10)
+fixed="DejaVu LGC Sans,12,-1,5,50,0,0,0,0,0"
+general="DejaVu LGC Sans,12,-1,5,50,0,0,0,0,0"
 
 [Interface]
 activate_item_on_single_click=1
@@ -25,7 +25,7 @@ underline_shortcut=1
 wheel_scroll_lines=3
 
 [SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x1\x95\0\0\0\xfb\0\0\x5\x45\0\0\x3\x93\0\0\x1\x96\0\0\0\xfc\0\0\x5\x44\0\0\x3\x92\0\0\0\0\0\0\0\0\a\x80\0\0\x1\x96\0\0\0\xfc\0\0\x5\x44\0\0\x3\x92)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0H\0\0\x2T\0\0\x3\xdb\0\0\x4/\0\0\0H\0\0\x2T\0\0\x3\xdb\0\0\x4/\0\0\0\0\0\0\0\0\a\x80\0\0\0H\0\0\x2T\0\0\x3\xdb\0\0\x4/)
 
 [Troubleshooting]
 force_raster_widgets=1
diff --git a/qt6ct/qt6ct.conf b/qt6ct/qt6ct.conf
index 810fb94..5d9a12c 100644
--- a/qt6ct/qt6ct.conf
+++ b/qt6ct/qt6ct.conf
@@ -1,8 +1,8 @@
 [Appearance]
 color_scheme_path=/usr/share/qt6ct/colors/airy.conf
 custom_palette=false
-icon_theme=Mint-X
-standard_dialogs=xdgdesktopportal
+icon_theme=Cosmic
+standard_dialogs=gtk2
 style=qt6gtk2
 
 [Fonts]
@@ -12,7 +12,7 @@ general="DejaVu LGC Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1"
 [Interface]
 activate_item_on_single_click=1
 buttonbox_layout=0
-cursor_flash_time=1000
+cursor_flash_time=1200
 dialog_buttons_have_icons=1
 double_click_interval=400
 gui_effects=@Invalid()
@@ -25,7 +25,7 @@ underline_shortcut=1
 wheel_scroll_lines=3
 
 [SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\x42\0\0\x3\xe7\0\0\0\0\0\0\0\0\0\0\x2\xde\0\0\x2\x46\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x3\x42\0\0\x3\xe7)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\xff\xff\xff\xfd\xff\xff\xff\xe2\0\0\a<\0\0\x3\xf9\0\0\0\0\0\0\0\0\0\0\a9\0\0\x3\xf6\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\a9\0\0\x3\xf6)
 
 [Troubleshooting]
 force_raster_widgets=1
diff --git a/sh/profile b/sh/profile
index 64401f3..effba41 100644
--- a/sh/profile
+++ b/sh/profile
@@ -63,7 +63,7 @@ export GDK_SCALE=1
 export GDK_DPI_SCALE=1
 
 # Theming
-export QT_QPA_PLATFORMTHEME=qt5ct
+export QT_QPA_PLATFORMTHEME=qt6ct
 
 # Fix wayland stuff
 export MOZ_ENABLE_WAYLAND=1
@@ -131,3 +131,17 @@ addtopath "/var/lib/flatpak/exports/bin"
 unset -f addtopath
 unset USERPATH
 unset PATHS
+
+command_not_found_handle() {
+# don't run if not in a container
+  if [ ! -e /run/.containerenv ] && [ ! -e /.dockerenv ]; then
+    exit 127
+  fi
+  
+  distrobox-host-exec "${@}"
+}
+if [ -n "${ZSH_VERSION-}" ]; then
+  command_not_found_handler() {
+    command_not_found_handle "$@"
+ }
+fi
diff --git a/tofi/colors b/tofi/colors
new file mode 100644
index 0000000..a5f480c
--- /dev/null
+++ b/tofi/colors
@@ -0,0 +1,17 @@
+background-color = #000000
+outline-color = #39c1ed
+border-color = #39c1ed
+text-color = #ffffff
+prompt-color = #39c1ed
+prompt-background = #000000
+placeholder-color = #39c1ed
+placeholder-background = #000000
+input-color = #ffffff
+input-background = #000000
+default-result-background = #000000
+alternate-result-color = #ffffff
+alternate-result-background = #000000
+selection-color = #000000
+selection-match-color = #198844
+selection-background = #39c1ed
+
diff --git a/tofi/cosmic b/tofi/cosmic
new file mode 100644
index 0000000..9a5b4be
--- /dev/null
+++ b/tofi/cosmic
@@ -0,0 +1,22 @@
+include = "themes/colors"
+
+hidden-character = "*"
+anchor = top
+width = 100%
+height = 32
+horizontal = true
+font-size = 18
+prompt-text = ""
+font = Fira Code Nerd Font Mono
+outline-width = 0
+border-width = 0
+min-input-width = 424
+result-spacing = 15
+padding-top = 0
+padding-bottom = 0
+padding-left = 0
+padding-right = 0
+history = false
+selection-background-padding = 12
+result-spacing = 24
+require-match=false
diff --git a/tofi/themes/colors b/tofi/themes/colors
index a5f480c..047c875 100644
--- a/tofi/themes/colors
+++ b/tofi/themes/colors
@@ -1,10 +1,10 @@
 background-color = #000000
-outline-color = #39c1ed
-border-color = #39c1ed
+outline-color = #198844
+border-color = #198844
 text-color = #ffffff
-prompt-color = #39c1ed
+prompt-color = #198844
 prompt-background = #000000
-placeholder-color = #39c1ed
+placeholder-color = #198844
 placeholder-background = #000000
 input-color = #ffffff
 input-background = #000000
@@ -12,6 +12,6 @@ default-result-background = #000000
 alternate-result-color = #ffffff
 alternate-result-background = #000000
 selection-color = #000000
-selection-match-color = #198844
-selection-background = #39c1ed
+selection-match-color = #39c1ed
+selection-background = #198844
 
diff --git a/xdg-desktop-portal/portals.conf b/xdg-desktop-portal/portals.conf
index faadd46..b1a274e 100644
--- a/xdg-desktop-portal/portals.conf
+++ b/xdg-desktop-portal/portals.conf
@@ -1,3 +1,4 @@
 [preferred]
 default=hyprland
-org.freedesktop.impl.portal.FileChooser=lxqt
+org.freedesktop.impl.portal.FileChooser=gtk
+org.freedesktop.impl.portal.Settings=darkman
diff --git a/xsettingsd/xsettingsd.conf b/xsettingsd/xsettingsd.conf
index c1e323c..e762fa9 100644
--- a/xsettingsd/xsettingsd.conf
+++ b/xsettingsd/xsettingsd.conf
@@ -1,4 +1,4 @@
-Net/ThemeName "Flat-Remix-GTK-White-Darkest-Solid"
+Net/ThemeName "Flat-Remix-GTK-Green-Darkest"
 Net/IconThemeName "Cosmic"
 Gtk/CursorThemeName "BreezeX-Black"
 Net/EnableEventSounds 1