diff --git a/config-home.yaml b/config-home.yaml index 0be1820..abf4370 100644 --- a/config-home.yaml +++ b/config-home.yaml @@ -31,8 +31,8 @@ dotfiles: dst: ~/.config/nvim/coc-settings.json src: .config/nvim/coc-settings.json d_scripts: - dst: ~/Scripts - src: Scripts + dst: ~/.scripts + src: .scripts d_sway: dst: ~/.config/sway src: .config/sway diff --git a/home/.config/sway/conf.d/01-vars.conf b/home/.config/sway/conf.d/01-vars.conf index 1134715..5ca6f7e 100644 --- a/home/.config/sway/conf.d/01-vars.conf +++ b/home/.config/sway/conf.d/01-vars.conf @@ -4,3 +4,4 @@ set $mod Mod4 set $term alacritty set $gnome-schema org.gnome.desktop.interface set $wallpaper ~/Pictures/Wallpapers/random/$(ls ~/Pictures/Wallpapers/random | sort -R | tail -n 1) +set $scripts ~/.config/sway/scripts diff --git a/home/.config/sway/conf.d/06-keybinds.conf b/home/.config/sway/conf.d/06-keybinds.conf index 1335220..df86950 100644 --- a/home/.config/sway/conf.d/06-keybinds.conf +++ b/home/.config/sway/conf.d/06-keybinds.conf @@ -6,8 +6,34 @@ bindsym $mod+Return exec $term # kill focused window bindsym $mod+w kill -# start your launcher -bindsym $mod+Shift+p exec rofi-pass --bmarks +# Modes for controlling gaps +set $mode_gaps Gaps: (o) outer, (i) inner +set $mode_gaps_outer Outer Gaps: j|k|0|r|i +set $mode_gaps_inner Inner Gaps: j|k|0|r|o +bindsym $mod+g mode "$mode_gaps" + +mode "$mode_gaps" { + bindsym o mode "$mode_gaps_outer" + bindsym i mode "$mode_gaps_inner" + bindsym Escape mode "default" +} + +mode "$mode_gaps_inner" { + bindsym j gaps inner all minus 1 + bindsym k gaps inner all plus 1 + bindsym 0 gaps inner all set 0 + bindsym r gaps inner all set 10 + bindsym i mode "$mode_gaps_outer" + bindsym Escape mode "default" +} +mode "$mode_gaps_outer" { + bindsym j gaps outer all minus 1 + bindsym k gaps outer all plus 1 + bindsym 0 gaps outer all set 0 + bindsym r gaps outer all set 10 + bindsym o mode "$mode_gaps_inner" + bindsym Escape mode "default" +} # Drag floating windows by holding down $mod and left mouse button. # Resize them with right mouse button + $mod. @@ -27,7 +53,7 @@ bindsym --locked XF86Search output eDP-1 toggle # FZF # exit menu -bindsym $mod+Shift+e exec $term --class fzf-launcher -e $HOME/Scripts/sway-exit.sh +bindsym $mod+Shift+e exec $term --class fzf-launcher -e $scripts/exit.sh # launch a program bindsym $mod+d exec wofi bindsym $mod+Shift+d exec wofi --show run diff --git a/home/.config/sway/conf.d/08-exec.conf b/home/.config/sway/conf.d/08-exec.conf index 397e232..420bb6e 100644 --- a/home/.config/sway/conf.d/08-exec.conf +++ b/home/.config/sway/conf.d/08-exec.conf @@ -1,7 +1,7 @@ # vim:ft=i3config exec { - $HOME/Scripts/swayidle.sh + $scripts/idle.sh autotiling redshift-gtk -m wayland telegram-desktop diff --git a/home/Scripts/sway-exit.sh b/home/.config/sway/scripts/exit.sh similarity index 100% rename from home/Scripts/sway-exit.sh rename to home/.config/sway/scripts/exit.sh diff --git a/home/Scripts/swayidle.sh b/home/.config/sway/scripts/idle.sh similarity index 74% rename from home/Scripts/swayidle.sh rename to home/.config/sway/scripts/idle.sh index c096921..5b9fc27 100755 --- a/home/Scripts/swayidle.sh +++ b/home/.config/sway/scripts/idle.sh @@ -1,5 +1,5 @@ #!/bin/bash -swaylock="$HOME/Scripts/swaylock.sh" +swaylock="$HOME/.config/sway/scripts/lock.sh" screenon="swaymsg 'output * dpms on'" screenoff="swaymsg 'output * dpms off'" swayidle \ @@ -10,4 +10,4 @@ swayidle \ timeout 600 "loginctl lock-session" \ timeout 610 "$screenoff" \ resume "$screenon; lqsd -r" \ - before-sleep "playerctl pause; loginctl lock-session" + before-sleep "playerctl pause; loginctl lock-session" \ diff --git a/home/Scripts/swaylock.sh b/home/.config/sway/scripts/lock.sh similarity index 100% rename from home/Scripts/swaylock.sh rename to home/.config/sway/scripts/lock.sh diff --git a/home/Scripts/sway-run.sh b/home/.config/sway/scripts/run.sh similarity index 100% rename from home/Scripts/sway-run.sh rename to home/.config/sway/scripts/run.sh diff --git a/home/.config/user-dirs.dirs b/home/.config/user-dirs.dirs index 7f9a959..4356ac1 100644 --- a/home/.config/user-dirs.dirs +++ b/home/.config/user-dirs.dirs @@ -1,10 +1,3 @@ -# This file is written by xdg-user-dirs-update -# If you want to change or add directories, just edit the line you're -# interested in. All local changes will be retained on the next run. -# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped -# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an -# absolute path. No other format is supported. -# XDG_DESKTOP_DIR="$HOME/Desktop" XDG_DOWNLOAD_DIR="$HOME/Downloads" XDG_TEMPLATES_DIR="$HOME/Templates" diff --git a/home/.config/waybar/config b/home/.config/waybar/config index 11b6c18..d0e2776 100644 --- a/home/.config/waybar/config +++ b/home/.config/waybar/config @@ -107,7 +107,7 @@ "tooltip": false, "format": "{}", "return-type": "json", - "exec": "$HOME/Scripts/mediaplayer.py 2>/dev/null", + "exec": "$HOME/.config/waybar/scripts/mediaplayer.py 2>/dev/null", "max-length": 50, "on-click": "playerctl play-pause", "on-click-right": "playerctl next", diff --git a/home/Scripts/mediaplayer.py b/home/.config/waybar/scripts/mediaplayer.py similarity index 100% rename from home/Scripts/mediaplayer.py rename to home/.config/waybar/scripts/mediaplayer.py diff --git a/home/.config/zsh/01-env.zsh b/home/.config/zsh/01-env.zsh index 47431a9..b35516f 100644 --- a/home/.config/zsh/01-env.zsh +++ b/home/.config/zsh/01-env.zsh @@ -18,6 +18,7 @@ export GOPATH=~/.bin/go # fzf settings export FZF_DEFAULT_COMMAND='rg --files --hidden 2>/dev/null' +export FZF_DEFAULT_OPTS='-m --bind ctrl-a:select-all,ctrl-d:deselect-all,ctrl-t:toggle-all' export FZF_COMPLETION_TRIGGER='**' export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_CTRL_T_OPTS='--preview "/usr/bin/cat {} | nvimpager -c "' diff --git a/home/.config/zsh/03-aliases.zsh b/home/.config/zsh/03-aliases.zsh index 89a7179..721fcc1 100644 --- a/home/.config/zsh/03-aliases.zsh +++ b/home/.config/zsh/03-aliases.zsh @@ -140,7 +140,6 @@ update() { zinit update -p $HOME/.tmux/plugins/tpm/bin/update_plugins all } - {%@@ if profile == "Moria" @@%} docker-update() { for dir in $HOME/Git/dotfiles/docker/*; do @@ -151,7 +150,6 @@ update() { done } - {%@@ endif @@%} if [ $# -eq 0 ]; then 1=base fi @@ -166,11 +164,9 @@ update() { plugins) plugins ;; - {%@@ if profile == "Moria" @@%} docker) docker-update ;; - {%@@ endif @@%} *) printf "$1: not a valid action" ;; @@ -187,7 +183,7 @@ tether() { adb shell su -c "service call connectivity 33 i32 1 s16 me" > /dev/nu alias reflect='sudo reflector --latest 200 --threads 8 --verbose --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist' # better ls -alias ls='ls_extended -I' +alias ls='ls_extended -Ih' # default icon for notify-send alias notify-send='notify-send --icon=alarm' diff --git a/home/Scripts/autorotate.sh b/home/.scripts/autorotate.sh similarity index 100% rename from home/Scripts/autorotate.sh rename to home/.scripts/autorotate.sh diff --git a/home/Scripts/confgen/termite.conf.gen.sh b/home/.scripts/confgen/termite.conf.gen.sh similarity index 100% rename from home/Scripts/confgen/termite.conf.gen.sh rename to home/.scripts/confgen/termite.conf.gen.sh diff --git a/home/Scripts/confgen/zathura.conf.gen.sh b/home/.scripts/confgen/zathura.conf.gen.sh similarity index 100% rename from home/Scripts/confgen/zathura.conf.gen.sh rename to home/.scripts/confgen/zathura.conf.gen.sh diff --git a/home/Scripts/hibernate-lowbattery.sh b/home/.scripts/hibernate-lowbattery.sh similarity index 100% rename from home/Scripts/hibernate-lowbattery.sh rename to home/.scripts/hibernate-lowbattery.sh diff --git a/home/Scripts/ipmi/auto.sh b/home/.scripts/ipmi/auto.sh similarity index 100% rename from home/Scripts/ipmi/auto.sh rename to home/.scripts/ipmi/auto.sh diff --git a/home/Scripts/ipmi/fans.sh b/home/.scripts/ipmi/fans.sh similarity index 100% rename from home/Scripts/ipmi/fans.sh rename to home/.scripts/ipmi/fans.sh diff --git a/home/Scripts/ipmi/full.sh b/home/.scripts/ipmi/full.sh similarity index 100% rename from home/Scripts/ipmi/full.sh rename to home/.scripts/ipmi/full.sh diff --git a/home/Scripts/ipmi/static.sh b/home/.scripts/ipmi/static.sh similarity index 100% rename from home/Scripts/ipmi/static.sh rename to home/.scripts/ipmi/static.sh diff --git a/home/Scripts/ipmi/temp.sh b/home/.scripts/ipmi/temp.sh similarity index 100% rename from home/Scripts/ipmi/temp.sh rename to home/.scripts/ipmi/temp.sh diff --git a/home/Scripts/imageviewer b/home/.scripts/media/imageviewer similarity index 100% rename from home/Scripts/imageviewer rename to home/.scripts/media/imageviewer diff --git a/home/Scripts/imgurviewer b/home/.scripts/media/imgurviewer similarity index 100% rename from home/Scripts/imgurviewer rename to home/.scripts/media/imgurviewer diff --git a/home/Scripts/mpvqueue b/home/.scripts/media/mpvqueue similarity index 100% rename from home/Scripts/mpvqueue rename to home/.scripts/media/mpvqueue diff --git a/home/Scripts/open_with_linux.py b/home/.scripts/open_with_linux.py similarity index 95% rename from home/Scripts/open_with_linux.py rename to home/.scripts/open_with_linux.py index fe1dbec..6a4f979 100755 --- a/home/Scripts/open_with_linux.py +++ b/home/.scripts/open_with_linux.py @@ -7,7 +7,7 @@ import json import struct import subprocess -VERSION = '7.1b2' +VERSION = '7.2.2' try: sys.stdin.buffer @@ -63,6 +63,8 @@ def install(): } locations = { 'chrome': os.path.join(home_path, '.config', 'google-chrome', 'NativeMessagingHosts'), + 'chrome-beta': os.path.join(home_path, '.config', 'google-chrome-beta', 'NativeMessagingHosts'), + 'chrome-unstable': os.path.join(home_path, '.config', 'google-chrome-unstable', 'NativeMessagingHosts'), 'chromium': os.path.join(home_path, '.config', 'chromium', 'NativeMessagingHosts'), 'firefox': os.path.join(home_path, '.mozilla', 'native-messaging-hosts'), } diff --git a/home/.zprofile b/home/.zprofile index dcbf3fe..ed8b10a 100644 --- a/home/.zprofile +++ b/home/.zprofile @@ -1,5 +1,5 @@ if cat /proc/cmdline | grep -q "video=eDP-1:d"; then [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && kodi else - [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && $HOME/Scripts/sway-run.sh > /dev/null 2>&1 + [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && $HOME/.config/sway/scripts/run.sh > /dev/null 2>&1 fi diff --git a/home/Scripts/check-mail.sh b/home/Scripts/check-mail.sh deleted file mode 100755 index 8afa396..0000000 --- a/home/Scripts/check-mail.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -mbsync -a -notmuch new -notifymuch diff --git a/home/Scripts/fonts.sh b/home/Scripts/fonts.sh deleted file mode 100755 index d15202a..0000000 --- a/home/Scripts/fonts.sh +++ /dev/null @@ -1,3 +0,0 @@ -sudo ln -s /etc/fonts/conf.avail/70-no-bitmaps.conf /etc/fonts/conf.d -sudo ln -s /etc/fonts/conf.avail/10-sub-pixel-rgb.conf /etc/fonts/conf.d -sudo ln -s /etc/fonts/conf.avail/11-lcdfilter-default.conf /etc/fonts/conf.d diff --git a/home/Scripts/fzf-shot.sh b/home/Scripts/fzf-shot.sh deleted file mode 100755 index 66cc94b..0000000 --- a/home/Scripts/fzf-shot.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -TYPE=$(cat < /home/reekymarko/Scripts/suspendcommand -else - echo "won't suspend, external display connected" - echo " " > /home/reekymarko/Scripts/suspendcommand -fi diff --git a/home/Scripts/polybar.sh b/home/Scripts/polybar.sh deleted file mode 100755 index 21ee552..0000000 --- a/home/Scripts/polybar.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env sh - -# Terminate already running bar instances -killall -q polybar - -# Wait until the processes have been shut down -while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done - -# Launch bar1 and bar2 -polybar top & - - -echo "Bars launched..." diff --git a/home/Scripts/touchpadtoggle.sh b/home/Scripts/touchpadtoggle.sh deleted file mode 100755 index ec3a10e..0000000 --- a/home/Scripts/touchpadtoggle.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - - -gr="FocalTechPS/2 FocalTech Touchpad" -#gr="SynPS/2 Synaptics TouchPad" - - -#Creates a file if it does not exist to store the 0 or 1 bit to check if touchpad is enabled or disabled. Set to 0 by default -if [ ! -f .touchpad ]; - then - echo 0 > .touchpad; - -fi - -if grep -q 0 ".touchpad"; -then - xinput enable "$gr"; - echo 1 > .touchpad; - echo "Touchpad enabled" - notify-send "Touchpad enabled" -else - xinput disable "$gr"; - echo 0 > .touchpad; - echo "Touchpad Disabled" - notify-send "Touchpad disabled" -fi