Merge branch 'main' into pres

7 files changed, 20 insertions, 2 deletions

diff --git a/RyanThinkpad.scm b/RyanThinkpad.scm
index bfacd6b..1066bac 100644
--- a/RyanThinkpad.scm
+++ b/RyanThinkpad.scm
@@ -3,6 +3,10 @@
 
 (operating-system
   (inherit base-operating-system)
+  (kernel-arguments (append (list "intel_iommu=on")
+                            %default-kernel-arguments))
+  (initrd-modules (cons* "vfio_pci" "vfio" "vfio_iommu_type1"
+                         %base-initrd-modules))
   (host-name "RyanThinkpad")
   (mapped-devices (list (mapped-device
                           (source (uuid
diff --git a/home-config/aerc/aerc.conf b/home-config/aerc/aerc.conf
index ac4cbcb..5ccd325 100644
--- a/home-config/aerc/aerc.conf
+++ b/home-config/aerc/aerc.conf
@@ -64,6 +64,8 @@ log-level=trace
 # Default: date<20,name<17,flags>4,subject<*
 #index-columns=date<20,name<17,flags>4,subject<*
 
+spinner = '/,-,\,|'
+
 #
 # Each name in index-columns must have a corresponding column-$name setting.
 # All column-$name settings accept golang text/template syntax. See
diff --git a/home-config/alacritty/alacritty.yml b/home-config/alacritty/alacritty.yml
index becd2f6..4fbd991 100644
--- a/home-config/alacritty/alacritty.yml
+++ b/home-config/alacritty/alacritty.yml
@@ -1,3 +1,5 @@
+window:
+  opacity: 0.70
 font:
   size: 15
   normal:
diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index f9fb2fd..9a67cf5 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -36,12 +36,14 @@
                                                     "libnotify"
                                                     "fzf"
                                                     "waypipe"
+                                                    "gnunet"
                                                     "qrencode"
                                                     "binutils"
                                                     "gcc-toolchain"
                                                     "borg"
                                                     "restic"
                                                     "rsync"
+                                                    "cloc"
                                                     "pv"
                                                     "python-msgpack"
                                                     "libreoffice"
@@ -49,6 +51,7 @@
                                                     "gnupg"
                                                     "lsof"
                                                     "pavucontrol"
+                                                    "netcat"
                                                     "bind:utils"
                                                     "font-cns11643"
                                                     "syncthing"
@@ -110,6 +113,7 @@
          (service home-xdg-configuration-files-service-type
                   `(("nvim/init.vim" ,(local-file "nvim/config/init.vim"))
                     ("nvim/after/ftplugin/markdown/custom.vim" ,(local-file "nvim/config/after/ftplugin/markdown/custom.vim"))
+                    ("nvim/after/ftplugin/mail/custom.vim" ,(local-file "nvim/config/after/ftplugin/mail/custom.vim"))
                     ("sway" ,(local-file "sway" #:recursive? #t))
                     ("hypr" ,(local-file "hypr" #:recursive? #t))
                     ("waybar" ,(local-file "waybar" #:recursive? #t))
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index f5833e4..8a37125 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -30,6 +30,9 @@
     yt-dlp
     xdg-desktop-portal-hyprland
     pass
+    rustup
+    gcc
+    pkg-config
 
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the
diff --git a/home-config/nvim/config/after/ftplugin/mail/custom.vim b/home-config/nvim/config/after/ftplugin/mail/custom.vim
new file mode 100644
index 0000000..41ad2e4
--- /dev/null
+++ b/home-config/nvim/config/after/ftplugin/mail/custom.vim
@@ -0,0 +1,2 @@
+setlocal tw=0
+setlocal lbr
diff --git a/home-config/waybar/config b/home-config/waybar/config
index 651d2ab..3dff06a 100644
--- a/home-config/waybar/config
+++ b/home-config/waybar/config
@@ -9,8 +9,9 @@
     "hyprland/submap": {
         "format": " {}"
     },
-    "wlr/workspaces": {
-        "format": "{name}",
+    "hyprland/workspaces": {
+        "format": "{id}",
+        "all-outputs": false,
         "disable-scroll": true
     },
     "hyprland/window": {