update sway config (vpn, notifications, automount)

This commit is contained in:
fschl 2021-11-08 11:33:26 +01:00
parent 8cef869e32
commit 8641139d8e
5 changed files with 68 additions and 30 deletions

View File

@ -116,3 +116,5 @@
- [ ] seperate sources.list setup for server/desktop/laptop - [ ] seperate sources.list setup for server/desktop/laptop
- [ ] Check new bootable USB solution: https://ventoy.net/en/index.html - [ ] Check new bootable USB solution: https://ventoy.net/en/index.html
- [ ] move to ansible for easier modularization of setup - [ ] move to ansible for easier modularization of setup
- [ ] notifications: move from ~mako~ to ~dunst~ when dunst >1.6 is available
on debian

View File

@ -215,6 +215,7 @@ install_workstation_apps() {
fonts-font-awesome \ fonts-font-awesome \
fonts-noto \ fonts-noto \
fonts-noto-cjk \ fonts-noto-cjk \
fonts-powerline \
gimp \ gimp \
keepassxc \ keepassxc \
libnotify-bin \ libnotify-bin \
@ -225,8 +226,11 @@ install_workstation_apps() {
libreoffice-l10n-en-gb \ libreoffice-l10n-en-gb \
libreoffice-writer \ libreoffice-writer \
ntfs-3g \ ntfs-3g \
network-manager \
network-manager-openvpn \
nmap \ nmap \
fonts-powerline \ openvpn \
openvpn-systemd-resolved \
thunderbird \ thunderbird \
thunderbird-l10n-de \ thunderbird-l10n-de \
thunderbird-l10n-en-gb \ thunderbird-l10n-en-gb \
@ -245,16 +249,19 @@ install_sway() {
apt update apt update
apt install -y \ apt install -y \
brightnessctl \ brightnessctl \
dunst \ mako \
sway \ sway \
udiskie \
udisks2 \
wl-clipboard \ wl-clipboard \
wob \ wob \
wofi \ wofi \
ydotool \ ydotool \
--no-install-recommends --no-install-recommends
rm /home/${USERNAME}/.bashrc mv /home/${USERNAME}/.bashrc /home/${USERNAME}/.bashrc~
ln -s /home/${USERNAME}/ ln -s /home/${USERNAME}/
cp ../sway/mako.conf /home/${USERNAME}/.config/mako/conf
} }
@ -274,12 +281,9 @@ install_i3() {
i3lock \ i3lock \
i3lock-fancy \ i3lock-fancy \
i3status \ i3status \
libnotify-bin \
libnotify-dev \
network-manager-gnome \ network-manager-gnome \
network-manager-vpnc \ network-manager-vpnc \
network-manager-vpnc-gnome \ network-manager-vpnc-gnome \
notify-osd \
remmina \ remmina \
rxvt-unicode-256color \ rxvt-unicode-256color \
scrot \ scrot \

View File

@ -228,7 +228,8 @@ bar {
} }
status_command ~/.cargo/bin/i3status-rs ~/dotfiles/sway/status-rust.toml status_command ~/.cargo/bin/i3status-rs ~/dotfiles/sway/status-rust.toml
tray_output $LAPTOP # tray_output $LAPTOP
tray_output primary
output $LAPTOP output $LAPTOP
output $CENTER output $CENTER
@ -249,7 +250,7 @@ bar {
} }
status_command i3status --config ~/dotfiles/.i3/status.conf status_command i3status --config ~/dotfiles/.i3/status.conf
tray_output $LAPTOP tray_output primary
# i3blocks: http://kumarcode.com/Colorful-i3/ # i3blocks: http://kumarcode.com/Colorful-i3/
# status_command i3blocks -c ~/.i3/i3blocks.conf # status_command i3blocks -c ~/.i3/i3blocks.conf
@ -266,16 +267,11 @@ bar {
# } # }
# startup programs # startup programs
# exec amixer set Master 1+ off exec swaymsg 'exec mako -c /home/fschl/dotfiles/sway/mako.conf'
# exec amixer set Master 54 exec swaymsg 'udiskie'
# exec --no-startup-id nm-applet exec swaymsg 'workspace $WS1; exec firefox;'
# exec --no-startup-id xrandr --output LVDS1 --left-of VGA1 --auto exec swaymsg 'workspace $WS2; exec emacs'
# exec --no-startup-id xrandr --output VGA1 --auto exec swaymsg 'workspace $WS4; exec thunderbird'
# #exec --no-startup-id clipit exec swaymsg 'workspace $WS8; exec keepassxc'
# exec --no-startup-id i3-msg 'workspace $WS1; exec firefox;' exec swaymsg 'workspace $WS3; exec alacritty;'
# exec --no-startup-id i3-msg 'workspace $WS2; exec emacs'
# exec --no-startup-id i3-msg 'exec thunderbird'
# exec --no-startup-id i3-msg 'exec keepassxc'
# # exec --no-startup-id i3-msg 'exec nextcloud'
# exec --no-startup-id i3-msg 'workspace $WS3; exec urxvt;'

27
sway/mako.conf Executable file
View File

@ -0,0 +1,27 @@
sort=-time
layer=overlay
background-color=#1e1420
width=380
height=110
border-size=2
border-color=#88c0d0
border-radius=15
icons=0
max-icon-size=64
default-timeout=5000
ignore-timeout=1
font=monospace 14
[urgency=low]
border-color=#cccccc
[urgency=normal]
border-color=#d08770
[urgency=high]
border-color=#bf616a
default-timeout=0
[category=mpd]
default-timeout=2000
group-by=category

View File

@ -1,6 +1,11 @@
theme = "semi-native" [theme]
name = "semi-native"
# theme = "solarized-dark" # theme = "solarized-dark"
icons = "awesome" [theme.overrides]
separator = "<span font='5'>|</span>"
[icons]
name = "awesome"
[[block]] [[block]]
block = "pomodoro" block = "pomodoro"
@ -61,7 +66,9 @@ interval = 5
[[block]] [[block]]
block = "net" block = "net"
device = "wlp3s0" device = "wlp3s0"
format = "{ssid} {signal_strength} {ip} {speed_down;K*b} {graph_down;K*b}" on_click = "alacritty -e nmtui"
format = "{ssid} {signal_strength} {ip} {speed_down;K*b}"
# format = "{ssid} {signal_strength} {ip} {speed_down;K*b} {graph_down;K*b}"
interval = 5 interval = 5
[[block]] [[block]]
@ -77,15 +84,17 @@ show_volume_when_muted = true
[[block]] [[block]]
block = "battery" block = "battery"
driver = "upower" # driver = "upower"
driver = "sysfs"
format = "{percentage} {time}" format = "{percentage} {time}"
allow_missing = true
[[block]] # [[block]]
block = "networkmanager" # block = "networkmanager"
on_click = "alacritty -e nmtui" # on_click = "alacritty -e nmtui"
interface_name_exclude = ["br\\-[0-9a-f]{12}", "docker\\d+"] # interface_name_exclude = ["br\\-[0-9a-f]{12}", "docker\\d+"]
interface_name_include = [] # interface_name_include = []
ap_format = "{ssid^10}" # ap_format = "{ssid^10}"
[[block]] [[block]]