From d54b1f5b30e71c4ddbed476f5588b622f1cc9469 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Mon, 9 May 2022 16:42:19 +0200
Subject: refactor(tazjin/home): Split shared config into separate file

Change-Id: I898f1552f449e2d6bddc8e3e3a144d6c2490ce29
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5551
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: tazjin <tazjin@tvl.su>
---
 users/tazjin/home/shared.nix   | 84 ++++++++++++++++++++++++++++++++++++++++++
 users/tazjin/home/tverskoy.nix | 79 ++-------------------------------------
 2 files changed, 88 insertions(+), 75 deletions(-)
 create mode 100644 users/tazjin/home/shared.nix

diff --git a/users/tazjin/home/shared.nix b/users/tazjin/home/shared.nix
new file mode 100644
index 000000000000..ade1e3a98357
--- /dev/null
+++ b/users/tazjin/home/shared.nix
@@ -0,0 +1,84 @@
+# Shared home configuration for all machines.
+
+{ depot, pkgs, ... }: # readTree
+{ config, lib, ... }: # home-manager
+
+{
+  imports = [ "${depot.third_party.impermanence}/home-manager.nix" ];
+
+  home.persistence."/persist/tazjin/home" = {
+    allowOther = true;
+
+    directories = [
+      ".cargo"
+      ".config/audacity"
+      ".config/google-chrome"
+      ".config/quassel-irc.org"
+      ".gnupg"
+      ".local/share/audacity"
+      ".local/share/direnv"
+      ".local/share/fish"
+      ".local/share/keyrings"
+      ".local/share/zoxide"
+      ".mozilla/firefox"
+      ".password-store"
+      ".rustup"
+      ".ssh"
+      ".steam"
+      ".telega"
+      "go"
+      "mail"
+    ];
+
+    files = [
+      ".notmuch-config"
+    ];
+  };
+
+  home.activation.screenshots = lib.hm.dag.entryAnywhere ''
+    $DRY_RUN_CMD mkdir -p $HOME/screenshots
+  '';
+
+  programs.git = {
+    enable = true;
+    userName = "Vincent Ambo";
+    userEmail = "mail@tazj.in";
+    extraConfig = {
+      pull.rebase = true;
+      init.defaultBranch = "canon";
+    };
+  };
+
+  programs.fish = {
+    enable = true;
+    interactiveShellInit = ''
+      ${pkgs.zoxide}/bin/zoxide init fish | source
+    '';
+  };
+
+  services.screen-locker = {
+    enable = true;
+    enableDetectSleep = true;
+    inactiveInterval = 10; # minutes
+    lockCmd = "${depot.users.tazjin.screenLock}/bin/tazjin-screen-lock";
+  };
+
+  services.picom = {
+    enable = true;
+    vSync = true;
+    backend = "glx";
+  };
+
+  # Enable the dunst notification daemon, but force the
+  # configuration file separately instead of going via the strange
+  # Nix->dunstrc encoding route.
+  services.dunst.enable = true;
+  xdg.configFile."dunst/dunstrc" = {
+    source = depot.users.tazjin.dotfiles.dunstrc;
+    onChange = ''
+      ${pkgs.procps}/bin/pkill -u "$USER" ''${VERBOSE+-e} dunst || true
+    '';
+  };
+
+  systemd.user.startServices = true;
+}
diff --git a/users/tazjin/home/tverskoy.nix b/users/tazjin/home/tverskoy.nix
index 8928dc76888f..7a997ec8cdd0 100644
--- a/users/tazjin/home/tverskoy.nix
+++ b/users/tazjin/home/tverskoy.nix
@@ -4,87 +4,16 @@
 { config, lib, ... }: # home-manager
 
 {
-  imports = [ "${depot.third_party.impermanence}/home-manager.nix" ];
+  imports = [
+    depot.users.tazjin.home.shared
+  ];
 
   home.persistence."/persist/tazjin/home" = {
-    allowOther = true;
-
     directories = [
-      ".cargo"
-      ".config/audacity"
-      ".config/google-chrome"
-      ".config/quassel-irc.org"
       ".config/spotify"
-      ".config/syncthing"
       ".config/unity3d"
-      ".electrum"
-      ".elfeed"
-      ".gnupg"
       ".local/share/Steam"
-      ".local/share/audacity"
-      ".local/share/direnv"
-      ".local/share/fish"
-      ".local/share/keyrings"
-      ".local/share/zoxide"
-      ".mozilla/firefox"
-      ".password-store"
-      ".rustup"
-      ".ssh"
-      ".steam"
-      ".telega"
-      "go"
-      "mail"
-    ];
-
-    files = [
-      ".notmuch-config"
+      ".electrum"
     ];
   };
-
-  home.activation.screenshots = lib.hm.dag.entryAnywhere ''
-    $DRY_RUN_CMD mkdir -p $HOME/screenshots
-  '';
-
-  programs.git = {
-    enable = true;
-    userName = "Vincent Ambo";
-    userEmail = "mail@tazj.in";
-    extraConfig = {
-      pull.rebase = true;
-      init.defaultBranch = "canon";
-    };
-  };
-
-  programs.fish = {
-    enable = true;
-    interactiveShellInit = ''
-      ${pkgs.zoxide}/bin/zoxide init fish | source
-    '';
-  };
-
-  services.screen-locker = {
-    enable = true;
-    enableDetectSleep = true;
-    inactiveInterval = 10; # minutes
-    lockCmd = "${depot.users.tazjin.screenLock}/bin/tazjin-screen-lock";
-  };
-
-  services.picom = {
-    enable = true;
-    vSync = true;
-    backend = "glx";
-  };
-
-  # Enable the dunst notification daemon, but force the
-  # configuration file separately instead of going via the strange
-  # Nix->dunstrc encoding route.
-  services.dunst.enable = true;
-  xdg.configFile."dunst/dunstrc" = {
-    source = depot.users.tazjin.dotfiles.dunstrc;
-    onChange = ''
-      ${pkgs.procps}/bin/pkill -u "$USER" ''${VERBOSE+-e} dunst || true
-    '';
-  };
-
-  systemd.user.startServices = true;
 }
-- 
cgit 1.4.1