diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | coruscant.config-sway-local.conf | 1 | ||||
| -rw-r--r-- | coruscant.config-waybar-local.conf | 22 | ||||
| -rw-r--r-- | dot.config-sway-config | 19 | ||||
| -rw-r--r-- | dot.config-waybar-config | 19 | ||||
| -rwxr-xr-x | dot.local-bin-sm | 10 | ||||
| -rw-r--r-- | naboo.config-sway-local.conf | 3 | ||||
| -rw-r--r-- | naboo.config-waybar-local.conf | 21 |
9 files changed, 86 insertions, 23 deletions
@@ -1 +1,3 @@ *~ +dot.config-sway-local.conf +dot.config-waybar-local.conf diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..36d0063 --- /dev/null +++ b/Makefile @@ -0,0 +1,12 @@ +HOST = $(shell hostname -s) +SRCS = $(wildcard $(HOST).*) +OBJS = $(patsubst $(HOST).%,dot.%,$(SRCS)) + +all: $(OBJS) + +dot.%: $(HOST).% + ln -s $< $@ + +install: all + ./install.py +.PHONY: install diff --git a/coruscant.config-sway-local.conf b/coruscant.config-sway-local.conf new file mode 100644 index 0000000..81f0213 --- /dev/null +++ b/coruscant.config-sway-local.conf @@ -0,0 +1 @@ +output eDP-1 scale 2 diff --git a/coruscant.config-waybar-local.conf b/coruscant.config-waybar-local.conf new file mode 100644 index 0000000..1c1e0be --- /dev/null +++ b/coruscant.config-waybar-local.conf @@ -0,0 +1,22 @@ +{ + "height": 12, + "tray": { + "icon-size": 10 + }, + "clock": { + "format": "{:%Y-%m-%d %T}", + "format-alt": "{:%T}" + }, + "modules-right": [ + "idle_inhibitor", + "pulseaudio", + "network", + "cpu", + "memory", + "temperature", + "backlight", + "battery", + "clock", + "tray" + ] +} diff --git a/dot.config-sway-config b/dot.config-sway-config index 0880128..368e866 100644 --- a/dot.config-sway-config +++ b/dot.config-sway-config @@ -1,6 +1,8 @@ +# -*- conf -*- + set $mod Mod4 -output eDP-1 scale 2 +include local.conf # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. @@ -178,15 +180,24 @@ bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle #bindsym $mod+F4 exec setxkbmap us input * { - xkb_layout de - xkb_variant bone + xkb_layout de,us,de,gr + xkb_variant bone,,ru, } +bindsym $mod+Mod1+space input * xkb_switch_layout next +bindsym $mod+F1 input * xkb_switch_layout 0 +bindsym $mod+F2 input * xkb_switch_layout 1 +bindsym $mod+F3 input * xkb_switch_layout 2 +bindsym $mod+F4 input * xkb_switch_layout 3 output * { bg ~/Pictures/rainbow_colorful_background_lines_patterns_66008_2560x1440.png fill } +seat * xcursor_theme "Adwaita" + exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec mako exec swayidle -w lock "swaylock -f" before-sleep "loginctl lock-session" timeout 600 'swaymsg "output * dpms off"; loginctl lock-session' resume 'swaymsg "output * dpms on"' # Lat/Lon for Aachen -exec wlsunset -l 50.8 -L 6.0 +exec wlsunset -l 50.8 -L 6.1 +exec nm-applet --indicator diff --git a/dot.config-waybar-config b/dot.config-waybar-config index fc86430..c5287fc 100644 --- a/dot.config-waybar-config +++ b/dot.config-waybar-config @@ -1,8 +1,8 @@ // -*- javascript -*- vim:ft=javascript sw=4 et { + "include": ".config/waybar/local.conf", "layer": "top", // Waybar at top layer "position": "top", // Waybar position (top|bottom|left|right) - // "height": 30, // Waybar height (to be removed for auto height) // "width": 1280, // Waybar width // Choose the order of the modules "modules-left": [ @@ -12,20 +12,6 @@ // "custom/media" ], "modules-center": ["sway/window"], - "modules-right": [ - // "mpd", - "idle_inhibitor", - "pulseaudio", - "network", - "cpu", - "memory", - "temperature", - "backlight", - // "sway/language", - "battery", - "clock", - "tray" - ], // Modules configuration // "sway/workspaces": { // "disable-scroll": true, @@ -79,14 +65,11 @@ } }, "tray": { - // "icon-size": 21, "spacing": 10 }, "clock": { - "format": "{:%T}", "interval": 1, "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>", - "format-alt": "{:%Y-%m-%d}" }, "cpu": { "format": "{usage}% ", diff --git a/dot.local-bin-sm b/dot.local-bin-sm index 8c3f4f4..c0fd090 100755 --- a/dot.local-bin-sm +++ b/dot.local-bin-sm @@ -1,5 +1,13 @@ #!/bin/sh set -e +case $(hostname -s) in + naboo) + format='%u%r %3n %10d %17f %22F %t %i%S' + ;; + *) + format='%u%r %3n %10d %17f %8F %t %i%S' + ;; +esac set -x mbsync -a || true notmuch new @@ -11,5 +19,5 @@ notmuch tag -new -- tag:new and folder:GMail/mail nm-tagger export MAILSEQ="${MBLAZE:-$HOME/.mblaze}/seq.sm" export MBLAZE_PAGER="" -msearch -- --exclude=false query:new | mthread | mseq -S | mscan -f '%u%r %3n %10d %17f %20F %t %i%S' +msearch -- --exclude=false query:new | mthread | mseq -S | mscan -f "$format" type mu > /dev/null && mu index || true diff --git a/naboo.config-sway-local.conf b/naboo.config-sway-local.conf new file mode 100644 index 0000000..1ac3810 --- /dev/null +++ b/naboo.config-sway-local.conf @@ -0,0 +1,3 @@ +output * scale 2 +output DP-1 pos 0 0 +output HDMI-A-1 pos 1920 0 diff --git a/naboo.config-waybar-local.conf b/naboo.config-waybar-local.conf new file mode 100644 index 0000000..1f4d455 --- /dev/null +++ b/naboo.config-waybar-local.conf @@ -0,0 +1,21 @@ +{ + "height": 16, + "tray": { + "icon-size": 16 + }, + "clock": { + "format": "{:%Y-%m-%d %T}", + "format-alt": "{:%T}" + }, + "modules-right": [ + "idle_inhibitor", + "pulseaudio", + "network", + "cpu", + "memory", + "temperature", + "backlight", + "clock", + "tray" + ] +} |