diff --git a/files/.config/fontconfig/fonts.conf b/files/.config/fontconfig/fonts.conf
index 11d1a6a..4b8d865 100644
--- a/files/.config/fontconfig/fonts.conf
+++ b/files/.config/fontconfig/fonts.conf
@@ -13,7 +13,7 @@
sans-serif
- Noto Sans
+ Roboto
@@ -21,7 +21,7 @@
serif
- Noto Serif
+ Roboto Slab
@@ -29,9 +29,9 @@
monospace
- Hack Nerd Font
- Hack
- Noto Sans Mono
+
+ Hack
+ Roboto Mono
@@ -77,4 +77,13 @@
IPAGothic
+
+
+
+ waybar
+
+ Hack
+ Font Awesome 5 Pro
+
+
diff --git a/files/.config/i3status/config b/files/.config/i3status/config
deleted file mode 100644
index 234d5a1..0000000
--- a/files/.config/i3status/config
+++ /dev/null
@@ -1,90 +0,0 @@
-# i3status configuration file.
-# see "man i3status" for documentation.
-
-# It is important that this file is edited as UTF-8.
-# The following line should contain a sharp s:
-# ß
-# If the above line is not correctly displayed, fix your editor first!
-
-general {
- colors = true
- color_good = "#B7BBB7"
- color_degraded = "#E2995C"
- color_bad = "#B04C50"
-
- output_format = "i3bar"
- interval = 5
-}
-
-order += "tztime local"
-order += "wireless _first_"
-order += "ethernet _first_"
-order += "cpu_usage"
-order += "memory"
-order += "battery all"
-order += "volume master"
-order += "path_exists vpn"
-order += "path_exists empty"
-
-tztime local {
- format = " %Y-%m-%d %H:%M"
-}
-
-wireless _first_ {
- format_up = "直 <%essid> %ip"
- format_down = "睊"
- color_bad = "#4B5056"
-}
-
-ethernet _first_ {
- # if you use %speed, i3status requires root privileges
- format_up = " %ip"
- format_down = ""
- color_bad = "#4B5056"
-}
-
-cpu_usage {
- format = " %usage"
- degraded_threshold = 90
- max_threshold = 98
-}
-
-memory {
- format = " %percentage_used"
- memory_used_method = "memavailable"
- threshold_degraded = "20%"
- threshold_degraded = "5%"
-}
-
-battery all {
- format = "%status %percentage"
- format_down = ""
- status_chr = ""
- status_bat = ""
- status_unk = ""
- status_full = "ﮣ"
- integer_battery_capacity = true
- last_full_capacity = true
- hide_seconds = true
-
- threshold_type = "percentage"
- low_threshold = 15
-}
-
-volume master {
- device = "pulse"
- format = "墳 %volume"
- format_muted = "婢"
- color_degraded = "#4B5056"
-}
-
-path_exists vpn {
- format = ""
- format_down = ""
- path = "/proc/sys/net/ipv4/conf/tun0"
-}
-
-path_exists empty {
- format = ""
- path = "/"
-}
diff --git a/files/.config/mako/config b/files/.config/mako/config
index 14b8149..a815565 100644
--- a/files/.config/mako/config
+++ b/files/.config/mako/config
@@ -1,8 +1,13 @@
-background-color=#383838
-border-color=#c7c7c7
-border-radius=4
+anchor=bottom-right
+background-color=#3c3836
+text-color=#ebdbb2
+border-color=#ebdbb2
+border-radius=1
padding=10
margin=5
max-icon-size=32
-default-timeout=30000
+default-timeout=36000
+
+on-button-left=invoke-default-action
+on-button-right=dismiss
diff --git a/files/.config/pulse/daemon.conf b/files/.config/pulse/daemon.conf
deleted file mode 100644
index d1588cb..0000000
--- a/files/.config/pulse/daemon.conf
+++ /dev/null
@@ -1,89 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, see .
-
-## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
-## more information. Default values are commented out. Use either ; or # for
-## commenting.
-
-; daemonize = no
-; fail = yes
-; allow-module-loading = yes
-; allow-exit = yes
-; use-pid-file = yes
-; system-instance = no
-; local-server-type = user
-; enable-shm = yes
-; enable-memfd = yes
-; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
-; lock-memory = no
-; cpu-limit = no
-
-high-priority = yes
-nice-level = -11
-
-; realtime-scheduling = yes
-; realtime-priority = 5
-
-; exit-idle-time = 20
-; scache-idle-time = 20
-
-; dl-search-path = (depends on architecture)
-
-; load-default-script-file = yes
-; default-script-file = /etc/pulse/default.pa
-
-; log-target = auto
-; log-level = notice
-; log-meta = no
-; log-time = no
-; log-backtrace = 0
-
-resample-method = speex-float-3
-avoid-resampling = yes
-; enable-remixing = yes
-; remixing-use-all-sink-channels = yes
-; enable-lfe-remixing = no
-; lfe-crossover-freq = 0
-
-flat-volumes = no
-
-; rlimit-fsize = -1
-; rlimit-data = -1
-; rlimit-stack = -1
-; rlimit-core = -1
-; rlimit-as = -1
-; rlimit-rss = -1
-; rlimit-nproc = -1
-; rlimit-nofile = 256
-; rlimit-memlock = -1
-; rlimit-locks = -1
-; rlimit-sigpending = -1
-; rlimit-msgqueue = -1
-; rlimit-nice = 31
-; rlimit-rtprio = 9
-; rlimit-rttime = 200000
-
-default-sample-format = s32le
-default-sample-rate = 48000
-alternate-sample-rate = 44100
-; default-sample-channels = 2
-; default-channel-map = front-left,front-right
-
-; default-fragments = 4
-; default-fragment-size-msec = 25
-
-; enable-deferred-volume = yes
-; deferred-volume-safety-margin-usec = 8000
-; deferred-volume-extra-delay-usec = 0
diff --git a/files/.config/pulse/default.pa b/files/.config/pulse/default.pa
deleted file mode 100644
index e3acfac..0000000
--- a/files/.config/pulse/default.pa
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/usr/bin/pulseaudio -nF
-#
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, see .
-
-# This startup script is used only if PulseAudio is started per-user
-# (i.e. not in system mode)
-
-.fail
-
-### Automatically restore the volume of streams and devices
-load-module module-device-restore
-load-module module-stream-restore
-load-module module-card-restore
-
-### Automatically augment property information from .desktop files
-### stored in /usr/share/application
-load-module module-augment-properties
-
-### Should be after module-*-restore but before module-*-detect
-load-module module-switch-on-port-available
-
-# automatically switch to newly-connected devices
-load-module module-switch-on-connect
-
-### Load audio drivers statically
-### (it's probably better to not load these drivers manually, but instead
-### use module-udev-detect -- see below -- for doing this automatically)
-#load-module module-alsa-sink
-#load-module module-alsa-source device=hw:1,0
-#load-module module-oss device="/dev/dsp" sink_name=output source_name=input
-#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
-#load-module module-null-sink
-#load-module module-pipe-sink
-
-### Automatically load driver modules depending on the hardware available
-.ifexists module-udev-detect.so
-load-module module-udev-detect ignore_dB=1
-.else
-### Use the static hardware detection module (for systems that lack udev support)
-load-module module-detect
-.endif
-
-### Automatically connect sink and source if JACK server is present
-.ifexists module-jackdbus-detect.so
-.nofail
-load-module module-jackdbus-detect channels=2
-.fail
-.endif
-
-### Automatically load driver modules for Bluetooth hardware
-.ifexists module-bluetooth-policy.so
-load-module module-bluetooth-policy
-.endif
-
-.ifexists module-bluetooth-discover.so
-load-module module-bluetooth-discover
-.endif
-
-### Load several protocols
-load-module module-dbus-protocol
-.ifexists module-esound-protocol-unix.so
-load-module module-esound-protocol-unix
-.endif
-load-module module-native-protocol-unix
-
-### Network access (may be configured with paprefs, so leave this commented
-### here if you plan to use paprefs)
-#load-module module-esound-protocol-tcp
-#load-module module-native-protocol-tcp
-#load-module module-zeroconf-publish
-
-### Load the RTP receiver module (also configured via paprefs, see above)
-#load-module module-rtp-recv
-
-### Load the RTP sender module (also configured via paprefs, see above)
-#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
-#load-module module-rtp-send source=rtp.monitor
-
-### Load additional modules from GSettings. This can be configured with the paprefs tool.
-### Please keep in mind that the modules configured by paprefs might conflict with manually
-### loaded modules.
-.ifexists module-gsettings.so
-.nofail
-load-module module-gsettings
-.fail
-.endif
-
-
-### Automatically restore the default sink/source when changed by the user
-### during runtime
-### NOTE: This should be loaded as early as possible so that subsequent modules
-### that look up the default sink/source get the right value
-load-module module-default-device-restore
-
-### Automatically move streams to the default sink if the sink they are
-### connected to dies, similar for sources
-load-module module-rescue-streams
-
-### Make sure we always have a sink around, even if it is a null sink.
-load-module module-always-sink
-
-### Honour intended role device property
-load-module module-intended-roles
-
-### Automatically suspend sinks/sources that become idle for too long
-load-module module-suspend-on-idle
-
-### If autoexit on idle is enabled we want to make sure we only quit
-### when no local session needs us anymore.
-.ifexists module-console-kit.so
-load-module module-console-kit
-.endif
-.ifexists module-systemd-login.so
-load-module module-systemd-login
-.endif
-
-### Enable positioned event sounds
-load-module module-position-event-sounds
-
-### Cork music/video streams when a phone stream is active
-#load-module module-role-cork
-
-### Modules to allow autoloading of filters (such as echo cancellation)
-### on demand. module-filter-heuristics tries to determine what filters
-### make sense, and module-filter-apply does the heavy-lifting of
-### loading modules and rerouting streams.
-load-module module-filter-heuristics
-load-module module-filter-apply
-
-### Make some devices default
-#set-default-sink output
-#set-default-source input
diff --git a/files/.config/rofi/config b/files/.config/rofi/config
deleted file mode 100644
index 5273091..0000000
--- a/files/.config/rofi/config
+++ /dev/null
@@ -1,14 +0,0 @@
-! State: 'bg', 'fg', 'bgalt', 'hlbg', 'hlfg'
-rofi.color-normal: #383838, #ffffff, #383838, #f0544c, #ffffff
-rofi.color-urgent: #383838, #ffffff, #383838, #f0544c, #ffffff
-rofi.color-active: #383838, #ffffff, #383838, #f0544c, #ffffff
-
-! 'bg', 'border','separator'
-rofi.color-window: #383838, #c7c7c7, #383838
-
-rofi.separator-style: none
-rofi.bw: 0
-rofi.width: 40
-rofi.location: 0
-rofi.font: F_SANS 12
-
diff --git a/files/.config/rofi/config.rasi b/files/.config/rofi/config.rasi
new file mode 100644
index 0000000..efb8264
--- /dev/null
+++ b/files/.config/rofi/config.rasi
@@ -0,0 +1,11 @@
+configuration {
+ width: 40;
+ font: "monospace 12";
+ bw: 0;
+ location: 0;
+ separator-style: "none";
+ color-normal: "#383838, #ebdbb2, #383838, #ebddb2, #383838";
+ color-urgent: "#383838, #ebddb2, #383838, #ebdbb2, #383838";
+ color-active: "#383838, #ebdbb2, #383838, #ebdbb1, #383838";
+ color-window: "#383838, #ebddb2, #383838";
+}
diff --git a/files/.config/rofi/passmenu.sh b/files/.config/rofi/passmenu.sh
new file mode 100755
index 0000000..0f25ee6
--- /dev/null
+++ b/files/.config/rofi/passmenu.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env sh
+typeit=0
+action=show
+while
+ case $1 in
+ "--type") typeit=1 ;;
+ "--action"|"-a") action="$2" ;;
+ esac
+ [ $# -ne 0 ]
+do shift; done
+
+prefix=${PASSWORD_STORE_DIR:-~/.password-store}
+
+password=$(
+ find "$prefix" -iname '*.gpg' |
+ sed -e "s:^${prefix}/::" -e "s/....$//" |
+ rofi -p "pass $action" -dmenu -i "$@"
+)
+
+[ -n "${password:-}" ] || exit
+
+case "$typeit${WAYLAND_DISPLAY+w}" in
+ 0) pass "$action" -c "$password" 2>/dev/null ;;
+ 0w) pass "$action" "$password" | tr '\n' '\0' |
+ wl-copy;;
+ 1) pass "$action" "$password" | tr '\n' '\0' |
+ xdotool type --clearmodifiers --file - ;;
+ 1w) pass "$action" "$password" | tr '\n' '\0' |
+ ydotool type --file - ;;
+esac
diff --git a/files/.config/sway/config b/files/.config/sway/config
index 98fcf1f..d54bfb9 100644
--- a/files/.config/sway/config
+++ b/files/.config/sway/config
@@ -2,22 +2,20 @@
set $terminal termite
### Color configuration
-set $bg #383838
-set $fg #b7bbb7
-set $border #383838
-set $active #f0544c
+set $color1 #383838
+set $color2 #ebdbb2
# class border backgr. text indicator child_border
-client.focused $active $bg $fg $border $active
-client.focused_inactive $bg $bg $fg $border $border
-client.unfocused $bg $bg $fg $border $border
-client.urgent $bg $bg $active $border $border
-client.placeholder $bg $bg $fg $border $border
-client.background $bg
+client.focused $color2 $color2 $color1 $color1 $color2
+client.focused_inactive $color1 $color1 $color2 $color1 $color1
+client.unfocused $color1 $color1 $color2 $color1 $color1
+client.urgent $color1 $color1 $color2 $color1 $color1
+client.placeholder $color1 $color1 $color2 $color1 $color1
+client.background $color1
# Font for window titles. Will also be used by the bar unless a different font
# is used in the bar {} block below.
-font pango:sans 8
+font pango:monospace 8
set $ws1 1
set $ws2 2
@@ -326,6 +324,8 @@ bindsym $mod+r mode "resize"
# reach systemd target
exec /bin/systemctl --user import-environment
exec /bin/systemctl --user start sway-session.target
+exec hash dbus-update-activation-environment 2>/dev/null && \
+ dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
# autorun .desktop
exec /bin/dex -a
@@ -335,23 +335,4 @@ exec $terminal
bar {
swaybar_command waybar
-# status_command i3status
-#
-# font pango:$font 10
-# height 30
-# tray_padding 7
-# position top
-# separator_symbol " ▏"
-# strip_workspace_numbers yes
-#
-# colors {
-# background #000000
-# statusline $fg
-#
-# focused_workspace #2c2f33 #2c2f33 $fg
-# active_workspace #000000 #000000 $fg
-# inactive_workspace #000000 #000000 #4b5056
-# urgent_workspace #000000 #000000 #e27c77
-# }
}
-
diff --git a/files/.config/termite/config b/files/.config/termite/config
index 6228326..749c97b 100644
--- a/files/.config/termite/config
+++ b/files/.config/termite/config
@@ -43,7 +43,7 @@ hyperlinks = true
[colors]
background = rgba(17, 19, 20, 0.85)
cursor = #BBBBBB
-foreground = #B7BBB7
+foreground = #EBDBB2
# black
color0 = #2C2F33
diff --git a/files/.config/waybar/config b/files/.config/waybar/config
index 181e5da..4b0a495 100644
--- a/files/.config/waybar/config
+++ b/files/.config/waybar/config
@@ -54,9 +54,11 @@
"format-icons": ["", "", "", "", ""]
},
"network": {
- "format-wifi": " <{essid}> {ipaddr}/{cidr}",
+ "format-wifi": " {ipaddr}/{cidr}",
"format-ethernet": " {ipaddr}/{cidr}",
- "format-disconnected": "⚠ Disconnected"
+ "format-disconnected": "⚠ Disconnected",
+ "tooltip-format": "up: {bandwidthUpBits}b/s, down: {bandwidthDownBits}b/s",
+ "tooltip-format-wifi": "{essid} - {bandwidthUpBits} {bandwidthDownBits}"
},
"pulseaudio": {
//"scroll-step": 1,
diff --git a/files/.config/waybar/style.css b/files/.config/waybar/style.css
index 2b366c3..fa136a2 100644
--- a/files/.config/waybar/style.css
+++ b/files/.config/waybar/style.css
@@ -1,33 +1,39 @@
* {
border: none;
- font-family: "Font Awesome 5 Pro", sans-serif;
+ font-family: monospace, "Font Awesome 5 Pro";
font-size: 13px;
}
window#waybar {
- background: rgba(43, 48, 59, 0.8);
- color: white;
+ background: rgba(60, 56, 54, 0.9);
+ color: rgba(235, 219, 178, 1);
}
#workspaces button {
padding: 0 5px;
background: transparent;
- color: white;
+ color: inherit;
}
#workspaces button.focused {
- background: #64727D;
+ background: rgba(235, 219, 178, 1);
+ color: rgba(60, 56, 54, 0.9);
+ font-weight: 900;
}
-#custom-spotify, #clock, #battery, #cpu, #memory, #temperature, #backlight, #network, #pulseaudio {
+#custom-spotify, #clock, #battery, #cpu, #memory, #temperature, #backlight, #network, #pulseaudio, #custom-vpn {
padding: 0 10px;
- border-right: 1px solid #b7bbb7;
+ border-left: 1px dotted #ebdbb2;
+ border-radius: 6.5px;
}
#idle_inhibitor, #tray, #custom-vpn {
+ padding-right: 0;
min-width: 25px;
+ color: white;
}
#tray {
margin-left: 5px;
+ font-family: sans-serif;
}
diff --git a/files/.local/bin/sway b/files/.local/bin/sway
deleted file mode 100755
index a235576..0000000
--- a/files/.local/bin/sway
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-import-gsettings() {
- # usage: import-gsettings : : ...
- expression=""
- for pair in "$@"; do
- IFS=:; set -- $pair
- expressions="$expressions -e 's:^$2=(.*)$:gsettings set org.gnome.desktop.interface $1 \1:e'"
- done
- IFS=
- eval sed -E $expressions "${XDG_CONFIG_HOME:-$HOME/.config}"/gtk-3.0/settings.ini >/dev/null
-}
-
-export XDG_CURRENT_DESKTOP=sway
-export XDG_SESSION_TYPE=wayland
-
-# Qt
-#export DESKTOP_SESSION=gnome
-export QT_STYLE_OVERRIDE=gtk
-export QT_QPA_PLATFORMTHEME=gtk2
-export QT_AUTO_SCREEN_SCALE_FACTOR=0
-export QT_QPA_PLATFORM=wayland-egl
-export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
-
-# GTK
-export CLUTTER_BACKEND=wayland
-export GTK_CSD=0
-if [[ -f /usr/lib/libgtk3-nocsd.so.0 ]]; then
- export LD_PRELOAD=/usr/lib/libgtk3-nocsd.so.0
-fi
-import-gsettings \
- gtk-theme:gtk-theme-name \
- icon-theme:gtk-icon-theme-name \
- cursor-theme:gtk-cursor-theme-name
-
-# Elementary/EFL
-export ECORE_EVAS_ENGINE=wayland_egl
-export ELM_ENGINE=wayland_egl
-
-# SDL
-export SDL_VIDEODRIVER=wayland
-
-# Java
-export _JAVA_AWT_WM_NONREPARENTING=1
-
-# Firefox
-export MOZ_ENABLE_WAYLAND=1
-
-exec /usr/bin/sway $@
diff --git a/files/.tmux/plugins/tpm b/files/.tmux/plugins/tpm
index 42bb2bf..476f6ca 160000
--- a/files/.tmux/plugins/tpm
+++ b/files/.tmux/plugins/tpm
@@ -1 +1 @@
-Subproject commit 42bb2bf48bef881be504278cf5156371b542cf81
+Subproject commit 476f6ca69922c9e67c408ae92dff0eb0ccb8ee51