From dd163e04e48f80bc959a4aeac43154ae2bd9e0b3 Mon Sep 17 00:00:00 2001 From: John Mertz Date: Thu, 21 Jul 2022 17:18:15 -0400 Subject: [PATCH 1/7] Not quite pure black and white --- .gitignore | 1 + Xdefaults | 6 +++--- sway/colorscheme | 2 +- vim/colors/gruvbox-oled.vim | 2 +- waybar/gruvbox-oled.css | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 0b62b1196..cb105fe43 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ nvim/autoload nvim/plugins nvim/shada nvim/swap +waybar/config diff --git a/Xdefaults b/Xdefaults index f978f1654..627514076 100644 --- a/Xdefaults +++ b/Xdefaults @@ -12,7 +12,7 @@ XTerm*saveLines: 50000 ! soft XTerm*background: #32302f ! medium XTerm*background: #282828 ! hard -XTerm*background: #000000 +XTerm*background: #010101 XTerm*foreground: #ebdbb2 XTerm*color0: #282828 XTerm*color1: #cc241d @@ -44,7 +44,7 @@ UXTerm*saveLines: 50000 ! soft UXTerm*background: #32302f ! medium UXTerm*background: #282828 ! hard -UXTerm*background: #000000 +UXTerm*background: #010101 UXTerm*foreground: #ebdbb2 UXTerm*color0: #282828 UXTerm*color1: #cc241d @@ -74,7 +74,7 @@ URxvt.saveLines: 50000 ! soft URxvt.background: #32302f ! medium URxvt.background: #282828 ! hard -URxvt.background: #000000 +URxvt.background: #010101 URxvt.foreground: #ebdbb2 URxvt.color0: #282828 URxvt.color1: #cc241d diff --git a/sway/colorscheme b/sway/colorscheme index 333255721..121615445 100644 --- a/sway/colorscheme +++ b/sway/colorscheme @@ -1,4 +1,4 @@ -set $base0D #000000 +set $base0D #010101 set $base00 #ebdbb2 set $base01 #282828 set $base02 #cc241d diff --git a/vim/colors/gruvbox-oled.vim b/vim/colors/gruvbox-oled.vim index 5feb584d8..0467c65a9 100644 --- a/vim/colors/gruvbox-oled.vim +++ b/vim/colors/gruvbox-oled.vim @@ -87,7 +87,7 @@ let s:is_dark=(&background == 'dark') let s:gb = {} " fill it with absolute colors -let s:gb.dark0_hard = ['#000000', 234] " 29-32-33 +let s:gb.dark0_hard = ['#010101', 234] " 29-32-33 let s:gb.dark0 = ['#282828', 235] " 40-40-40 let s:gb.dark0_soft = ['#32302f', 236] " 50-48-47 let s:gb.dark1 = ['#3c3836', 237] " 60-56-54 diff --git a/waybar/gruvbox-oled.css b/waybar/gruvbox-oled.css index fdd52579b..f9eec9dd4 100644 --- a/waybar/gruvbox-oled.css +++ b/waybar/gruvbox-oled.css @@ -1,8 +1,8 @@ /* * Pure Black spin of Gruvbox */ -@define-color black #000000; -@define-color white #FFFFFF; +@define-color black #010101; +@define-color white #FEFEFE; @define-color fg #EBDBB2; @define-color fghi #FBF1C7; @define-color bg #282828; From 7a17ca17a19fa328e1f866a84f4c468d3d5aff0b Mon Sep 17 00:00:00 2001 From: John Mertz Date: Thu, 21 Jul 2022 20:01:28 -0400 Subject: [PATCH 2/7] Revert swayidle behaviour --- sway/autostart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sway/autostart b/sway/autostart index 65545f12c..d092e9c1a 100644 --- a/sway/autostart +++ b/sway/autostart @@ -5,8 +5,8 @@ ################################################################################ # Custom SwayIdle script -#exec swayidle -w timeout 500 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' & -exec ${HOME}/scripts/sway/idle.sh start & +exec swayidle -w timeout 500 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' & +#exec ${HOME}/scripts/sway/idle.sh start & # SSH Add - Should be started by profile instead # exec eval `ssh-agent -a ${SSH_AUTH_SOCK}` From 6d11d02286900864836f4a51d446f600c2454cbb Mon Sep 17 00:00:00 2001 From: John Mertz Date: Mon, 5 Sep 2022 13:50:54 -0400 Subject: [PATCH 3/7] Merge branch 'master' of ssh://git@git.john.me.tz:223/jpm/.dotfiles.git --- sway/config | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sway/config b/sway/config index 7b4211dfe..81cc84f91 100755 --- a/sway/config +++ b/sway/config @@ -23,11 +23,11 @@ input 1133:49291:Logitech_G502_HERO_SE pointer_accel -0.966 # When using a 2-button mouse, simulate button 3 with simultaneous press input * middle_emulation enable -# Hide cursor after 1 second -seat seat0 hide_cursor 1000 +# Hide cursor after 5 seconds +seat seat0 hide_cursor 5000 # Disable mouse as trigger to wake from idle -seat * idle_wake keyboard switch +#seat * idle_wake keyboard switch ################################################################################ # Appearance @@ -111,5 +111,6 @@ exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CU exec dbus-update-activation-environment 2>/dev/null && \ dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP exec systemctl --user start xdg-desktop-portal-wlr.service +exec systemctl --user start wallpapers.service include $HOME/.dotfiles/sway/autostart From 21c434283a00672cb90dccb02d851b8846aec7dc Mon Sep 17 00:00:00 2001 From: John Mertz Date: Mon, 5 Sep 2022 14:54:36 -0400 Subject: [PATCH 4/7] Add sway-displays.json Config file which will be used by new revision of displays.pl --- sway/sway-displays.json | 92 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 sway/sway-displays.json diff --git a/sway/sway-displays.json b/sway/sway-displays.json new file mode 100644 index 000000000..24017fb3a --- /dev/null +++ b/sway/sway-displays.json @@ -0,0 +1,92 @@ +[ +"outputs":{ + "DENON-AVAMP":"TV", + "Paperlike253":"eInk", + "0x4140":"yoga" +}, +"layouts":{ + "TV":{ + "TV":{ + "enable":1, + "width":3840, + "height":2160, + "x":0, + "y":0, + "rotate":0, + "scale":1.333333, + "waybar":".dotfiles/waybar/main.template", + "fallback":"#010101" + }, + "eInk":{ + "enable":0 + }, + "laptop":{ + "enable":0 + } + }, + "eInk":{ + "TV":{ + "enable":0 + }, + "eInk":{ + "enable":1, + "width":3200, + "height":1800, + "x":0, + "y":0, + "scale":1.5, + "rotate":90, + "waybar":".dotfiles/waybar/main.template", + "fallback":"#010101" + }, + "laptop":{ + "enable":0 + } + }, + "laptop":{ + "TV":{ + "enable":0 + }, + "eInk":{ + "enable":0 + }, + "yoga":{ + "enable":1, + "width":2560, + "height":1440, + "x":0, + "y":0, + "rotate":0, + "scale":1.333333, + "waybar":".dotfiles/waybar/main.template", + "fallback":"#010101" + }, + "Both":{ + "TV":{ + "enable":1, + "width":3840, + "height":2160, + "x":900, + "y":10, + "rotate":0, + "scale":1.333333, + "waybar":".dotfiles/waybar/main.template", + "fallback":"#010101" + }, + "eInk":{ + "enable":1, + "width":3200, + "height":1800, + "x":0, + "y":0, + "scale":2, + "rotate":90, + "waybar":".dotfiles/waybar/side.template", + "fallback":"#010101" + }, + "laptop":{ + "enable":0 + } + } +} +] From df3d0e936c0c27becbe91b2b2142f58f0de2838f Mon Sep 17 00:00:00 2001 From: John Mertz Date: Mon, 5 Sep 2022 14:55:36 -0400 Subject: [PATCH 5/7] Update bash_aliases and bash_logout --- bash/bash_aliases | 3 ++ bash/bash_logout | 7 +++- sway/sway-displays.json | 92 ----------------------------------------- 3 files changed, 8 insertions(+), 94 deletions(-) delete mode 100644 sway/sway-displays.json diff --git a/bash/bash_aliases b/bash/bash_aliases index d6b4fc0cc..e45905a8f 100644 --- a/bash/bash_aliases +++ b/bash/bash_aliases @@ -41,3 +41,6 @@ alias python="python3" # Backlight control alias blc="${HOME}/scripts/thinkpad/blc.pl --notify" + +# Flatpaks +alias mpv="flatpak run io.mpv.Mpv" diff --git a/bash/bash_logout b/bash/bash_logout index 2c17d6540..0436eeb60 100644 --- a/bash/bash_logout +++ b/bash/bash_logout @@ -1,7 +1,10 @@ # vim: ft=sh -# Remove static SSH Agent -rm SSH_AUTH_SOCK +if [ $SSH_TTY ]; then + # Remove socket files + rm SSH_AUTH_SOCK + rm SWAYSOCK +fi # when leaving the console clear the screen to increase privacy if [ "$SHLVL" = 1 ]; then diff --git a/sway/sway-displays.json b/sway/sway-displays.json deleted file mode 100644 index 24017fb3a..000000000 --- a/sway/sway-displays.json +++ /dev/null @@ -1,92 +0,0 @@ -[ -"outputs":{ - "DENON-AVAMP":"TV", - "Paperlike253":"eInk", - "0x4140":"yoga" -}, -"layouts":{ - "TV":{ - "TV":{ - "enable":1, - "width":3840, - "height":2160, - "x":0, - "y":0, - "rotate":0, - "scale":1.333333, - "waybar":".dotfiles/waybar/main.template", - "fallback":"#010101" - }, - "eInk":{ - "enable":0 - }, - "laptop":{ - "enable":0 - } - }, - "eInk":{ - "TV":{ - "enable":0 - }, - "eInk":{ - "enable":1, - "width":3200, - "height":1800, - "x":0, - "y":0, - "scale":1.5, - "rotate":90, - "waybar":".dotfiles/waybar/main.template", - "fallback":"#010101" - }, - "laptop":{ - "enable":0 - } - }, - "laptop":{ - "TV":{ - "enable":0 - }, - "eInk":{ - "enable":0 - }, - "yoga":{ - "enable":1, - "width":2560, - "height":1440, - "x":0, - "y":0, - "rotate":0, - "scale":1.333333, - "waybar":".dotfiles/waybar/main.template", - "fallback":"#010101" - }, - "Both":{ - "TV":{ - "enable":1, - "width":3840, - "height":2160, - "x":900, - "y":10, - "rotate":0, - "scale":1.333333, - "waybar":".dotfiles/waybar/main.template", - "fallback":"#010101" - }, - "eInk":{ - "enable":1, - "width":3200, - "height":1800, - "x":0, - "y":0, - "scale":2, - "rotate":90, - "waybar":".dotfiles/waybar/side.template", - "fallback":"#010101" - }, - "laptop":{ - "enable":0 - } - } -} -] From c91cae5cd6637f5a7df20f6262843fb3ae4efa2d Mon Sep 17 00:00:00 2001 From: John Mertz Date: Mon, 5 Sep 2022 14:56:28 -0400 Subject: [PATCH 6/7] TODO for Distrobox --- sway/bindings | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sway/bindings b/sway/bindings index 86e46bd95..e427dec6e 100644 --- a/sway/bindings +++ b/sway/bindings @@ -1,5 +1,13 @@ # vim: ft=sh +# TODO: get started with Distrobox. Once I have apps in a distro toolbox they can be added to the launcher with: +# distrobox-export --app +# Attempt to remove as many rpm-ostree layers as possible and replace them with containerized versions. +# Also change terminal bindings to launch in a distro toolbox with the primary binding and the host in a secondary: +# - Research terminals that supprot "profiles" +# - Create "profiles" for each box that are visually distinct from the host +# - Set an auto-run command to: distrobox-enter --name + ### Keybindings ## Vim-style navigation and movement From cf744da959a16d74a98e945fb472d24fc7879bd2 Mon Sep 17 00:00:00 2001 From: John Mertz Date: Mon, 5 Sep 2022 15:01:04 -0400 Subject: [PATCH 7/7] Add sway-displays.json again? Was done in 21c4342, but it's still listed as new... --- sway/sway-displays.json | 92 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 sway/sway-displays.json diff --git a/sway/sway-displays.json b/sway/sway-displays.json new file mode 100644 index 000000000..24017fb3a --- /dev/null +++ b/sway/sway-displays.json @@ -0,0 +1,92 @@ +[ +"outputs":{ + "DENON-AVAMP":"TV", + "Paperlike253":"eInk", + "0x4140":"yoga" +}, +"layouts":{ + "TV":{ + "TV":{ + "enable":1, + "width":3840, + "height":2160, + "x":0, + "y":0, + "rotate":0, + "scale":1.333333, + "waybar":".dotfiles/waybar/main.template", + "fallback":"#010101" + }, + "eInk":{ + "enable":0 + }, + "laptop":{ + "enable":0 + } + }, + "eInk":{ + "TV":{ + "enable":0 + }, + "eInk":{ + "enable":1, + "width":3200, + "height":1800, + "x":0, + "y":0, + "scale":1.5, + "rotate":90, + "waybar":".dotfiles/waybar/main.template", + "fallback":"#010101" + }, + "laptop":{ + "enable":0 + } + }, + "laptop":{ + "TV":{ + "enable":0 + }, + "eInk":{ + "enable":0 + }, + "yoga":{ + "enable":1, + "width":2560, + "height":1440, + "x":0, + "y":0, + "rotate":0, + "scale":1.333333, + "waybar":".dotfiles/waybar/main.template", + "fallback":"#010101" + }, + "Both":{ + "TV":{ + "enable":1, + "width":3840, + "height":2160, + "x":900, + "y":10, + "rotate":0, + "scale":1.333333, + "waybar":".dotfiles/waybar/main.template", + "fallback":"#010101" + }, + "eInk":{ + "enable":1, + "width":3200, + "height":1800, + "x":0, + "y":0, + "scale":2, + "rotate":90, + "waybar":".dotfiles/waybar/side.template", + "fallback":"#010101" + }, + "laptop":{ + "enable":0 + } + } +} +]