From 68ad4339e7a5da9e875c2120ed2240765abf8c34 Mon Sep 17 00:00:00 2001 From: Gregor Feierabend <23300469@sun.ac.za> Date: Tue, 21 Sep 2021 23:17:43 +0200 Subject: [PATCH] update --- .compton.conf | 2 +- .config/awesome/rc.lua | 57 +++++++++++++------------ .config/i3/config | 14 +++--- .config/i3/scripts/decop.sh | 11 ----- .config/i3/scripts/grabscreen.sh | 5 --- .config/i3/scripts/incop.sh | 11 ----- .config/i3/scripts/lock.sh | 9 ---- .config/i3/scripts/screencut.sh | 4 -- .config/i3/scripts/screenrec.sh | 2 - .config/i3/scripts/screenshot.sh | 1 - .local/share/applications/mimeapps.list | 2 + .local/share/applications/vi.desktop | 12 ++++++ .local/share/applications/vifm.desktop | 2 +- 13 files changed, 53 insertions(+), 79 deletions(-) delete mode 100755 .config/i3/scripts/decop.sh delete mode 100755 .config/i3/scripts/grabscreen.sh delete mode 100755 .config/i3/scripts/incop.sh delete mode 100755 .config/i3/scripts/lock.sh delete mode 100755 .config/i3/scripts/screencut.sh delete mode 100755 .config/i3/scripts/screenrec.sh delete mode 100755 .config/i3/scripts/screenshot.sh create mode 100644 .local/share/applications/mimeapps.list create mode 100644 .local/share/applications/vi.desktop diff --git a/.compton.conf b/.compton.conf index fbfbad4..ead1929 100644 --- a/.compton.conf +++ b/.compton.conf @@ -1,4 +1,4 @@ -shadow-opacity = 0.9; +shadow-opacity = 0.8; shadow = true; shadow-radius = 0; diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 67a37ae..d3a3fff 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -344,42 +344,53 @@ globalkeys = gears.table.join( -- TODO: change /home/x to ~ awful.key({ modkey, "Shift" }, "x", - function () awful.spawn({"/home/x/.config/i3/scripts/lock.sh"}) end, + function () awful.spawn({"/home/x/.scripts/lock.sh"}) end, {description = "lock screen", group = "user"}), awful.key({ modkey, "Shift" }, "p", function () awful.spawn({"pqiv", "-c", "-c", "-i", "/home/x/ANNOTATIONS"}) end, {description = "lock screen", group = "user"}), awful.key({ modkey, "Shift" }, "o", - function () awful.spawn({"/home/x/.config/i3/scripts/screenshot.sh"}) end, + function () awful.spawn({"/home/x/.scripts/screenshot.sh"}) end, {description = "lock screen", group = "user"}), awful.key({ modkey, "Shift" }, "g", - function () awful.spawn({"/home/x/.config/i3/scripts/grabscreen.sh"}) end, + function () awful.spawn({"/home/x/.scripts/grabscreen.sh"}) end, {description = "lock screen", group = "user"}), awful.key({ modkey, "Shift" }, "r", - function () awful.spawn({"/home/x/.config/i3/scripts/screenrec.sh"}) end, + function () awful.spawn({"/home/x/.scripts/screenrec.sh"}) end, {description = "lock screen", group = "user"}), awful.key({ modkey, "Shift" }, "w", function () awful.spawn({"/usr/bin/killall", "ffmpeg"}) end, {description = "lock screen", group = "user"}), awful.key({ modkey, "Shift" }, "b", - function () awful.spawn({"/home/x/.config/i3/scripts/screencut.sh"}) end, + function () awful.spawn({"/home/x/.scripts/screencut.sh"}) end, {description = "lock screen", group = "user"}), - awful.key({ modkey, "Control" }, "t", - function () awful.spawn({"/home/x/.config/i3/scripts/incop.sh"}) end, + awful.key({ modkey, "Shift" }, "t", + function () awful.spawn({"/home/x/.scripts/incop.sh"}) end, {description = "lock screen", group = "user"}), awful.key({ modkey, "Control", "Shift" }, "t", - function () awful.spawn({"/home/x/.config/i3/scripts/decop.sh"}) end, + function () awful.spawn({"/home/x/.scripts/decop.sh"}) end, {description = "lock screen", group = "user"}), awful.key({ modkey, "Control" }, "n", function () - local c = awful.client.restore() - -- Focus restored client - if c then - c:emit_signal( - "request::activate", "key.unminimize", {raise = true} - ) - end + -- local c = awful.client.restore() + -- -- Focus restored client + -- if c then + -- c:emit_signal( + -- "request::activate", "key.unminimize", {raise = true} + -- ) + -- end + + local t = awful.screen.focused().selected_tag + local clients = t:clients() + for i = 1, table.maxn(clients), 1 do + if clients[i].minimized and clients[i].class ~= "URxvt" then + clients[i]:emit_signal( + "request::activate", "key.unminimize", {raise = true} + ) + break + end + end end, {description = "restore minimized", group = "client"}), @@ -593,14 +604,14 @@ awful.rules.rules = { }, -- Set Firefox to always map on the tag named "2" on screen 1. - { rule = { class = "Firefox" }, - properties = { screen = 1, tag = "7" } }, { rule = { class = "Telegram" }, properties = { screen = 1, tag = "9" } }, { rule = { class = "wbar" }, properties = {border_width = 0} }, { rule = { class = "URxvt" }, - properties = {maximized_horizontal = true, floating = false, ontop = true} }, + properties = {maximized_horizontal = true, floating = false, ontop = true} }, + { rule = { class = "Pqiv" }, + properties = {border_width = 0, floating = true, ontop = true} }, } -- }}} @@ -672,21 +683,13 @@ client.connect_signal("focus", c.border_color = beautiful.border_focus -- keep focus on URxvt, if it's ontop - if c.class ~= "URxvt" then + if c.class ~= "URxvt" and c.class ~= "Pqiv"then local t = awful.screen.focused().selected_tag local clients = t:clients() for i = 1, table.maxn(clients), 1 do if not clients[i].minimized and clients[i].ontop and clients[i].class == "URxvt" then clients[i]:raise() clients[i]:emit_signal("request::activate") - - -- naughty.notify({ title = "Focusing on:" - -- , text = clients[i].name - -- , bg="#ff0000" - -- , fg="#000000" - -- , timeout = 15 - -- , position = "top_right" - -- }) end end end diff --git a/.config/i3/config b/.config/i3/config index 5724daa..652f70b 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -202,18 +202,18 @@ focus_follows_mouse no # some personal keybindings bindsym $mod+m floating enable; resize set 1400 850; move absolute position center; move scratchpad bindsym $mod+n scratchpad show -bindsym $mod+Shift+x exec ~/.config/i3/scripts/lock.sh +bindsym $mod+Shift+x exec ~/.scripts/lock.sh bindsym $mod+z [class="qpdfview"] scratchpad show bindsym $mod+u [class="URxvt"] scratchpad show bindsym $mod+c [title="Android Emulator*"] scratchpad show -bindsym $mod+t exec zsh ~/.config/i3/scripts/incop.sh -bindsym $mod+Shift+t exec zsh ~/.config/i3/scripts/decop.sh -bindsym $mod+o exec zsh ~/.config/i3/scripts/screenshot.sh +bindsym $mod+t exec zsh ~/.scripts/incop.sh +bindsym $mod+Shift+t exec zsh ~/.scripts/decop.sh +bindsym $mod+o exec zsh ~/.scripts/screenshot.sh bindsym $mod+x move absolute position center bindsym $mod+p exec pqiv -c -c -i ~/ANNOTATIONS -bindsym $mod+b exec zsh ~/.config/i3/scripts/screencut.sh -bindsym $mod+Ctrl+g exec zsh ~/.config/i3/scripts/grabscreen.sh -bindsym $mod+Ctrl+r exec zsh ~/.config/i3/scripts/screenrec.sh +bindsym $mod+b exec zsh ~/.scripts/screencut.sh +bindsym $mod+Ctrl+g exec zsh ~/.scripts/grabscreen.sh +bindsym $mod+Ctrl+r exec zsh ~/.scripts/screenrec.sh bindsym $mod+Ctrl+q exec killall ffmpeg bindsym $mod+Shift+f exec firefox -P Work -no-remote diff --git a/.config/i3/scripts/decop.sh b/.config/i3/scripts/decop.sh deleted file mode 100755 index 240f80c..0000000 --- a/.config/i3/scripts/decop.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/zsh -if [ -e /tmp/compton.lock ] -then - echo locked -else - touch /tmp/compton.lock - awk -F= '{if($1 == "shadow-opacity " && $2+0.0 < 1) {$2=$2+0.1;$2 = $2 ";";}}1' OFS="= " ~/.compton.conf > /tmp/compton.conf - cat /tmp/compton.conf > ~/.compton.conf - kill -SIGUSR1 `pidof compton` - rm /tmp/compton.lock -fi diff --git a/.config/i3/scripts/grabscreen.sh b/.config/i3/scripts/grabscreen.sh deleted file mode 100755 index 75f8e45..0000000 --- a/.config/i3/scripts/grabscreen.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/zsh -#sudo rmmod v4l2loopback -#sudo modprobe v4l2loopback video_nr=1,2 - -ffmpeg -f x11grab -show_region 1 -framerate 25 $(slop -f '-video_size %wx%h -i +%x,%y') -draw_mouse 1 -f v4l2 /dev/video2 diff --git a/.config/i3/scripts/incop.sh b/.config/i3/scripts/incop.sh deleted file mode 100755 index 42ac343..0000000 --- a/.config/i3/scripts/incop.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/zsh -if [ -e /tmp/compton.lock ] -then - echo locked -else - touch /tmp/compton.lock - awk -F= '{if($1 == "shadow-opacity " && $2+0.0 > 0) {$2=$2-0.1;$2 = $2 ";";}}1' OFS="= " ~/.compton.conf > /tmp/compton.conf - cat /tmp/compton.conf > ~/.compton.conf - kill -SIGUSR1 `pidof compton` - rm /tmp/compton.lock -fi diff --git a/.config/i3/scripts/lock.sh b/.config/i3/scripts/lock.sh deleted file mode 100755 index 3c652aa..0000000 --- a/.config/i3/scripts/lock.sh +++ /dev/null @@ -1,9 +0,0 @@ -if `dunstctl is-paused`; then - #i3lock -n -c 222222 - i3lock -n -i ~/.config/i3/locked.png -else - dunstctl set-paused true - i3lock -n -i ~/.config/i3/locked.png - dunstctl set-paused false -fi - diff --git a/.config/i3/scripts/screencut.sh b/.config/i3/scripts/screencut.sh deleted file mode 100755 index abbe681..0000000 --- a/.config/i3/scripts/screencut.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -maim -u -g `slop -b 3 -c 1,0,0` | convert - -alpha off ~/CUTS/`date +%s`.jpg -#adb root -#adb push ~/CUTS /storage/emulated/0/Download/ diff --git a/.config/i3/scripts/screenrec.sh b/.config/i3/scripts/screenrec.sh deleted file mode 100755 index fb883eb..0000000 --- a/.config/i3/scripts/screenrec.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -ffmpeg -y -threads 4 -i /dev/video2 -vcodec mpeg4 -b:v 800k MP4/`date +%s`.mp4 diff --git a/.config/i3/scripts/screenshot.sh b/.config/i3/scripts/screenshot.sh deleted file mode 100755 index 7981afc..0000000 --- a/.config/i3/scripts/screenshot.sh +++ /dev/null @@ -1 +0,0 @@ -maim -u -m 10 -f png ~/PNG/`date +%s`.png diff --git a/.local/share/applications/mimeapps.list b/.local/share/applications/mimeapps.list new file mode 100644 index 0000000..bf14f67 --- /dev/null +++ b/.local/share/applications/mimeapps.list @@ -0,0 +1,2 @@ +[Default Applications] +text/plain=vi.desktop diff --git a/.local/share/applications/vi.desktop b/.local/share/applications/vi.desktop new file mode 100644 index 0000000..a2ecb66 --- /dev/null +++ b/.local/share/applications/vi.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Categories=System;ConsoleOnly; +Comment=Vi[m] +Exec=spawn_urxvt_tmux.sh cd; vi "%F" +GenericName=Editor +Icon=vim +Name=Vim +Terminal=false +TryExec=vi +Type=Application +Keywords=File; +MimeType=text/plain; diff --git a/.local/share/applications/vifm.desktop b/.local/share/applications/vifm.desktop index d89d634..5670605 100644 --- a/.local/share/applications/vifm.desktop +++ b/.local/share/applications/vifm.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Categories=System;FileTools;FileManager;Utility;ConsoleOnly; Comment=Vi[m] like ncurses based file manager -Exec=spawn_urxvt_tmux.sh vifm %F +Exec=spawn_urxvt_tmux.sh vifm "%F" GenericName=File Manager Icon=vifm Name=Vifm