Changes in waybar and sway styling

.config/emacs/init.el

@@ -75,8 +75,12 @@
   make-backup-files nil
   auto-save-default nil
 
-  tab-width 2
-  indent-tabs-mode nil)
+	add-log-full-name "R. Huiberts"
+	add-log-mailing-address "rhuibjr.business@gmail.com"
+	change-log-default-name "CHANGELOG"
+
+  indent-line-function 'insert-tab
+  tab-width 2)
 
 ;;; rhjr/standard-packages
 (use-package dired-x
@@ -109,6 +113,28 @@
 
 ;; public functions
 
+(defun rhjr/split-window-80col ()
+  "Split the selected window into two side-by-side windows,
+with the left one exactly 80 columns wide, when only one
+window is open. If two windows are already open, leave the
+layout untouched and just select the right window."
+  (interactive)
+  (if (one-window-p t)
+      (progn
+        (split-window-right 88)
+        (other-window 1))
+    (when-let ((w (window-right (selected-window))))
+      (select-window w))))
+
+(defun rhjr/swap-windows ()
+  "Swap the buffers/states of the two windows in the current frame,
+keeping the cursor in the same physical window (left/right) rather
+than following the buffer."
+  (interactive)
+  (let ((this-window (selected-window)))
+    (window-swap-states nil (next-window))
+    (select-window this-window)))
+
 ;;; rhjr/mode
 (menu-bar-mode -1)
 (tool-bar-mode -1)
@@ -117,6 +143,7 @@
 (pixel-scroll-precision-mode)
 (global-display-line-numbers-mode 1)
 (delete-selection-mode 1)
+(column-number-mode 1)
 
 ;;; rhjr/packages
 (use-package magit
@@ -203,6 +230,16 @@
   (highlight-parentheses-colors
    '("#8ffff2" "#8ffff2" "#8ffff2" "#8ffff2" "#8ffff2")))
 
+(use-package hl-todo
+  :ensure t
+  :hook (prog-mode . hl-todo-mode)
+  :config
+  (setq hl-todo-keyword-faces
+        '(("todo"        . "#73c936")
+          ("note"        . "#ffdd33")
+          ("maintenance" . "#ffdd33")
+          ("done"        . "#95a99f"))))
+
 (use-package gruber-darker-theme
   :ensure t
   :config
@@ -328,6 +365,24 @@
 
 (global-set-key [f3] #'set-project-command-arg)
 
+(global-set-key (kbd "C-x 5") #'rhjr/split-window-80col)
+(global-set-key (kbd "C-x e") #'rhjr/swap-windows)
+
+(global-unset-key (kbd "M-1"))
+(global-unset-key (kbd "M-2"))
+(global-unset-key (kbd "M-3"))
+(global-unset-key (kbd "M-4"))
+(global-unset-key (kbd "M-5"))
+(global-unset-key (kbd "M-6"))
+(global-unset-key (kbd "M-;"))
+
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; If you edit it by hand, you could mess it up, so be careful.
+ ;; Your init file should contain only one such instance.
+ ;; If there is more than one, they won't work right.
+ '(trailing-whitespace ((t (:background "#282828")))))
+
 ;;rhjr/fix
 (setq minibuffer-prompt-properties ;; cursor in minibuffer-prompt
       '(read-only t cursor-intangible t face minibuffer-prompt))
@@ -344,10 +399,6 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(package-selected-packages nil))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
+ '(package-selected-packages
+	 '(cape consult corfu gruber-darker-theme highlight-parentheses hl-todo
+					magit orderless vertico)))

.config/sway/config

@@ -19,6 +19,7 @@ set $term foot
 # 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.
 set $menu rofi -show drun
+set $runn rofi -show run
 
 include /etc/sway/config-vars.d/*
 
@@ -78,7 +79,8 @@ input * {
     bindsym $mod+Shift+q kill
 
     # Start your launcher
-    bindsym $mod+d exec $menu
+    bindsym Mod1+j exec $menu
+    bindsym Mod1+k exec $runn
 
     # Drag floating windows by holding down $mod and left mouse button.
     # Resize them with right mouse button + $mod.
@@ -119,14 +121,18 @@ input * {
 #
 # Workspaces:
 #
+workspace 1 output DP-5
+workspace 2 output DP-5
+workspace 3 output DP-5
+workspace 4 output DP-6
     # Switch to workspace
-    bindsym $mod+1 workspace number 1
-    bindsym $mod+2 workspace number 2
-    bindsym $mod+3 workspace number 3
-    bindsym $mod+4 workspace number 4
-    bindsym $mod+5 workspace number 5
-    bindsym $mod+6 workspace number 6
-    bindsym $mod+7 workspace number 7
+    bindsym Mod1+1 workspace number 1
+    bindsym Mod1+2 workspace number 2
+    bindsym Mod1+3 workspace number 3
+    bindsym Mod1+4 workspace number 4
+    bindsym Mod1+5 workspace number 5
+    bindsym Mod1+6 workspace number 6
+    bindsym Mod1+7 workspace number 7
     bindsym $mod+8 workspace number 8
     bindsym $mod+9 workspace number 9
     bindsym $mod+0 workspace number 10
@@ -205,8 +211,8 @@ mode "resize" {
 }
 bindsym $mod+r mode "resize"
 
-#gaps outer 10
-#gaps right -10
+gaps outer 10
+gaps right 0
 
 #
 # Status Bar:

.config/waybar/config

@@ -9,7 +9,7 @@
   "margin-left": 0,
 
   "modules-left":   [ "sway/workspaces" ],
-  "modules-right":  [ "bluetooth", "wireplumber", "network", "custom/lock" ],
+  "modules-right":  [ "bluetooth", "wireplumber", "network", "custom/lock", "clock" ],
 
   "sway/workspaces": {
     "on-click": "activate",
@@ -61,5 +61,13 @@
     "format": "\udb80\udf3e",
     "on-click": "swaylock -f -c 000000",
     "tooltip": false
+  },
+
+  "clock": {
+    "timezone": "Europe/Amsterdam",
+    "format": "{:%H\n%M}",
+    "format-alt": "{:%H\n%M\n%S}",
+    "tooltip-format": "{:%A, %d-%m-%Y, Wk %V}",
+    "interval": 1
   }
 }

.config/waybar/style.css

@@ -38,11 +38,11 @@
 }
 
 /* system */
-#bluetooth, #wireplumber, #network, #tray, #clock, #custom-lock {
+#bluetooth, #wireplumber, #network, #tray, #clock, #custom-lock, #clock {
     padding: 7px 0;
 }
 
-#bluetooth:hover, #wireplumber:hover, #network:hover, #tray:hover, #custom-lock:hover {
+#bluetooth:hover, #wireplumber:hover, #network:hover, #tray:hover, #custom-lock:hover, #clock:hover {
     background-color: @background-hover;
 }