diff --git a/fschl/home-services/dotfiles/.config/dunst/dunstrc b/.config/dunst/dunstrc
similarity index 100%
rename from fschl/home-services/dotfiles/.config/dunst/dunstrc
rename to .config/dunst/dunstrc
diff --git a/fschl/home-services/dotfiles/.config/polybar/config b/.config/polybar/config
similarity index 100%
rename from fschl/home-services/dotfiles/.config/polybar/config
rename to .config/polybar/config
diff --git a/fschl/home-services/dotfiles/.config/polybar/player-status.sh b/.config/polybar/player-status.sh
similarity index 100%
rename from fschl/home-services/dotfiles/.config/polybar/player-status.sh
rename to .config/polybar/player-status.sh
diff --git a/fschl/home-services/dotfiles/.config/sway/config b/.config/sway/config
similarity index 79%
rename from fschl/home-services/dotfiles/.config/sway/config
rename to .config/sway/config
index a475ee0..60e5411 100644
--- a/fschl/home-services/dotfiles/.config/sway/config
+++ b/.config/sway/config
@@ -32,9 +32,15 @@ floating_modifier $mod
bindsym $mod+Shift+q kill
bindsym $mod+Shift+x exit
bindsym $mod+Shift+r reload
-bindsym $mod+r resize
+# bindsym $mod+r resize
+bindsym $mod+r mode "resize"
-bindsym $mod+Shift+Return exec foot
+bindsym $mod+Shift+Return exec kitty
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
# use vim keys for window movement
bindsym $mod+h focus left
@@ -59,7 +65,7 @@ bindsym $mod+Shift+k move up 30 px
bindsym $mod+Shift+l move right 30 px
# split in horizontal orientation
-bindsym $mod+s split h
+# bindsym $mod+s split h
# split in vertical orientation
bindsym $mod+v split v
@@ -67,10 +73,6 @@ bindsym $mod+v split v
# enter fullscreen mode for the focused container
bindsym $mod+f fullscreen toggle
-# change container layout (stacked, tabbed, toggle split)
-# bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-
# toggle tiling / floating
bindsym $mod+Shift+f floating toggle
@@ -113,10 +115,11 @@ set $ws8 "8 "
# linux - less often used terminals for background processes
set $ws9 "9 "
-assign [class="^Firefox$"] $ws1
-assign [class="^DebugScreen"] $ws3
-assign [class="^Thunderbird$"] $ws4
-assign [class=".*ee.*ass.*"] $ws8
+# find application info with =swaymsg -t get_tree=
+assign [app_id="firefox"] $ws1
+assign [class="Emacs"] $ws2
+assign [title="^DebugScreen"] $ws3
+assign [app_id="org.keepassxc.KeePassXC"] $ws8
# Move specific workspaces to outputs
workspace $ws0 output $laptop
@@ -138,8 +141,8 @@ bindsym $mod+4 workspace $ws4
bindsym $mod+5 workspace $ws5
bindsym $mod+6 workspace 6
bindsym $mod+7 workspace 7
-bindsym $mod+8 workspace $WS8
-bindsym $mod+9 workspace $WS9
+bindsym $mod+8 workspace $ws8
+bindsym $mod+9 workspace $ws9
bindsym $mod+0 workspace 10
# Move focused container to workspace
@@ -151,8 +154,8 @@ bindsym $mod+Shift+4 move container to workspace $ws4
bindsym $mod+Shift+5 move container to workspace $ws5
bindsym $mod+Shift+6 move container to workspace 6
bindsym $mod+Shift+7 move container to workspace 7
-bindsym $mod+Shift+8 move container to workspace $WS8
-bindsym $mod+Shift+9 move container to workspace $WS9
+bindsym $mod+Shift+8 move container to workspace $ws8
+bindsym $mod+Shift+9 move container to workspace $ws9
bindsym $mod+Shift+0 move container to workspace 10
# Bind hotkeys for brightness and volume
@@ -160,6 +163,30 @@ bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+
bindsym --locked $mod+p exec playerctl play-pause
+# resize window (you can also use the mouse for that)
+mode "resize" {
+ # These bindings trigger as soon as you enter the resize mode
+
+ # Pressing left will shrink the window’s width.
+ # Pressing right will grow the window’s width.
+ # Pressing up will shrink the window’s height.
+ # Pressing down will grow the window’s height.
+ bindsym j resize shrink width 10 px or 10 ppt
+ bindsym i resize grow height 10 px or 10 ppt
+ bindsym k resize shrink height 10 px or 10 ppt
+ bindsym l resize grow width 10 px or 10 ppt
+
+ # same bindings, but for the arrow keys
+ bindsym Left resize shrink width 10 px or 10 ppt
+ bindsym Down resize grow height 10 px or 10 ppt
+ bindsym Up resize shrink height 10 px or 10 ppt
+ bindsym Right resize grow width 10 px or 10 ppt
+
+ # back to normal: Enter or Escape
+ bindsym Return mode "default"
+ bindsym Escape mode "default"
+}
+
# Screenshots
bindsym Print exec grimshot --notify save output
bindsym Alt+Print exec grimshot --notify save area
@@ -176,6 +203,7 @@ exec swayidle -w \
resume 'swaymsg "output * dpms on"' \
before-sleep $lock
+bindsym Ctrl+Shift+L exec $lock
# Window rules
#for_window [title="Firefox — Sharing Indicator"] kill
for_window [title=".* - mpv$"] floating enable, sticky enable
@@ -186,7 +214,10 @@ exec mako --border-radius=2 --font="Iosevka ss08 10" --max-visible=5 --outer-mar
exec nm-applet --indicator
exec udiskie -t
exec gammastep-indicator -l 50.8643:12.1124 -t 6500:3500 -b 1.0:0.7
+
exec emacs
+exec firefox
+exec keepassxc
# Set GNOME settings (requires "glib:bin" in Guix)
exec gsettings set org.gnome.desktop.interface gtk-theme "Matcha-dark-azul"
diff --git a/fschl/home-services/dotfiles/.config/waybar/config b/.config/waybar/config
similarity index 81%
rename from fschl/home-services/dotfiles/.config/waybar/config
rename to .config/waybar/config
index 4e2c9e8..2fe1ee1 100644
--- a/fschl/home-services/dotfiles/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,13 +1,15 @@
{
"layer": "bottom",
"position": "bottom",
- "height": 24,
+ "height": 20,
// maybe take another look at e.g. https://gitlab.com/wef/dotfiles/-/blob/master/.config/waybar/config
+ // https://github.com/Alexays/Waybar/wiki/Configuration
+ // https://github.com/Alexays/Waybar/wiki/Examples
"modules-left": ["sway/workspaces", "sway/mode"],
- "modules-center": ["timer", "custom/disk_root", "custom/disk_home", "network"],
- "modules-right": ["tray", "cpu", "memory", "battery", "clock"],
+ "modules-center": [ "custom/disk_root", "network"],
+ "modules-right": [ "memory", "tray", "battery", "clock", ],
"sway/mode": {
"format": " {}"
},
@@ -16,7 +18,7 @@
"disable-scroll": true
},
"clock": {
- "format": "{:%b %d %H:%M %p W%U}",
+ "format": "{:%b %d %H:%M KW%U}",
"tooltip": false
},
"battery": {
@@ -62,8 +64,8 @@
"exec": "notmuch count tag:flagged OR tag:inbox AND NOT tag:killed"
},
"network": {
- "family": "ipv6",
- // "interface": "wlp2*", // (Optional) To force the use of this interface
+ // "family": "ipv6",
+ "interface": "wlp3*", // (Optional) To force the use of this interface
"format-wifi": " {essid} {frequency} {signaldBm} dB ⇵ {bandwidthUpBits}/{bandwidthDownBits}",
"format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
"format-linked": "{ifname} (No IP) ",
@@ -71,12 +73,12 @@
"format-alt": "{ifname}: {ipaddr}/{cidr}",
"interval": 5
},
- "timer": {
- "interval": 1,
- "exec": "~/.config/waybar/timer.sh",
- "exec-if": "pgrep emacs",
- "escape": true
- },
+ //"timer": {
+ // "interval": 1,
+ // "exec": "~/.config/waybar/timer.sh",
+ // "exec-if": "pgrep emacs",
+ // "escape": true
+ //},
"idle_inhibitor": {
"format": "{icon}",
"format-icons": {
diff --git a/fschl/home-services/dotfiles/.config/waybar/style.css b/.config/waybar/style.css
similarity index 100%
rename from fschl/home-services/dotfiles/.config/waybar/style.css
rename to .config/waybar/style.css
diff --git a/fschl/home-services/dotfiles/.config/waybar/timer.sh b/.config/waybar/timer.sh
similarity index 100%
rename from fschl/home-services/dotfiles/.config/waybar/timer.sh
rename to .config/waybar/timer.sh