diff --git a/dot_config/sway/config b/dot_config/sway/config
index 2e98c03..e419b6a 100644
--- a/dot_config/sway/config
+++ b/dot_config/sway/config
@@ -58,12 +58,6 @@ assign [class="Wfica_Seamless"] $ws10
#disabled this for now, using Ferdi for socials
#exec --no-startup-id "i3-msg 'workspace 9:9; append_layout /home/joachim/.config/i3/workspace-9.json'"
-# i3-gaps
-# 10
-gaps inner 0
-# 5
-gaps outer 0
-
# Disallow endless looping of focus: extreme right is extreme right, don't flip to extreme left whenever you want...
focus_wrapping no
@@ -96,6 +90,7 @@ bindsym $mod+Shift+q kill
# start dmenu (a program launcher)
# bindsym $mod+d exec dmenu_run
bindsym $mod+d exec ~/.config/rofi/runrofi.sh
+bindsym $mod+Shift+d exec "albert show"
# this uses the output of greenclip (see here https://wiki.archlinux.org/index.php/Greenclip) to show clipboard history in rofi
bindsym $mod+c exec rofi -modi "clipboard:greenclip print" -show clipboard -run-command '{cmd}'
@@ -127,8 +122,8 @@ mode "$mode_redshift" {
bindsym 7 exec --no-startup-id redshift -P -O 7000
bindsym 8 exec --no-startup-id redshift -P -O 8000
- bindsym k exec --no-startup-id "brightnessctl -c backlight s +10%"
- bindsym j exec --no-startup-id "brightnessctl -c backlight s 10%-"
+ bindsym k exec --no-startup-id "light -A 10"
+ bindsym j exec --no-startup-id "light -U 10"
# back to normal: Enter or Escape
bindsym Return mode "default"
@@ -437,9 +432,6 @@ exec --no-startup-id xfce4-power-manager
# load the wallpaper
exec_always --no-startup-id sh ~/.fehbg
-# start picom: compositor that allows, for example, transparency
-exec_always --no-startup-id picom --experimental-backends
-
# start greenclip, this somehow fails to start at launch (sometimes?)
# exec --no-startup-id systemctl --user start greenclip
exec --no-startup-id greenclip daemon>/dev/null
@@ -516,7 +508,7 @@ client.background $dark0_hard
# }
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
+output * bg ~/pictures/l_ash03_big.jpg fill
# Testing this out
# dwt - disable while typing
diff --git a/dot_config/waybar/config b/dot_config/waybar/config
index 63d4507..905b8cf 100644
--- a/dot_config/waybar/config
+++ b/dot_config/waybar/config
@@ -9,14 +9,8 @@
// modules
"modules-left": [],
"modules-center": ["sway/window"],
- "modules-right": ["clock", "tray"],
+ "modules-right": ["tray"],
- "clock": {
- //"timezone": "America/New_York",
- "tooltip-format": "{:%Y %B}\n{calendar}",
- "format": "{:%H:%M %d/%m/%Y}",
- "format-alt": "{:%Y-%m-%d}"
- },
}
,
{
@@ -29,7 +23,7 @@
"spacing": 4, // Gaps between modules (4px)
// Choose the order of the modules
"modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
- "modules-center": [],
+ "modules-center": ["clock"],
"modules-right": ["mpd", "idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "keyboard-state", "sway/language", "battery", "battery#bat2"],
// Modules configuration
// "sway/workspaces": {
@@ -56,6 +50,12 @@
"unlocked": ""
}
},
+ "clock": {
+ //"timezone": "America/New_York",
+ "tooltip-format": "{:%Y %B}\n{calendar}",
+ "format": "{:%H:%M %d/%m/%Y}",
+ "format-alt": "{:%Y-%m-%d}"
+ },
"sway/mode": {
//"format": "{}"
"format": "{}"
@@ -135,6 +135,15 @@
"battery#bat2": {
"bat": "BAT2"
},
+ "bluetooth": {
+ "format": "{icon}",
+ "format-alt": "bluetooth: {status}",
+ "format-icons": {
+ "enabled": "",
+ "disabled": ""
+ },
+ "tooltip-format": "{}"
+ },
"network": {
// "interface": "wlp2*", // (Optional) To force the use of this interface
"format-wifi": "{essid} ({signalStrength}%) ",
diff --git a/dot_config/waybar/style.scss b/dot_config/waybar/style.scss
index e7183e7..d683ba3 100644
--- a/dot_config/waybar/style.scss
+++ b/dot_config/waybar/style.scss
@@ -77,6 +77,7 @@ window {
#clock,
#battery,
+#bluetooth,
#cpu,
#memory,
#disk,
@@ -139,6 +140,10 @@ window {
}
}
+#bluetooth {
+ background-color: $light-green;
+}
+
label:focus {
color: $bg0;
}
diff --git a/dot_doom.d/config.el b/dot_doom.d/config.el
index cd4efed..014d324 100644
--- a/dot_doom.d/config.el
+++ b/dot_doom.d/config.el
@@ -39,7 +39,7 @@
;; Set font
(setq doom-font (font-spec :family "FiraCode Nerd Font Mono" :size 12 :weight 'semi-light)
doom-unicode-font (font-spec :family "FiraCode Nerd Font Mono" :size 12 :weight 'semi-light)
- doom-variable-pitch-font (font-spec :family "FiraCode Nerd Font Mono" :size 13))
+ doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
;; This determines the style of line numbers in effect. If set to `nil', line
;; numbers are disabled. For relative line numbers, set this to `relative'.
@@ -97,14 +97,20 @@
`(("n" "default note" plain (file "~/org-roam/templates/default.org")
:if-new
(file+head "%<%Y%m%d%H%M%S>-${slug}.org"
- "#+title: ${title}\n#+filetags: \n\n")
+ "#+title: ${title}\n#+filetags:\n\n")
:unnarrowed t)
- ("p" "person" plain "%?"
+ ("p" "person" plain (file "~/org-roam/templates/person.org")
:if-new
- (file+head "person/${slug}.org"
- "#+name: ${slug}\n")
+ (file+head "%<%Y%m%d%H%M%S>-${slug}.org"
+ "#+name: ${title}\n#+created: %U\n\n")
:immediate-finish t
- :unnarrowed t))))
+ :unnarrowed t)
+ ("m" "meeting" plain (file "~/org-roam/templates/meeting.org")
+ :if-new
+ (file+head "%<%Y%m%d%H%M%S>-${slug}.org"
+ "#+title: ${title}\n#+created: %U\n#+filetags: \n\n")
+ :unnarrowed t)
+ )))
; enable chezmoi
(use-package chezmoi)
diff --git a/dot_doom.d/packages.el b/dot_doom.d/packages.el
index e9e9621..3a819f0 100644
--- a/dot_doom.d/packages.el
+++ b/dot_doom.d/packages.el
@@ -59,3 +59,6 @@
(package! terraform-mode)
; add typescript major mode
(package! typescript-mode)
+; chezmoi management functions
+(package! chezmoi)
+