Compare commits

..

No commits in common. "19da43828c46d9833d31bf9889ec7e87e880a25b" and "819e682918cb09983d5752468eaaa1fe844e51ba" have entirely different histories.

5 changed files with 175 additions and 198 deletions

View file

@ -20,29 +20,32 @@ font:
family: 'Fira Code' family: 'Fira Code'
size: 10.5 size: 10.5
# Colors (Gruvbox Material Dark Medium) # Nord color scheme from alacritty wiki
# Colors (Nord)
colors: colors:
primary: # Default colors
background: '0x282828' primary:
foreground: '0xdfbf8e' background: '#2E3440'
foreground: '#D8DEE9'
normal: # Normal colors
black: '0x665c54' normal:
red: '0xea6962' black: '#3B4252'
green: '0xa9b665' red: '#BF616A'
yellow: '0xe78a4e' green: '#A3BE8C'
blue: '0x7daea3' yellow: '#EBCB8B'
magenta: '0xd3869b' blue: '#81A1C1'
cyan: '0x89b482' magenta: '#B48EAD'
white: '0xdfbf8e' cyan: '#88C0D0'
white: '#E5E9F0'
bright:
black: '0x928374'
red: '0xea6962'
green: '0xa9b665'
yellow: '0xe3a84e'
blue: '0x7daea3'
magenta: '0xd3869b'
cyan: '0x89b482'
white: '0xdfbf8e'
# Bright colors
bright:
black: '#4C566A'
red: '#BF616A'
green: '#A3BE8C'
yellow: '#EBCB8B'
blue: '#81A1C1'
magenta: '#B48EAD'
cyan: '#8FBCBB'
white: '#ECEFF4'

View file

@ -27,19 +27,5 @@ function sshscr() {
ssh -t $@ screen -RR -d ssh -t $@ screen -RR -d
} }
# Alternative SSH session for unlocking remote encrypted servers
# This requires a standalone known hosts file
function sshunlock() {
set -o pipefail
pass show "Misc/$2" | wl-copy
if [ $? -ne 0 ]; then
echo "key not found"
return
fi
ssh -o UserKnownHostsFile=~/.ssh/known_hosts_unlock root@$1 -t "zfsunlock"
echo "" | wl-copy
set +o pipefail
}
# Add local to path # Add local to path
export PATH="$PATH:~/.local/bin" export PATH="$PATH:~/.local/bin"

View file

@ -1,12 +1,24 @@
text-color=#282828 sort=-time
background-color=#ebdbb2 layer=overlay
border-color=#282828 background-color=#2e3440dd
default-timeout=8000 width=300
font=JetBrains Mono 10 height=110
border-radius=10 border-size=1
border-color=#88c0d0
border-radius=8
icons=0
max-icon-size=64
default-timeout=5000
ignore-timeout=1
font=monospace 11
[urgency=low]
border-color=#cccccc
[urgency=normal]
border-color=#d08770
[urgency=high] [urgency=high]
border-color=#FF0000 border-color=#bf616a
default-timeout=0 default-timeout=0
border-size=4
layer=overlay

View file

@ -249,16 +249,11 @@ input type:touchpad {
tap enabled tap enabled
} }
default_border pixel 2 client.focused 00000000 00000000 00000000 00000000
smart_gaps on
gaps outer 4
gaps inner 0
client.focused #ebdbb2 #ebdbb2 #ebdbb2 #ebdbb2 #ebdbb2
client.unfocused 00000000 00000000 00000000 00000000
client.focused_inactive 00000000 00000000 00000000 00000000 client.focused_inactive 00000000 00000000 00000000 00000000
client.unfocused 00000000 00000000 00000000 00000000
default_border pixel 8
# This is annoying -- just turn it off # This is annoying -- just turn it off
focus_follows_mouse no focus_follows_mouse no

View file

