aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Singleton <matt@xcolour.net>2021-09-01 12:43:41 -0500
committerMatt Singleton <matt@xcolour.net>2022-03-16 18:59:37 -0500
commita17ae708b7bf66bea0437417ef0ca0c2ad3be13c (patch)
treed09ee1642c923a9d9edef0a4edfaec3f10efa0f3
parentc12583494ee49a2ef1d2c485795f51712d66ce71 (diff)
sway-related config changes
-rw-r--r--config/sway/config15
-rw-r--r--config/swaylock/config1
-rw-r--r--config/waybar/config9
-rw-r--r--config/waybar/style.css13
-rw-r--r--config/zsh/.profile1
-rw-r--r--config/zsh/30-behavior.zsh2
6 files changed, 37 insertions, 4 deletions
diff --git a/config/sway/config b/config/sway/config
index 3d25c44..13d151e 100644
--- a/config/sway/config
+++ b/config/sway/config
@@ -14,7 +14,7 @@ set $down j
set $up k
set $right l
# Your preferred terminal emulator
-set $term alacritty
+set $term foot
# Your preferred application launcher
# Note: pass the final command to swaymsg so that the resulting window can be opened
# on the original workspace that the command was run on.
@@ -28,7 +28,7 @@ smart_borders on
### Output configuration
#
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * bg ~/Pictures/i3_cheatsheet.png center #FFFFFF
+output * background ~/Pictures/marfa.jpg fill
#
# Example configuration:
#
@@ -97,6 +97,8 @@ output * bg ~/Pictures/i3_cheatsheet.png center #FFFFFF
# Exit sway (logs you out of your Wayland session)
bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
+ bindsym $mod+Shift+i exec swaylock
+ bindsym $mod+Shift+comma exec 1password --toggle
# Media keys
bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
@@ -269,4 +271,13 @@ bar {
}
}
+#
+# Apps
+#
+
+for_window [class="1Password"] floating enable
+for_window [app_id="firefox"] inhibit_idle fullscreen
+assign [class="Tauon Music Box"] workspace number 3
+assign [class="Joplin"] workspace number 4
+
include /etc/sway/config.d/*
diff --git a/config/swaylock/config b/config/swaylock/config
index 9d73622..c154031 100644
--- a/config/swaylock/config
+++ b/config/swaylock/config
@@ -1,2 +1,3 @@
color=000000
indicator-idle-visible
+ignore-empty-password
diff --git a/config/waybar/config b/config/waybar/config
index b66c499..05dd2eb 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -14,6 +14,15 @@
"deactivated": ""
}
},
+ "sway/workspaces": {
+ "format": "{icon}",
+ "format-icons": {
+ "1": "",
+ "2": "",
+ "3": "",
+ "4": ""
+ }
+ },
"clock#local": {
"interval": 1,
"format": "{:%a %d %b %I:%M %p}",
diff --git a/config/waybar/style.css b/config/waybar/style.css
index d30f2a5..3743dc0 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -35,6 +35,7 @@ window#waybar {
#window,
#network,
#pulseaudio,
+#battery,
#clock {
padding: 2px 10px;
margin: 0;
@@ -44,11 +45,16 @@ window#waybar {
#mode,
#network,
#pulseaudio,
-#clock {
+#battery {
background: #93a1a1;
color: #eee8d5;
}
+#clock {
+ background: #657b83;
+ color: #eee8d5;
+}
+
#workspaces button,
#workspaces button:hover,
#workspaces button.focused,
@@ -59,6 +65,11 @@ window#waybar {
padding: 0 5px;
}
+#workspaces button {
+ background: #93a1a1;
+ color: #eee8d5;
+}
+
#workspaces button:hover {
background: #93a1a1;
color: #eee8d5;
diff --git a/config/zsh/.profile b/config/zsh/.profile
new file mode 100644
index 0000000..0569744
--- /dev/null
+++ b/config/zsh/.profile
@@ -0,0 +1 @@
+eval $(ssh-agent)
diff --git a/config/zsh/30-behavior.zsh b/config/zsh/30-behavior.zsh
index d62834f..f2e483e 100644
--- a/config/zsh/30-behavior.zsh
+++ b/config/zsh/30-behavior.zsh
@@ -26,7 +26,7 @@ infocmp "$TERM" > /dev/null 2>&1 || export TERM=xterm-256color
# set term title appropriately based on term type
# user@host:current_dir (current_command)
case "$TERM" in
- xterm*|rxvt*|screen*|alacritty*)
+ xterm*|rxvt*|screen*|alacritty*|foot)
term_preexec () {
printf '\e]0;%s (%s)\a' ${(%):-'%n@%m:%~'} "$1"
}