Merge branch 'master' into single_waybar

This commit is contained in:
John Mertz 2022-09-17 00:02:36 +00:00
commit 22dc263873
10 changed files with 121 additions and 14 deletions

View File

@ -12,7 +12,7 @@ XTerm*saveLines: 50000
! soft XTerm*background: #32302f ! soft XTerm*background: #32302f
! medium XTerm*background: #282828 ! medium XTerm*background: #282828
! hard ! hard
XTerm*background: #000000 XTerm*background: #010101
XTerm*foreground: #ebdbb2 XTerm*foreground: #ebdbb2
XTerm*color0: #282828 XTerm*color0: #282828
XTerm*color1: #cc241d XTerm*color1: #cc241d
@ -44,7 +44,7 @@ UXTerm*saveLines: 50000
! soft UXTerm*background: #32302f ! soft UXTerm*background: #32302f
! medium UXTerm*background: #282828 ! medium UXTerm*background: #282828
! hard ! hard
UXTerm*background: #000000 UXTerm*background: #010101
UXTerm*foreground: #ebdbb2 UXTerm*foreground: #ebdbb2
UXTerm*color0: #282828 UXTerm*color0: #282828
UXTerm*color1: #cc241d UXTerm*color1: #cc241d
@ -74,7 +74,7 @@ URxvt.saveLines: 50000
! soft URxvt.background: #32302f ! soft URxvt.background: #32302f
! medium URxvt.background: #282828 ! medium URxvt.background: #282828
! hard ! hard
URxvt.background: #000000 URxvt.background: #010101
URxvt.foreground: #ebdbb2 URxvt.foreground: #ebdbb2
URxvt.color0: #282828 URxvt.color0: #282828
URxvt.color1: #cc241d URxvt.color1: #cc241d

View File

@ -41,3 +41,6 @@ alias python="python3"
# Backlight control # Backlight control
alias blc="${HOME}/scripts/thinkpad/blc.pl --notify" alias blc="${HOME}/scripts/thinkpad/blc.pl --notify"
# Flatpaks
alias mpv="flatpak run io.mpv.Mpv"

View File

@ -1,7 +1,10 @@
# vim: ft=sh # vim: ft=sh
# Remove static SSH Agent if [ $SSH_TTY ]; then
rm SSH_AUTH_SOCK # Remove socket files
rm SSH_AUTH_SOCK
rm SWAYSOCK
fi
# when leaving the console clear the screen to increase privacy # when leaving the console clear the screen to increase privacy
if [ "$SHLVL" = 1 ]; then if [ "$SHLVL" = 1 ]; then

View File

@ -5,8 +5,8 @@
################################################################################ ################################################################################
# Custom SwayIdle script # Custom SwayIdle script
#exec swayidle -w timeout 500 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' & exec swayidle -w timeout 500 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' &
exec ${HOME}/scripts/sway/idle.sh start & #exec ${HOME}/scripts/sway/idle.sh start &
# SSH Add - Should be started by profile instead # SSH Add - Should be started by profile instead
# exec eval `ssh-agent -a ${SSH_AUTH_SOCK}` # exec eval `ssh-agent -a ${SSH_AUTH_SOCK}`

View File

@ -1,5 +1,13 @@
# vim: ft=sh # 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 <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 <distro>
### Keybindings ### Keybindings
## Vim-style navigation and movement ## Vim-style navigation and movement

View File

@ -1,4 +1,4 @@
set $base0D #000000 set $base0D #010101
set $base00 #ebdbb2 set $base00 #ebdbb2
set $base01 #282828 set $base01 #282828
set $base02 #cc241d set $base02 #cc241d

View File

@ -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 # When using a 2-button mouse, simulate button 3 with simultaneous press
input * middle_emulation enable input * middle_emulation enable
# Hide cursor after 1 second # Hide cursor after 5 seconds
seat seat0 hide_cursor 1000 seat seat0 hide_cursor 5000
# Disable mouse as trigger to wake from idle # Disable mouse as trigger to wake from idle
seat * idle_wake keyboard switch #seat * idle_wake keyboard switch
################################################################################ ################################################################################
# Appearance # Appearance
@ -111,5 +111,6 @@ exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CU
exec dbus-update-activation-environment 2>/dev/null && \ exec dbus-update-activation-environment 2>/dev/null && \
dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP 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 xdg-desktop-portal-wlr.service
exec systemctl --user start wallpapers.service
include $HOME/.dotfiles/sway/autostart include $HOME/.dotfiles/sway/autostart

92
sway/sway-displays.json Normal file
View File

@ -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
}
}
}
]

View File

@ -87,7 +87,7 @@ let s:is_dark=(&background == 'dark')
let s:gb = {} let s:gb = {}
" fill it with absolute colors " 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 = ['#282828', 235] " 40-40-40
let s:gb.dark0_soft = ['#32302f', 236] " 50-48-47 let s:gb.dark0_soft = ['#32302f', 236] " 50-48-47
let s:gb.dark1 = ['#3c3836', 237] " 60-56-54 let s:gb.dark1 = ['#3c3836', 237] " 60-56-54

View File

@ -1,8 +1,8 @@
/* /*
* Pure Black spin of Gruvbox * Pure Black spin of Gruvbox
*/ */
@define-color black #000000; @define-color black #010101;
@define-color white #FFFFFF; @define-color white #FEFEFE;
@define-color fg #EBDBB2; @define-color fg #EBDBB2;
@define-color fghi #FBF1C7; @define-color fghi #FBF1C7;
@define-color bg #282828; @define-color bg #282828;