From c515582f5f0830ce5cca8064854b750cecc54ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Wed, 20 Jul 2022 21:43:22 +0200 Subject: [PATCH 1/3] Add kanshi for display management --- installed_packages/sway/Arch | 1 + installed_packages/sway/apt | 1 + installed_packages/sway/dnf | 1 + symlinks/config/sway/conf.d/20_lockconfig | 8 +++++--- symlinks/config/sway/conf.d/50_startup | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/installed_packages/sway/Arch b/installed_packages/sway/Arch index 269c66e..05ac9a0 100644 --- a/installed_packages/sway/Arch +++ b/installed_packages/sway/Arch @@ -4,6 +4,7 @@ aerc fish foot htop +kanshi ulauncher waybar wl-clipboard diff --git a/installed_packages/sway/apt b/installed_packages/sway/apt index 269c66e..05ac9a0 100644 --- a/installed_packages/sway/apt +++ b/installed_packages/sway/apt @@ -4,6 +4,7 @@ aerc fish foot htop +kanshi ulauncher waybar wl-clipboard diff --git a/installed_packages/sway/dnf b/installed_packages/sway/dnf index 269c66e..05ac9a0 100644 --- a/installed_packages/sway/dnf +++ b/installed_packages/sway/dnf @@ -4,6 +4,7 @@ aerc fish foot htop +kanshi ulauncher waybar wl-clipboard diff --git a/symlinks/config/sway/conf.d/20_lockconfig b/symlinks/config/sway/conf.d/20_lockconfig index 67344be..8de54d1 100644 --- a/symlinks/config/sway/conf.d/20_lockconfig +++ b/symlinks/config/sway/conf.d/20_lockconfig @@ -1,9 +1,11 @@ # Define locker script -set $locker swaylock -f -i "$(shuf -n1 -e ~/Pictures/Lockscreens/*.png)" -s fill +set $locker 'swaylock -f -i "$(shuf -n1 -e ~/Pictures/Lockscreens/*.png)" -s fill' bindsym $alt+L exec $locker # IDLE CONFIG exec swayidle -w \ timeout 300 $locker \ - timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ - before-sleep $locker + timeout 330 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ + timeout 600 'systemctl suspend' \ + before-sleep $locker \ + before-sleep 'playerctl pause' diff --git a/symlinks/config/sway/conf.d/50_startup b/symlinks/config/sway/conf.d/50_startup index 8b959c2..3e3c49f 100644 --- a/symlinks/config/sway/conf.d/50_startup +++ b/symlinks/config/sway/conf.d/50_startup @@ -4,3 +4,4 @@ exec kdeconnect-indicator exec ulauncher --hide-window exec libinput-gestures-setup start exec foot --server +exec kanshi From 3948c77b1fd75e61bbf492662c99623897dfa037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Thu, 21 Jul 2022 19:08:50 +0200 Subject: [PATCH 2/3] Fix cloning scripts in Makefile --- Makefile | 4 ++-- symlinks/config/fish/config.fish | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index daff010..8f7fdfd 100644 --- a/Makefile +++ b/Makefile @@ -234,12 +234,12 @@ prepare_scripts_cache_dir: check_os .PHONY: clone_personal_vimwiki clone_personal_vimwiki: check_os @echo "Cloning personal vimwiki" - @git clone git@ensarsarajcic.com:esensar/vimwiki.wiki.git ~/vimwiki + @git clone git@git.ensarsarajcic.com:esensar/vimwiki.wiki.git ~/vimwiki .PHONY: clone_termux_shortcuts clone_termux_shortcuts: check_os @echo "Cloning termux shortcuts" - @git clone git@ensarsarajcic.com:esensar/termux-shortcuts.git ~/.shortcuts + @git clone git@git.ensarsarajcic.com:esensar/termux-shortcuts.git ~/.shortcuts .PHONY: prepare_ssh_dir prepare_ssh_dir: check_os diff --git a/symlinks/config/fish/config.fish b/symlinks/config/fish/config.fish index 4a797be..ddfdc7a 100644 --- a/symlinks/config/fish/config.fish +++ b/symlinks/config/fish/config.fish @@ -19,6 +19,7 @@ alias cat "bat" if which termux-info &> /dev/null else export MANPAGER="sh -c 'col -bx | bat -l man -p'" + export MANROFFOPT="-c" end abbr -a batdiff "git diff --name-only --diff-filter=d | xargs bat --diff" From fb2da1805782b92738ed77548e1969dce3b57e72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ensar=20Saraj=C4=8Di=C4=87?= Date: Sat, 23 Jul 2022 16:28:37 +0200 Subject: [PATCH 3/3] Add more mail related config --- symlinks/config/nvim/after/ftplugin/mail.vim | 6 ++++++ symlinks/gitconfig | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 symlinks/config/nvim/after/ftplugin/mail.vim diff --git a/symlinks/config/nvim/after/ftplugin/mail.vim b/symlinks/config/nvim/after/ftplugin/mail.vim new file mode 100644 index 0000000..b72cce8 --- /dev/null +++ b/symlinks/config/nvim/after/ftplugin/mail.vim @@ -0,0 +1,6 @@ +setlocal textwidth=72 +setlocal formatoptions+=n +setlocal shiftwidth=4 +setlocal tabstop=4 +setlocal expandtab +setlocal softtabstop=4 diff --git a/symlinks/gitconfig b/symlinks/gitconfig index 6100475..4483050 100644 --- a/symlinks/gitconfig +++ b/symlinks/gitconfig @@ -37,3 +37,5 @@ rebase = false [init] defaultBranch = main +[sendemail] + annotate = yes