From df69b2a47709c7c6d608e7e91f0130e431db00a5 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 19 Jun 2022 10:59:10 +0200
Subject: ...

---
 accounts/gkleen@sif/default.nix | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'accounts/gkleen@sif/default.nix')

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 84b9e464..f28cf4e2 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -88,12 +88,13 @@ in {
       emacs = {
         enable = true;
         extraPackages = epkgs: with epkgs; [
-          evil evil-dvorak undo-tree magit haskell-mode
-          nix-mode yaml-mode json-mode shakespeare-mode
-          smart-mode-line highlight-parentheses highlight-symbol
-          ag sass-mode lua-mode fira-code-mode use-package # notmuch
+          evil evil-dvorak undo-tree magit haskell-mode nix-mode
+          yaml-mode json-mode shakespeare-mode smart-mode-line
+          highlight-parentheses highlight-symbol ag sass-mode lua-mode
+          fira-code-mode use-package # notmuch
           use-package-ensure-system-package git-gutter emacsScratch
           edit-server mediawiki editorconfig typescript-mode
+          markdown-mode
         ];
       };
       firefox = {
@@ -123,14 +124,20 @@ in {
 
       autorandr = {
         enable = true;
-        hooks.postswitch = {
-          # "restart-compton" = "${pkgs.systemd}/bin/systemctl --user try-restart picom";
-          "restart-trays" = ''
-              ${pkgs.coreutils}/bin/sleep 5
-              ${pkgs.systemd}/bin/systemctl --user try-restart taffybar
+        hooks = {
+          preswitch = {
+            "stop-tray" = ''
+              ${pkgs.systemd}/bin/systemctl --user try-restart tray.target
             '';
+          };
+          postswitch = {
+            # "restart-compton" = "${pkgs.systemd}/bin/systemctl --user try-restart picom";
+            "restart-tray" = ''
+              ${pkgs.systemd}/bin/systemctl --user try-restart tray.target
+            '';
+          };
         };
-        profiles = customUtils.nixImport { dir = ./autorandr-profiles; };
+        profiles = customUtils.nixImport rec { dir = ./autorandr-profiles; _import = name: _base: import "${toString dir}/${name}" inputs; };
       };
 
       zsh.initExtra = "source ${./zshrc}";
-- 
cgit v1.2.3