From e8ec42676b368422f695a59c761a2a7dc98cc916 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Wed, 14 Jun 2023 03:16:26 -0400 Subject: [PATCH] feat!: switch to NixOS --- .gitignore | 2 + README.md | 4 +- TODO.md | 1 - codium-flags.conf | 4 - etc-environment | 11 -- eww/actions/actions.scss | 2 +- eww/powermenu/powermenu.scss | 3 +- eww/scripts/brightness.sh | 6 +- eww/scripts/close-opened.sh | 2 +- eww/scripts/close.sh | 2 +- eww/scripts/music/songart.sh | 2 +- eww/scripts/network.sh | 2 +- eww/scripts/notif.sh | 2 +- eww/scripts/open.sh | 2 +- eww/scripts/volume.sh | 2 +- eww/traybuttons/traybuttons.yuck | 6 +- gtk-3.0/settings.ini | 4 +- gtklock/config.ini | 4 +- gtklock/scripts/blur.sh | 2 +- gtklock/scripts/lock.sh | 2 +- hypr/hyprland.conf | 43 ++++-- hypr/scripts/gestures.sh | 33 ----- hypr/scripts/lose-focus.sh | 6 +- hypr/scripts/tablet/autorotate.sh | 22 --- hypr/scripts/tablet/laptop-mode.sh | 6 +- hypr/scripts/tablet/osk-toggle.sh | 2 +- hypr/scripts/tablet/tablet-mode.sh | 10 +- hypr/scripts/tablet/tablet-toggle.sh | 2 +- libinput-gestures.conf | 202 --------------------------- lisgd/README.md | 3 - lisgd/config | 20 --- nvim/lazy-lock.json | 2 +- nwg-look/config | 6 - qt5ct/qt5ct.conf | 10 +- rofi/config.rasi | 2 +- rofi/dmenu.sh | 2 +- rofi/launcher.sh | 2 +- waybar/scripts/date-toggle.sh | 2 +- waybar/scripts/heart.sh | 2 +- waybar/scripts/quick-toggle.sh | 2 +- waybar/scripts/toggle-heart.sh | 2 +- 41 files changed, 81 insertions(+), 365 deletions(-) delete mode 100644 TODO.md delete mode 100644 codium-flags.conf delete mode 100644 etc-environment delete mode 100755 hypr/scripts/gestures.sh delete mode 100755 hypr/scripts/tablet/autorotate.sh delete mode 100644 libinput-gestures.conf delete mode 100644 lisgd/README.md delete mode 100755 lisgd/config delete mode 100644 nwg-look/config diff --git a/.gitignore b/.gitignore index 69064673..51529233 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ cef_user_data/ +gtk-3.0/bookmarks +Kvantum/**/ chromium/ Electron/ GIMP/ diff --git a/README.md b/README.md index 77190839..2074a51f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -Kvantum, qt5ct and my environment are for theming QT apps the same way I do with GTK apps with nwg-look +Kvantum, qt5ct and my environment are for theming QT apps the same way I do with GTK apps with lxappearance (i have to run it with the X11 backend) -I use lisgd and some scripts to make my own tablet mode since my laptop's switch is not yet in the kernel +I use some scripts to make my own tablet mode since my laptop's switch is not yet in the kernel diff --git a/TODO.md b/TODO.md deleted file mode 100644 index 4912d10a..00000000 --- a/TODO.md +++ /dev/null @@ -1 +0,0 @@ -find credits for wofi diff --git a/codium-flags.conf b/codium-flags.conf deleted file mode 100644 index 97b3d68c..00000000 --- a/codium-flags.conf +++ /dev/null @@ -1,4 +0,0 @@ ---ozone-platform-hint=auto ---enable-webrtc-pipewire-capturer ---enable-features=UseOzonePlatform ---ozone-platform=wayland diff --git a/etc-environment b/etc-environment deleted file mode 100644 index 35e0c728..00000000 --- a/etc-environment +++ /dev/null @@ -1,11 +0,0 @@ -# -# This file is parsed by pam_env module -# -# Syntax: simple "KEY=VAL" pairs on separate lines -# -EDITOR=nano -#GTK_THEME=Adwaita:dark -#GTK_THEME=Lavanda-Dark -QT_QPA_PLATFORMTHEME=qt5ct -QT_STYLE_OVERRIDE=kvantum -QT_FONT_DPI=125 diff --git a/eww/actions/actions.scss b/eww/actions/actions.scss index d6d960e5..d8ee50ee 100644 --- a/eww/actions/actions.scss +++ b/eww/actions/actions.scss @@ -115,7 +115,7 @@ } } .iconbox .icon { - font-family: Iosevka Nerd Font; + font-family: MesloLGS NF; padding: 7px 14px 7px 14px; font-size: 20px; min-width: 20px; diff --git a/eww/powermenu/powermenu.scss b/eww/powermenu/powermenu.scss index 9f258927..c77e43d6 100644 --- a/eww/powermenu/powermenu.scss +++ b/eww/powermenu/powermenu.scss @@ -2,7 +2,8 @@ background-color: $bg; color: $fg; padding: 20px; - font-family: Iosevka Nerd Font; + font-family: MesloLGS NF; + /*font-family: Iosevka Nerd Font;*/ font-size: 70px; border-radius: 30px; border: 5px solid $contrastbg; diff --git a/eww/scripts/brightness.sh b/eww/scripts/brightness.sh index a14734c7..4bb980da 100755 --- a/eww/scripts/brightness.sh +++ b/eww/scripts/brightness.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # @requires: brightnessctl @@ -46,5 +46,5 @@ if [[ $1 == "icon" ]]; then fi if [[ $1 == "set" ]]; then - light -S $2 -fi \ No newline at end of file + brightnessctl set $2% +fi diff --git a/eww/scripts/close-opened.sh b/eww/scripts/close-opened.sh index 2c8df312..006a0b31 100755 --- a/eww/scripts/close-opened.sh +++ b/eww/scripts/close-opened.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Store the output of the command in an array, keeping only lines with '*' readarray -t array <<< "$(eww windows | grep '^\*')" diff --git a/eww/scripts/close.sh b/eww/scripts/close.sh index 52754bb0..d03dc305 100755 --- a/eww/scripts/close.sh +++ b/eww/scripts/close.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash WINDOW="$1" ( diff --git a/eww/scripts/music/songart.sh b/eww/scripts/music/songart.sh index 7ddb2fb5..31f27636 100755 --- a/eww/scripts/music/songart.sh +++ b/eww/scripts/music/songart.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # thanks to kizu diff --git a/eww/scripts/network.sh b/eww/scripts/network.sh index f8bb27a2..ba03b4a6 100755 --- a/eww/scripts/network.sh +++ b/eww/scripts/network.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash symbol() { [ $(cat /sys/class/net/w*/operstate) = down ] && echo 睊 && exit diff --git a/eww/scripts/notif.sh b/eww/scripts/notif.sh index 4a0ee8a2..4c42ad78 100755 --- a/eww/scripts/notif.sh +++ b/eww/scripts/notif.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash state () { if [[ $(hyprctl layers | grep swaync-control-center) == "" ]]; then diff --git a/eww/scripts/open.sh b/eww/scripts/open.sh index ab3bb3a8..5831cdd4 100755 --- a/eww/scripts/open.sh +++ b/eww/scripts/open.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash WINDOW="$1" diff --git a/eww/scripts/volume.sh b/eww/scripts/volume.sh index 9befb47f..bbd6cd90 100755 --- a/eww/scripts/volume.sh +++ b/eww/scripts/volume.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # @requires: pactl diff --git a/eww/traybuttons/traybuttons.yuck b/eww/traybuttons/traybuttons.yuck index b9b19efc..37079bd5 100644 --- a/eww/traybuttons/traybuttons.yuck +++ b/eww/traybuttons/traybuttons.yuck @@ -17,8 +17,8 @@ :monitor 0 :stacking "overlay" :exclusive "ignore" - :geometry (geometry :x "78px" - :y "8px" + :geometry (geometry :x "66px" + :y "9px" :width "0px" :height "0px" :anchor "top left" @@ -45,7 +45,7 @@ :monitor 0 :stacking "overlay" :exclusive "ignore" - :geometry (geometry :x "60px" + :geometry (geometry :x "50px" :y "10px" :width "0px" :height "0px" diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini index 75039388..8f76810d 100644 --- a/gtk-3.0/settings.ini +++ b/gtk-3.0/settings.ini @@ -1,6 +1,6 @@ [Settings] gtk-theme-name=Lavanda-Dark -gtk-icon-theme-name=Flatery-Dark +gtk-icon-theme-name=Adwaita gtk-font-name=Cantarell 11 gtk-cursor-theme-name=Adwaita gtk-cursor-theme-size=24 @@ -12,6 +12,6 @@ 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-hintstyle=hintmedium gtk-xft-rgba=rgb gtk-application-prefer-dark-theme=0 diff --git a/gtklock/config.ini b/gtklock/config.ini index d03270a4..186da3f9 100644 --- a/gtklock/config.ini +++ b/gtklock/config.ini @@ -1,2 +1,4 @@ [main] -modules=powerbar-module.so;playerctl-module.so;userinfo-module.so +modules=/nix/var/nix/profiles/system/sw/lib/gtklock/powerbar-module.so;/nix/var/nix/profiles/system/sw/lib/gtklock/playerctl-module.so + +#;/nix/var/nix/profiles/system/sw/lib/gtklock/userinfo-module.so diff --git a/gtklock/scripts/blur.sh b/gtklock/scripts/blur.sh index abf8759e..ac87cdf1 100755 --- a/gtklock/scripts/blur.sh +++ b/gtklock/scripts/blur.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash grim /tmp/image.png convert /tmp/image.png -channel RGBA -blur 0x8 /tmp/image.png diff --git a/gtklock/scripts/lock.sh b/gtklock/scripts/lock.sh index c9fc3e56..3d1e8bb6 100755 --- a/gtklock/scripts/lock.sh +++ b/gtklock/scripts/lock.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash $HOME/.config/hypr/scripts/tablet/laptop-mode.sh & $HOME/.config/gtklock/scripts/blur.sh gtklock diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index d02f7409..fb9c8b75 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -1,4 +1,13 @@ # Plugins +plugin = /nix/store/60x0zlg3fbq7nzz8249fxsb89pn541z8-hyprland-touch-gestures-0.3.0/lib/libtouch-gestures.so + +plugin { + touch_gestures { + # default sensitivity is probably too low on tablet screens, + # I recommend turning it up to 4.0 + sensitivity = 20.0 + } +} # See https://wiki.hyprland.org/Configuring/Monitors/ monitor=eDP-1,1920x1200@60,0x0,1 @@ -12,16 +21,15 @@ $scripts = "$HOME/.config/hypr/scripts" exec-once = bash -c "sleep 3; nm-applet" exec-once = bash -c "sleep 4; blueman-applet" exec-once = bash -c "sleep 5; nextcloud --background" -exec-once = bash -c "sleep 6; /opt/tutanota-desktop/tutanota-desktop -a" -exec-once = bash -c "sleep 7; galaxybudsclient /StartMinimized" +exec-once = bash -c "sleep 6; tutanota-desktop -a" +exec-once = bash -c "sleep 7; GalaxyBudsClient /StartMinimized" -#exec-once = $HOME/.local/share/hyprload/hyprload.sh exec-once = eww daemon exec-once = eww open tablet-toggle exec-once = eww open notif-panel #exec-once = sudo input-emulator start touch --x-max 1920 --y-max 1200 --slots 4 #exec = $HOME/.config/lisgd/config -exec-once = libinput-gestures-setup start +exec-once = killall libinput-debug-events | libinput-gestures exec-once = dbus-update-activation-environment --all exec-once = gnome-keyring-daemon --start --components=secrets @@ -32,7 +40,7 @@ exec-once = $scripts/lose-focus.sh exec-once = waybar exec-once = swaync -exec-once = /usr/lib/polkit-kde-authentication-agent-1 +exec-once = /nix/store/4cssj191kj5y7n738r2a90m0vplm83gr-polkit-kde-agent-1-5.27.5/libexec/polkit-kde-authentication-agent-1 exec-once = wl-paste --watch cliphist store @@ -119,13 +127,13 @@ master { new_is_master = true } -#gestures { +gestures { # See https://wiki.hyprland.org/Configuring/Variables/ for more - #workspace_swipe = yes - #workspace_swipe_fingers = 3 - #workspace_swipe_cancel_ratio = 0.15 + workspace_swipe = yes + workspace_swipe_fingers = 3 + workspace_swipe_cancel_ratio = 0.15 #workspace_swipe_forever = yes -#} +} # Example windowrule v1 # windowrule = float, ^(kitty)$ @@ -146,13 +154,16 @@ windowrule = float,title:^(Open File)$ windowrule = pin,^(nm-tray)$ #windowrule = move cursor 0 -35,^(nm-tray)$ -windowrule = float,^(blueman-manager)$ -windowrule = move cursor 0 0,^(blueman-manager)$ -windowrule = size 400 581,^(blueman-manager)$ +windowrule = float,^(.blueman-manager-wrapped)$ +windowrule = move cursor 0 0,^(.blueman-manager-wrapped)$ +windowrule = size 400 581,^(.blueman-manager-wrapped)$ # See https://wiki.hyprland.org/Configuring/Keywords/ for more $mainMod = SUPER +# Touchscreen stuff +#bind =, swipe:3:l, exec, $scripts/gestures.sh next +#bind =, swipe:3:r, exec, $scripts/gestures.sh prev bind = $mainMod, V, exec, cliphist list | ~/.config/rofi/dmenu.sh | cliphist decode | wl-copy @@ -217,5 +228,7 @@ bind =, XF86AudioMicMute, exec, swayosd --input-volume mute-toggle bindr = CAPS, Caps_Lock, exec, swayosd --caps-lock # Brightness control -binde=, XF86MonBrightnessUp, exec, swayosd --brightness raise -binde=, XF86MonBrightnessDown, exec, swayosd --brightness lower +binde =, XF86MonBrightnessUp, exec, swayosd --brightness raise +binde =, XF86MonBrightnessDown, exec, swayosd --brightness lower +#binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+ +#binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%- diff --git a/hypr/scripts/gestures.sh b/hypr/scripts/gestures.sh deleted file mode 100755 index c2c60978..00000000 --- a/hypr/scripts/gestures.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -SIDE="$1" -TOUCH="$2" -workspaces=($(hyprctl workspaces -j | jq '.[] | .id')) -current_workspace=$(hyprctl monitors -j | jq '.[0].activeWorkspace.id') - -echo $current_workspace -if [[ ${workspaces[-1]} == ${workspaces[0]} ]]; then - if [[ $current_workspace == "1" ]]; then - hyprctl dispatch workspace 2 - - elif [[ $SIDE == "prev" ]]; then - hyprctl dispatch workspace $[${workspaces[0]} - 1] - - elif [[ $SIDE == "next" ]]; then - hyprctl dispatch workspace $[${workspaces[0]} + 1] - fi - -elif [[ $SIDE == "prev" ]]; then - if [[ $current_workspace == "1" ]]; then - hyprctl dispatch workspace ${workspaces[-1]} - else - hyprctl dispatch workspace $[$current_workspace - 1] - fi - -elif [[ $SIDE == "next" ]]; then - hyprctl dispatch workspace $[$current_workspace + 1] -fi - -if [[ $TOUCH == "touch" ]]; then - sleep 0.2 - sudo input-emulator touch tap 1280 720 -fi diff --git a/hypr/scripts/lose-focus.sh b/hypr/scripts/lose-focus.sh index c2667765..fb20befe 100755 --- a/hypr/scripts/lose-focus.sh +++ b/hypr/scripts/lose-focus.sh @@ -1,12 +1,12 @@ -#!/bin/bash +#!/usr/bin/env bash while true do - while killall -0 blueman-manager > /dev/null 2>&1 + while killall -0 .blueman-manage > /dev/null 2>&1 do if [[ $(bluetoothctl show | grep Powered | grep yes) ]]; then if [[ $(hyprctl activewindow | grep blueman-manager) == "" && $(hyprctl clients | grep blueman-manager) != "" ]]; then - killall blueman-manager + killall .blueman-manage break fi sleep 0.1 diff --git a/hypr/scripts/tablet/autorotate.sh b/hypr/scripts/tablet/autorotate.sh deleted file mode 100755 index b6dafcde..00000000 --- a/hypr/scripts/tablet/autorotate.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -execute() { - echo "Rotating" - /home/matt/.config/lisgd/config & - lisgd_pid=$! # Save the PID of the lisgd process -} - -cleanup() { - echo "Cleaning up..." - kill $lisgd_pid # Terminate the lisgd process - wait $lisgd_pid # Wait for the process to exit -} - -# Register the cleanup function to be called on script exit -trap cleanup EXIT - -# Loop to listen to the command -while IFS='$\n' read -r line; do - rotation="$(echo $line | sed -En "s/^.*orientation changed: (.*)/\1/p")" - [[ ! -z $rotation ]] && execute -done < <(stdbuf -oL monitor-sensor) diff --git a/hypr/scripts/tablet/laptop-mode.sh b/hypr/scripts/tablet/laptop-mode.sh index ebc6dece..36f724e6 100755 --- a/hypr/scripts/tablet/laptop-mode.sh +++ b/hypr/scripts/tablet/laptop-mode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash eww update toggle-state=false /usr/bin/setsysmode laptop @@ -7,6 +7,4 @@ gsettings set org.gnome.desktop.a11y.applications screen-keyboard-enabled false brightnessctl -d tpacpi::kbd_backlight s 2 killall iio-hyprland -#swaymsg output eDP-1 transform 0 -$HOME/.config/lisgd/config -killall autorotate.sh +killall evtest diff --git a/hypr/scripts/tablet/osk-toggle.sh b/hypr/scripts/tablet/osk-toggle.sh index 1ed9e904..e59b03cb 100755 --- a/hypr/scripts/tablet/osk-toggle.sh +++ b/hypr/scripts/tablet/osk-toggle.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [[ $(busctl get-property --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 Visible) == "b true" ]] then diff --git a/hypr/scripts/tablet/tablet-mode.sh b/hypr/scripts/tablet/tablet-mode.sh index f63d4bc7..7b3527ea 100755 --- a/hypr/scripts/tablet/tablet-mode.sh +++ b/hypr/scripts/tablet/tablet-mode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash eww update toggle-state=true setsysmode tablet @@ -8,6 +8,8 @@ brightnessctl -d tpacpi::kbd_backlight s 0 iio-hyprland & -$HOME/.config/hypr/scripts/tablet/autorotate.sh & -killall autorotate.sh -$HOME/.config/hypr/scripts/tablet/autorotate.sh & +evtest --grab "/dev/input/by-path/platform-i8042-serio-0-event-kbd" & +evtest --grab "/dev/input/by-path/platform-i8042-serio-1-event-mouse" & +evtest --grab "/dev/input/by-path/platform-AMDI0010:02-event-mouse" & +evtest --grab "/dev/input/by-path/platform-thinkpad_acpi-event" & +evtest --grab "/dev/video-bus" & diff --git a/hypr/scripts/tablet/tablet-toggle.sh b/hypr/scripts/tablet/tablet-toggle.sh index 7da1df32..2f697ba5 100755 --- a/hypr/scripts/tablet/tablet-toggle.sh +++ b/hypr/scripts/tablet/tablet-toggle.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [[ $(gsettings get org.gnome.desktop.a11y.applications screen-keyboard-enabled) == true ]]; then $HOME/.config/sway/scripts/tablet/laptop-mode.sh diff --git a/libinput-gestures.conf b/libinput-gestures.conf deleted file mode 100644 index 5721003a..00000000 --- a/libinput-gestures.conf +++ /dev/null @@ -1,202 +0,0 @@ -# Configuration file for libinput-gestures. -# Mark Blakeney, Sep 2015 -# -# The default configuration file exists at /etc/libinput-gestures.conf -# but a user can create a personal custom configuration file at -# ~/.config/libinput-gestures.conf. -# -# Lines starting with '#' and blank lines are ignored. Currently -# "gesture" and "device" configuration keywords are supported as -# described below. The keyword can optionally be appended with a ":" (to -# maintain compatibility with original format configuration files). -# -# Each gesture line has 3 [or 4] arguments separated by whitespace: -# -# action motion [finger_count] command -# -# where action and motion is either: -# swipe up -# swipe down -# swipe left -# swipe right -# swipe left_up -# swipe left_down -# swipe right_up -# swipe right_down -# pinch in -# pinch out -# pinch clockwise -# pinch anticlockwise -# hold on (hold gesture available since libinput 1.19) -# -# command is the remainder of the line and is any valid shell command + -# arguments. NOTE that the command is run directly and is not parsed by -# your shell. If you want shell parsing and substitutions etc then use a -# script as described in the CONFIGURATION section of the main README. -# -# finger_count is a single numeric digit and is optional (and is -# typically 3 or 4). If specified then the command is executed when -# exactly that number of fingers is used in the gesture. If not -# specified then the command is executed when that gesture is executed -# with any number of fingers. Gesture lines specified with finger_count -# have priority over the same gesture specified without any -# finger_count. -# -# Typically command will be _internal, or xdotool. See "man xdotool" for -# the many things you can action with that tool. Note that unfortunately -# xdotool does not work with native Wayland clients. - -############################################################################### -# SWIPE GESTURES: -############################################################################### - -# Note the default is an "internal" command that uses wmctrl to switch -# workspaces and, unlike xdotool, works on both Xorg and Wayland (via -# XWayland). It also can be configured for vertical and horizontal -# switching over tabular workspaces, as per the example below. You can -# also add "-w" to the internal command to allow wrapping workspaces. -# Ensure you install wmctrl if you use _internal. - -# Move to next workspace (works for GNOME/KDE/etc on Wayland and Xorg) -#gesture swipe up _internal ws_up -gesture swipe left 3 /home/matt/.config/hypr/scripts/gestures.sh next -gesture swipe right 3 /home/matt/.config/hypr/scripts/gestures.sh prev - -# NOTE ABOUT FINGER COUNT: -# The above command will configure this command for all fingers (i.e. 3 -# for 4) but to configure it for 3 fingers only, change it to: -# gesture swipe up 3 _internal ws_up -# Then you can configure something else for 4 fingers or leave 4 fingers -# unconfigured. You can configure an explicit finger count like this for -# all example commands in this configuration file. -# -# gesture swipe up xdotool key super+Page_Down - -# Move to prev workspace (works for GNOME/KDE/etc on Wayland and Xorg) -#gesture swipe down _internal ws_down -# gesture swipe down xdotool key super+Page_Up - -# Browser go forward (works only for Xorg, and Xwayland clients) -#gesture swipe left xdotool key alt+Right - -# Browser go back (works only for Xorg, and Xwayland clients) -#gesture swipe right xdotool key alt+Left - -# Open new browser tag ("hold on" available since libinput 1.19) -# gesture hold on 4 xdotool key control+t - -# NOTE: If you don't use "natural" scrolling direction for your touchpad -# then you may want to swap the above default left/right and up/down -# configurations. - -# Optional extended swipe gestures, e.g. for browser tab navigation: -# -# Jump to next open browser tab -# gesture swipe right_up xdotool key control+Tab -# -# Jump to previous open browser tab -# gesture swipe left_up xdotool key control+shift+Tab -# -# Close current browser tab -# gesture swipe left_down xdotool key control+w -# -# Reopen and jump to last closed browser tab -# gesture swipe right_down xdotool key control+shift+t - -# Example of 8 static workspaces, e.g. using KDE virtual-desktops, -# arranged in 2 rows of 4 columns across using swipe up/down/left/right -# to navigate in fixed planes. You can also add the "-w/--wrap" option -# to allow wrapping in any direction. You must configure your virtual -# desktops with the same column dimension. -# gesture swipe up _internal --cols 4 ws_up -# gesture swipe down _internal --cols 4 ws_down -# gesture swipe left _internal --cols 4 ws_left -# gesture swipe right _internal --cols 4 ws_right -# -# Example of 16 static workspaces, e.g. using KDE virtual-desktops, -# arranged in 4 rows of 4 columns across using swipe up/down/left/right -# to navigate in fixed planes, and also using swipe -# left_up/left_down/right_up/right_down to navigate diagonally. You can -# also add the "-w/--wrap" option to allow wrapping in any direction -# and/or diagonally. You must configure your virtual desktops with the -# same column dimension. -# gesture swipe up _internal --cols 4 ws_up -# gesture swipe down _internal --cols 4 ws_down -# gesture swipe left _internal --cols 4 ws_left -# gesture swipe right _internal --cols 4 ws_right -# gesture swipe left_up _internal --cols 4 ws_left_up -# gesture swipe left_down _internal --cols 4 ws_left_down -# gesture swipe right_up _internal --cols 4 ws_right_up -# gesture swipe right_down _internal --cols 4 ws_right_down - -# Example virtual desktop switching for Ubuntu Unity/Compiz. The -# _internal command does not work for Compiz but you can explicitly -# configure the swipe commands to work for a Compiz virtual 2 -# dimensional desktop as follows: -# gesture swipe up xdotool key ctrl+alt+Up -# gesture swipe down xdotool key ctrl+alt+Down -# gesture swipe left xdotool key ctrl+alt+Left -# gesture swipe right xdotool key ctrl+alt+Right - -# Example to change audio volume (this works on both Wayland and Xorg): -# Note each swipe only steps volume once. -# swipe up 4 amixer set Master "8%+" -# swipe down 4 amixer set Master "8%-" - -############################################################################### -# PINCH GESTURES: -############################################################################### - -# GNOME SHELL open/close overview (works for GNOME on Xorg only) -#gesture pinch in xdotool key super+s -#gesture pinch out xdotool key super+s - -# KDE Plasma open/close overview -# gesture pinch in xdotool key ctrl+F9 -# gesture pinch out xdotool key ctrl+F9 - -# GNOME SHELL open/close overview (works for GNOME on Wayland and Xorg) -# Note since GNOME 3.24 on Wayland this is implemented natively so no -# real point configuring for Wayland. -# gesture pinch in dbus-send --session --type=method_call --dest=org.gnome.Shell /org/gnome/Shell org.gnome.Shell.Eval string:'Main.overview.toggle();' -# gesture pinch out dbus-send --session --type=method_call --dest=org.gnome.Shell /org/gnome/Shell org.gnome.Shell.Eval string:'Main.overview.toggle();' - -# Optional extended pinch gestures: -# gesture pinch clockwise -# gesture pinch anticlockwise - -############################################################################### -# This application normally determines your touchpad device -# automatically. Some users may have multiple touchpads but by default -# we use only the first one found. However, you can choose to specify -# the explicit device name to use. Run "libinput list-devices" to work -# out the name of your device (from the "Device:" field). Then add a -# device line specifying that name, e.g: -# -# device DLL0665:01 06CB:76AD Touchpad -# -# If the device name starts with a '/' then it is instead considered as -# the explicit device path although since device paths can change -# through reboots this is best to be a symlink. E.g. instead of specifying -# /dev/input/event12, you should use the corresponding full path link -# under /dev/input/by-path/ or /dev/input/by-id/. -# -# You can choose to use ALL touchpad devices by setting the device name -# to "all". E.g. Do this if you have multiple touchpads which you want -# to use in parallel. This reduces performance slightly so only set this -# if you have to. -# -# device all - -############################################################################### -# You can set a minimum travel distance threshold before swipe gestures -# are actioned using the swipe_threshold configuration command. -# Specify this value in dots. The default is 0. -# E.g. set it to 100 dots with "swipe_threshold 100". -# swipe_threshold 0 - -############################################################################### -# You can set a timeout on gestures from start to end. The default is -# the value commented below. It can be any value in float secs >= 0. -# 0 = no timeout. E.g. set it to 2 secs with "timeout 2". -# timeout 1.5 diff --git a/lisgd/README.md b/lisgd/README.md deleted file mode 100644 index 4f174335..00000000 --- a/lisgd/README.md +++ /dev/null @@ -1,3 +0,0 @@ -I use my [fork](https://git.nelim.org/matt1432/lisgd-sway) of [lisgd](https://git.sr.ht/~mil/lisgd) to freeze touchscreen inputs while using 3 or more fingers so gestures can be done without zooming your firefox tabs or messing up your work (only works on sway). - -I had to also make a [fork](https://git.nelim.org/matt1432/input-emulator-sway) of [input-emulator](https://github.com/tio/input-emulator) to make the touch_tap do 3 simultaneous taps, because disabling the touchscreen while doing gestures would not register when the fingers stop touching. therefore, simulating another tap of 3 fingers makes sway recognize the release. diff --git a/lisgd/config b/lisgd/config deleted file mode 100755 index 01c25413..00000000 --- a/lisgd/config +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -## https://www.reddit.com/r/swaywm/comments/ocec7k/comment/i93s0ma/ -## https://git.sr.ht/~mil/lisgd/tree/0.3.7/item/config.def.h - -function gestures { - lisgd -d /dev/input/by-path/platform-AMDI0010\:00-event -o 0 -t 125 -r 25 -m 3200 \ - -g "1,UD,B,*,R,bash -c 'busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false'" \ - -g "1,DU,B,*,R,bash -c 'busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true'" \ - -g "3,RL,N,*,R,$HOME/.config/hypr/scripts/gestures.sh next" \ - -g "3,LR,N,*,R,$HOME/.config/hypr/scripts/gestures.sh prev" - -} - -if pgrep lisgd ; then - killall lisgd - gestures -else - gestures -fi diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 8af91176..6c8531d4 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -8,7 +8,7 @@ "friendly-snippets": { "branch": "main", "commit": "7006e69b60a559837ff6cdb7fe610af4f6ca823c" }, "gitsigns.nvim": { "branch": "main", "commit": "f868d82a36f7f7f5e110eb0a9659993984f59875" }, "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" }, - "lazy.nvim": { "branch": "main", "commit": "ebdd0499551765e6a7aba220cc8ae4e0cdb6be69" }, + "lazy.nvim": { "branch": "main", "commit": "6b2311a46a3808e366bb251270f4cc04afb421ed" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "f0ce33f4794a2364eb08d09d09380e8b04ec5e6a" }, "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" }, diff --git a/nwg-look/config b/nwg-look/config deleted file mode 100644 index a244fe5c..00000000 --- a/nwg-look/config +++ /dev/null @@ -1,6 +0,0 @@ -{ - "export-settings-ini": true, - "export-gtkrc-20": true, - "export-index-theme": true, - "export-xsettingsd": true -} \ No newline at end of file diff --git a/qt5ct/qt5ct.conf b/qt5ct/qt5ct.conf index 814303c8..3d4da0db 100644 --- a/qt5ct/qt5ct.conf +++ b/qt5ct/qt5ct.conf @@ -1,13 +1,13 @@ [Appearance] -color_scheme_path=/usr/share/qt5ct/colors/airy.conf +color_scheme_path=/nix/store/9f0l6r0891z45x6ixkfgnqwrrdyap65c-qt5ct-1.5/share/qt5ct/colors/airy.conf custom_palette=false -icon_theme=Flatery-Dark +icon_theme=Adwaita standard_dialogs=default style=Fusion [Fonts] -fixed="Sans Serif,9,-1,5,50,0,0,0,0,0" -general="Sans Serif,9,-1,5,50,0,0,0,0,0" +fixed=@Variant(\0\0\0@\0\0\0\x14\0S\0\x61\0n\0s\0 \0S\0\x65\0r\0i\0\x66@\"\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) +general=@Variant(\0\0\0@\0\0\0\x14\0S\0\x61\0n\0s\0 \0S\0\x65\0r\0i\0\x66@\"\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) [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\0\0\0\0\0\0\0\0\x3\xae\0\0\x4\x63\0\0\0\0\0\0\0\0\0\0\x2\xe1\0\0\x3[\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x3\xae\0\0\x4\x63) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\aq\0\0\x4p\0\0\0\0\0\0\0\0\0\0\x2\xe1\0\0\x3[\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\aq\0\0\x4p) [Troubleshooting] force_raster_widgets=1 diff --git a/rofi/config.rasi b/rofi/config.rasi index 7d57ac06..c8cb64eb 100644 --- a/rofi/config.rasi +++ b/rofi/config.rasi @@ -19,7 +19,7 @@ configuration { @import "~/.config/rofi/colors/dracula.rasi" * { - font: "Product Sans 12"; + font: "MesloLGS NF 12"; } /*****----- Main Window -----*****/ diff --git a/rofi/dmenu.sh b/rofi/dmenu.sh index 7ec54c05..42d06168 100755 --- a/rofi/dmenu.sh +++ b/rofi/dmenu.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Run rofi -dmenu \ diff --git a/rofi/launcher.sh b/rofi/launcher.sh index 0c8ee6bf..0c63ca2e 100755 --- a/rofi/launcher.sh +++ b/rofi/launcher.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ## Run rofi \ diff --git a/waybar/scripts/date-toggle.sh b/waybar/scripts/date-toggle.sh index 96f8b145..fc8bd811 100755 --- a/waybar/scripts/date-toggle.sh +++ b/waybar/scripts/date-toggle.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [[ $(eww state | grep calendar_month) ]]; then $HOME/.config/eww/scripts/close.sh date && eww close closer diff --git a/waybar/scripts/heart.sh b/waybar/scripts/heart.sh index 7154904c..f82376b6 100755 --- a/waybar/scripts/heart.sh +++ b/waybar/scripts/heart.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash TOGGLE=$HOME/.config/waybar/scripts/.heart if [ ! -e $TOGGLE ]; then diff --git a/waybar/scripts/quick-toggle.sh b/waybar/scripts/quick-toggle.sh index 9a72e3ce..3bcc3f46 100755 --- a/waybar/scripts/quick-toggle.sh +++ b/waybar/scripts/quick-toggle.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [[ $(eww state | grep br_icon) ]]; then $HOME/.config/eww/scripts/close.sh actions && eww close closer diff --git a/waybar/scripts/toggle-heart.sh b/waybar/scripts/toggle-heart.sh index d218d291..2ad5dde0 100755 --- a/waybar/scripts/toggle-heart.sh +++ b/waybar/scripts/toggle-heart.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash TOGGLE=$HOME/.config/waybar/scripts/.heart if [ ! -e $TOGGLE ]; then