@ -1,180 +1,161 @@
/*
* Based on <https://github.com/jakehamilton/dotfiles/tree/master/waybar>
*/
* { * {
border: none; border: none;
border-radius: 0; border-radius: 0;
font-family: JetBrains Mono; font-family: Nerd Font Hack;
font-size: 14px; font-size: 14px;
min-height: 0; min-height: 32px;
margin: 0 0px;
} }
window#waybar { window#waybar {
background-color: #3c3836; background: transparent;
border-bottom: none;
color: #ebdbb2;
transition-property: background-color;
transition-duration: 0.5s;
} }
window#waybar.hidden { window#waybar.hidden {
opacity: 0.2; opacity: 0.2;
} }
#workspaces button { #window {
padding: 0 5px; margin-top: 8px;
color: #ebdbb2; padding-left: 16px;
border-radius: 5px; padding-right: 16px;
border-radius: 26px;
transition: none;
color: transparent;
background: transparent;
} }
/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ window#waybar.termite #window,
#workspaces button:hover { window#waybar.Firefox #window,
background: rgba(0, 0, 0, 0.2); window#waybar.Navigator #window,
box-shadow: inherit; window#waybar.PCSX2 #window {
border-bottom: none; color: #4d4d4d;
border-radius: 5px; background: #e6e6e6;
}
#workspaces, #network, #pulseaudio,
#custom-weather, #clock, #tray,
#custom-power {
opacity: 0.8;
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
}
#custom-power {
margin-top: 8px;
margin-left: 12px;
margin-bottom: 8px;
padding-left: 20px;
padding-right: 20px;
border-radius: 26px;
background: #bf616a;
color: rgba(255, 255, 255, 0.9);
}
#workspaces {
margin-top: 8px;
margin-left: 8px;
margin-bottom: 8px;
border-radius: 26px;
background: #2e3440;
transition: none;
}
#workspaces button {
transition: none;
color: #f8f8f2;
background: transparent;
font-size: 16px;
} }
#workspaces button.focused { #workspaces button.focused {
background-color: #ebdbb2; color: #88c0d0;
color: #282828;
border-bottom: none;
border-radius: 5px;
} }
#workspaces button.urgent { #workspaces button:hover {
background-color: #2c303c; color: #d8d8d2;
}
#mode {
background-color: #64727d;
border-bottom: 3px solid #ffffff;
}
#clock,
#battery,
#cpu,
#memory,
#temperature,
#backlight,
#network,
#pulseaudio,
#mode,
#idle_inhibitor,
#custom-weather,
#mpd {
padding: 0 14px;
margin: 0 0px;
color: #ffffff;
}
#clock, #custom-weather {
color: #000000;
background-color: #ebdbb2;
}
#battery {
background-color: #ebdbb2;
color: #000000;
}
#battery.charging {
color: #000000;
background-color: #ebdbb2;
}
@keyframes blink {
to {
background-color: #ebdbb2;
color: #282828;
}
}
#battery.critical:not(.charging) {
background-color: #282828;
color: #282828;
animation-name: blink;
animation-duration: 1s;
animation-timing-function: linear;
animation-iteration-count: infinite;
animation-direction: alternate;
}
label:focus {
background-color: #000000;
}
#cpu {
background-color: #ebdbb2;
color: #000000;
}
#memory {
background-color: #ebdbb2;
color: #000000;
}
#backlight {
background-color: #ebdbb2;
color: #000000;
} }
#network { #network {
background-color: #ebdbb2; margin-top: 8px;
color: #000000; margin-left: 8px;
border-radius: 5px 0px 0px 5px; padding-left: 16px;
} padding-right: 16px;
margin-bottom: 8px;
#network.disconnected { border-radius: 26px;
background-color: #ebdbb2; transition: none;
color: #4d4d4d;
background: #b48ead;
} }
#pulseaudio { #pulseaudio {
background-color: #ebdbb2; margin-top: 8px;
color: #000000; margin-left: 8px;
padding-left: 16px;
padding-right: 16px;
margin-bottom: 8px;
border-radius: 26px;
transition: none;
color: #4d4d4d;
background: #88c0d0;
} }
#pulseaudio.muted { #custom-weather {
background-color: #ebdbb2; margin-top: 8px;
color: #000000; margin-left: 8px;
padding-left: 16px;
padding-right: 16px;
margin-bottom: 8px;
border-radius: 26px;
transition: none;
color: #4d4d4d;
background: #a3be8c;
} }
#custom-media { #clock {
background-color: #ebdbb2; margin-top: 8px;
color: #282828; margin-left: 8px;
min-width: 100px; margin-right: 12px;
padding-left: 16px;
padding-right: 16px;
margin-bottom: 8px;
border-radius: 26px;
transition: none;
color: #f8f8f2;
background: #2e3440;
} }
#custom-media.custom-spotify { #tray {
background-color: #66cc99; margin-top: 8px;
margin-left: 8px;
margin-bottom: 8px;
padding-left: 16px;
padding-right: 16px;
border-radius: 26px;
transition: none;
background: rgba(210, 210, 210, 0.5);
} }
#custom-media.custom-vlc { #taskbar {
background-color: #ffa000; margin-top: 8px;
margin-left: 20px;
margin-right: 20px;
margin-bottom: 8px;
padding-left: 16px;
padding-right: 16px;
border-radius: 26px;
} }
#temperature { #battery {
background-color: #ebdbb2; margin-top: 8px;
color: #282828; margin-left: 8px;
} padding-left: 16px;
padding-right: 16px;
#temperature.critical { margin-bottom: 8px;
background-color: #eb4d4b; border-radius: 26px;
} transition: none;
color: #4d4d4d;
#tray, #custom-power { background: #a3be8c;
background-color: #3c3836;
padding: 0 8px;
}
#idle_inhibitor {
background-color: rgba(0, 0, 0, 0);
color: #ebdbb2;
border-radius: 5px;
margin-right: 2px;
}
#idle_inhibitor.activated {
background-color: #ebdbb2;
color: #282828;
border-radius: 5px;
margin-right: 2px;
} }