4 files changed, 40 insertions, 7 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 09864bb2..61769adb 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -99,6 +99,7 @@ in {
 
     home-manager.users.${userName} = {
       imports = [
+        ./libvirt
         flakeInputs.nix-index-database.hmModules.nix-index
         flakeInputs.impermanence.nixosModules.home-manager.impermanence
       ];
@@ -171,7 +172,7 @@ in {
             edit-server mediawiki editorconfig typescript-mode
             markdown-mode nftables-mode rustic lsp-mode lsp-ui
             direnv company projectile tomorrow-night-paradise-theme
-            treesit-grammars.with-all-grammars
+            treesit-grammars.with-all-grammars magit-delta
           ];
           overrides = self: super: {
             tomorrow-night-paradise-theme = super.trivialBuild {
@@ -275,7 +276,7 @@ in {
               output = "eDP-1";
               modules-left = [ "hyprland/workspaces" ];
               modules-center = [ "hyprland/window" ];
-              modules-right = [ "custom/weather" "custom/keymap" "clock" "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" ];
+              modules-right = [ "custom/weather" "custom/keymap" "privacy" "tray" "wireplumber" "backlight" "battery" "idle_inhibitor" "clock" ];
 
               "custom/weather" = {
                 format = "{}";
@@ -301,7 +302,7 @@ in {
                       if keymap == "English (programmer Dvorak)":
                           short = "dvp"
                       elif keymap == "English (US)":
-                          short = "us"
+                          short = "<span color=\"#ffffff\">us</span>"
                       print(json.dumps({'text': short, 'tooltip': keymap}, separators=(',', ':')), flush=True)  # noqa: E501
 
 
@@ -471,6 +472,13 @@ in {
 
             #custom-weather, #custom-keymap {
               color: @grey;
+              margin: 0 5px;
+            }
+            #custom-weather {
+              margin-right: 3px;
+            }
+            #custom-keymap {
+              margin-left: 3px;
             }
 
             #tray {
@@ -480,6 +488,13 @@ in {
               color: @grey;
               margin: 0 5px 0 2px;
             }
+            #idle_inhibitor {
+              margin-right: 2px;
+              margin-left: 3px;
+            }
+            #battery {
+              margin-right: 3px;
+            }
             #battery.discharging {
               color: @white;
             }
@@ -505,7 +520,7 @@ in {
               margin: -1px 2px 0px 5px;
             }
             #clock {
-              margin-right: 5px;
+              /* margin-right: 5px; */
             }
           '';
               };
@@ -691,7 +706,6 @@ in {
         ];
 
         file = {
-          ".emacs.d/init.el".source = ./emacs.el;
           ".backup-munin".source = ./backup-patterns;
           ".mozilla/firefox/default/chrome/userChrome.css".source = ./firefox-chrome.css;
           ".mozilla/firefox/default/chrome/userContent.css".source = ./firefox-content.css;
@@ -757,6 +771,7 @@ in {
             };
           };
         };
+        "emacs/init.el".source = ./emacs.el;
       };
 
       xdg.dataFile = {
diff --git a/accounts/gkleen@sif/emacs.el b/accounts/gkleen@sif/emacs.el
index 7a8eb8f5..b1b1b198 100644
--- a/accounts/gkleen@sif/emacs.el
+++ b/accounts/gkleen@sif/emacs.el
@@ -38,6 +38,8 @@
 
 (evil-set-undo-system 'undo-tree)
 
+(add-hook 'magit-mode-hook (lambda () (magit-delta-mode +1)))
+
 (global-set-key (kbd "RET") 'newline-and-indent)
 (global-set-key (kbd "M-g") 'magit-status)
 (global-set-key (kbd "M-?") 'vc-git-grep)
@@ -54,8 +56,8 @@
 
 (global-set-key (kbd "C-x K") 'kill-current-buffer)
 
-(setq backup-directory-alist `(("." . "~/.saves")))
-(setq undo-tree-history-directory-alist `(("." . "~/.undo")))
+(setq backup-directory-alist `(("." . "~/.local/state/emacs/saves")))
+(setq undo-tree-history-directory-alist `(("." . "~/.local/state/emacs/undo")))
 (setq delete-old-versions t
       kept-new-versions 6
       kept-old-versions 2
diff --git a/accounts/gkleen@sif/hyprland.nix b/accounts/gkleen@sif/hyprland.nix
index 9c33fda1..3b2f8879 100644
--- a/accounts/gkleen@sif/hyprland.nix
+++ b/accounts/gkleen@sif/hyprland.nix
@@ -297,6 +297,9 @@ in {
     "workspace 4, class:^imv$"
     "workspace 4, class:^org\.pwmt\.zathura$"
     "workspace 10, class:^mpv$"
+    "workspace 1, class:^Element$"
+    "workspace 1, class:^thunderbird$"
+    "workspace 5, class:^virt-manager$"
     "float, class:^org\.keepassxc\.KeePassXC$, title:Access Request$"
     "center, class:^org\.keepassxc\.KeePassXC$, title:Access Request$"
     "float, class:^org\.keepassxc\.KeePassXC$, title:^Unlock Database"
diff --git a/accounts/gkleen@sif/libvirt/default.nix b/accounts/gkleen@sif/libvirt/default.nix
new file mode 100644
index 00000000..a93a2266
--- /dev/null
+++ b/accounts/gkleen@sif/libvirt/default.nix
@@ -0,0 +1,13 @@
+{ flakeInputs, ... }:
+
+with flakeInputs.nixVirt.lib;
+
+{
+  config = {
+    virtualisation.libvirt = {
+      enable = true;
+      connections."qemu:///session" = {
+      };
+    };
+  };
+}