diff --git a/X11/xinitrc b/X11/xinitrc index 37f31a3..05b06e4 100644 --- a/X11/xinitrc +++ b/X11/xinitrc @@ -19,7 +19,7 @@ sysmodmap=/etc/X11/xinit/.Xmodmap # Added xinitrc config dbus-update-activation-environment --systemd --all & systemctl --user import-environment DISPLAY & -xset r rate 300 50 & +xset r rate 300 70 & setxkbmap en & dwmblocks & clipmenud & @@ -28,6 +28,7 @@ picom --experimental-backends & clear & #xrandr --output DVI-D-0 --right-of HDMI-0 hsetroot -cover /home/tavo/Pictures/Backgrounds/default.jpg & +emacs --daemon & while true; do dwm >/dev/null 2>&1 diff --git a/emacs/default.txt b/emacs/default.txt index 1e0fa28..a489066 100644 --- a/emacs/default.txt +++ b/emacs/default.txt @@ -1,6 +1,5 @@ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣾⣄⡎⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⢠⡀⣆⢸⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⢸⣷⣿⣼⣿⣷⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀ ⡀⣆⢸⣿⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⠸⢿⣿⡿⠛⠛⠉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⢀⣼⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⣾⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ @@ -12,7 +11,6 @@ ⠀⣧⠀⠀⠀⠀⢠⠀⠀⠀⠀⠀⠀⣼⠤⡘⠣⠤⢊⣿⣿⡄⠀⠀⠀⠀⠘⡄⠀⠀⠀⠀⠀⠀⠀ ⢸⡃⠀⠐⠀⠀⢸⡇⠀⠀⠀⠀⠀⠄⠀⠀⠀⠀⣼⣿⣿⣟⠀⠀⠀⠀⠀⠘⣦⡀⢀⠀⠀⠀⠀ ⠀⣧⡀⠀⠰⣤⣼⡇⢀⠀⠀⠀⣶⣾⣶⣷⣶⣤⣿⣿⣿⣿⠀⠀⠀⠀⠀⠀⢹⣷⣌⢷⣤⡀⠀ -⠀⢹⣿⣷⡄⠙⠟⠀⠀⠀⠀⠀⣿⣿⡿⣿⣿⣿⣿⣿⣿⡟⠀⠀⠀⠀⠀⠀⢨⣿⣿⡷⣄⣽⡖ ⠀⠀⠹⣿⢣⡀⠀⠀⠀⠀⠀⣰⠀⠉⠐⢿⡏⣽⣿⣿⡿⠀⠀⠀⠀⠀⠀⠀⠠⢩⣁⣴⣿⡿⠁ ⠀⠀⠀⢻⠃⠁⠀⠀⠀⠀⠀⠙⠀⠀⡀⢀⣼⣿⣿⢯⠄⠀⣠⣀⣴⣿⣦⣖⣶⣿⣿⣿⡟⠁⠀ ⠀⠀⠀⠀⠀⠘⡇⠀⠀⠀⠀⠀⢀⠀⠀⠈⠉⠉⠡⠀⢀⢰⣽⠟⣻⣿⣵⣿⣿⣿⣿⠟⠀⠀⠀ diff --git a/emacs/init.el b/emacs/init.el index 2854578..52bad35 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -31,6 +31,9 @@ (unless (package-installed-p 'goto-chg) (package-install 'goto-chg)) +(unless (package-installed-p 'flycheck) + (package-install 'flycheck)) + (unless (package-installed-p 'all-the-icons) (package-install 'all-the-icons)) @@ -78,18 +81,15 @@ :config (eshell-syntax-highlighting-global-mode +1)) -(setq eshell-rc-script (concat user-emacs-directory "eshell/profile") - eshell-aliases-file (concat user-emacs-directory "eshell/aliases") - eshell-history-size 5000 - eshell-buffer-maximum-lines 5000 - eshell-hist-ignoredups t - eshell-scroll-to-bottom-on-input t - eshell-destroy-buffer-when-process-dies t - eshell-visual-commands'("bash" "fish" "htop" "ssh" "top" "zsh")) - (use-package rainbow-mode :hook org-mode prog-mode) +(use-package flycheck + :ensure t + :defer t + :diminish + :init (global-flycheck-mode)) + ;; Functions (defvar shell-pop-last-buffer nil) diff --git a/scripts/contact b/scripts/contact index 23cd9d5..5bf935c 100755 --- a/scripts/contact +++ b/scripts/contact @@ -1,7 +1,7 @@ #!/bin/sh VDIR="$HOME/.local/share/contacts" -QUERY="$(grep -r '^FN:' "$VDIR" | sed 's/.*://' | menu "Contact:")" +QUERY="$(grep -r '^FN:' "$VDIR" | sed 's/.*://' | tr -d '\r' | menu "Contact:")" [ -z "$QUERY" ] && exit 0 FILE="$(grep -r "^FN:$QUERY" "$VDIR" | cut -d ':' -f 1)" @@ -19,10 +19,11 @@ INFO="$(sed -e '/^.*:VCARD/d;/^VERSION:/d;/^PRODID:/d;/^UID:/d;/^ /d' \ -e 's/^EMAIL.*:/󰇮 /;s/^TEL.*:/󰘂 /;s/^IMPP.*:/󰟿 /' \ -e 's/^TITLE.*:/󰃖 /;s/^ORG.*:/ /' \ -e 's/^.*://g;s/[;]/ /g;/^\s*$/d' \ - "$FILE" | awk '$0 ~ /^.{4,}$/' )" + "$FILE" )" -FIELD="$(printf '%s\n󰭷 VCARD' "$INFO" | menu " $NAME:" | cut -c 6- | tr -d '\n' | sed 's/\s*$//g')" +FIELD="$(printf '%s\n󰭷 VCARD' "$INFO" | tr -d '\r' | menu " $NAME:" | cut -c 6- | tr -d '\n' | sed 's/\s*$//g')" [ -z "$FIELD" ] && exit 0 [ "$FIELD" = "VCARD" ] && sed '/^PHOTO.*:/d;/^ /d' "$FILE" | qrencode -s 8 -t PNG -o - | display && exit 0 -wl-copy "$FIELD" +#wl-copy "$FIELD" +printf '%s' "$FIELD" | xsel -ib diff --git a/scripts/menu/menu b/scripts/menu/menu index 8124983..d422067 100755 --- a/scripts/menu/menu +++ b/scripts/menu/menu @@ -10,10 +10,10 @@ menu="menu_dmenu" font="JetbrainsMono" font_size="10" col_white="#ebdbb2" # White -col_nb="#121212" # Normal background +col_nb="#1d2021" # Normal background col_nf="#606060" # Normal foreground col_sb="#fabd2f" # Selected background -col_sf="#121212" # Selected foreground +col_sf="#1d2021" # Selected foreground menu_bemenu() { bemenu$BRUN \ diff --git a/scripts/record b/scripts/record index b929872..4e7dff1 100755 --- a/scripts/record +++ b/scripts/record @@ -1,7 +1,12 @@ #!/bin/sh # Uses 'ffmpeg' to record monitor, by default grabs monitor most to the left comm="ffmpeg" -res=$(xrandr --current | grep -o "[0-9]*x[0-9]*+0+0" | cut -d "+" -f 1) + +mon="$(xrandr | sed '/disconnected/d;/connected/!d;s/ (.*$//g' | menu "Monitor:" | grep -o '[0-9]*x[0-9]*+[0-9]*+[0-9]*')" +res="${mon%%+*}" +coordx="$(printf '%s' "$mon" | cut -d '+' -f 2)" +coordy="$(printf '%s' "$mon" | cut -d '+' -f 3)" +pos="$DISPLAY+$coordx,$coordy" # Record microphone mic=$(pactl list short sources | cut -f 2 | grep input | dmenu -i -p "Mic:") @@ -26,7 +31,7 @@ recscreen_nvenc() { comm="$comm \ -hwaccel cuda -hwaccel_output_format cuda \ -video_size $res -framerate 60 \ - -f x11grab -i $DISPLAY.0+0,0 \ + -f x11grab -i $pos \ "$audio" \ -c:v h264_nvenc \ -b:v 16M \ @@ -37,7 +42,7 @@ comm="$comm \ recscreen() { comm="$comm \ -video_size $res -framerate 60 \ - -f x11grab -i $DISPLAY.0+0,0 \ + -f x11grab -i $pos \ "$audio" \ -c:v libx264rgb \ -crf 20 \ diff --git a/zathura/zathurarc b/zathura/zathurarc index 7dca677..6b15141 100644 --- a/zathura/zathurarc +++ b/zathura/zathurarc @@ -3,33 +3,33 @@ set guioptions none set recolor set recolor-keephue -set default-fg "#d3869b" -set default-bg "#121212" +set default-fg "#fabd2f" +set default-bg "#1d2021" -set statusbar-fg "#121212" -set statusbar-bg "#d3869b" +set statusbar-fg "#1d2021" +set statusbar-bg "#fabd2f" -set inputbar-fg "#121212" -set inputbar-bg "#d3869b" +set inputbar-fg "#1d2021" +set inputbar-bg "#fabd2f" -set notification-fg "#121212" -set notification-bg "#d3869b" +set notification-fg "#1d2021" +set notification-bg "#fabd2f" -set notification-error-fg "#121212" +set notification-error-fg "#1d2021" set notification-error-bg "#ab4642" -set notification-warning-bg "#121212" +set notification-warning-bg "#1d2021" set notification-warning-fg "#ab4642" -set highlight-color "#d3869b" -set highlight-active-color "#d3869b" -set highlight-fg "#d3869b" +set highlight-color "#fabd2f" +set highlight-active-color "#fabd2f" +set highlight-fg "#fabd2f" -set completion-bg "#d3869b" -set completion-fg "#121212" +set completion-bg "#fabd2f" +set completion-fg "#1d2021" -set completion-highlight-fg "#121212" -set completion-highlight-bg "#d3869b" +set completion-highlight-fg "#1d2021" +set completion-highlight-bg "#fabd2f" -set recolor-lightcolor "#121212" +set recolor-lightcolor "#1d2021" set recolor-darkcolor "#ebdbb2"