From bc0dfc4ad78bec016bd95deba8b2be5b04c32f77 Mon Sep 17 00:00:00 2001
From: Gabriel Fontes <eu@misterio.me>
Date: Tue, 8 Mar 2022 11:07:50 -0300
Subject: [PATCH] alacritty daemon mode, persist entire steam folder

---
 hosts/atlas/default.nix                      |  2 +-
 users/misterio/home/desktop-sway/default.nix |  1 +
 users/misterio/home/desktop-sway/sway.nix    | 12 +++++++-----
 users/misterio/home/games/steam.nix          |  2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/hosts/atlas/default.nix b/hosts/atlas/default.nix
index fb9f628a..dc8e02fa 100644
--- a/hosts/atlas/default.nix
+++ b/hosts/atlas/default.nix
@@ -18,7 +18,7 @@ in
     ../common/postgres.nix
     ../common/steam.nix
 
-    ./factorio.nix
+    # ./factorio.nix
   ];
 
   networking = {
diff --git a/users/misterio/home/desktop-sway/default.nix b/users/misterio/home/desktop-sway/default.nix
index 3a64c559..43afb35f 100644
--- a/users/misterio/home/desktop-sway/default.nix
+++ b/users/misterio/home/desktop-sway/default.nix
@@ -3,6 +3,7 @@
     ./alacritty.nix
     ./discord.nix
     ./font.nix
+    ./firefox.nix
     ./gtk.nix
     ./kdeconnect.nix
     ./mako.nix
diff --git a/users/misterio/home/desktop-sway/sway.nix b/users/misterio/home/desktop-sway/sway.nix
index b82b0021..81adbc7a 100644
--- a/users/misterio/home/desktop-sway/sway.nix
+++ b/users/misterio/home/desktop-sway/sway.nix
@@ -28,6 +28,8 @@ let
   xrandr = "${pkgs.xorg.xrandr}/bin/xrandr";
   yubikey-touch-detector = "${pkgs.yubikey-touch-detector}/bin/yubikey-touch-detector";
   zathura = "${pkgs.zathura}/bin/zathura";
+
+  spawn-alacritty = cmd: "${alacritty} msg create-window ${cmd} || ${alacritty} ${cmd}";
 in
 rec {
   wayland.windowManager.sway = {
@@ -36,7 +38,7 @@ rec {
     wrapperFeatures.gtk = true;
     config = rec {
       modifier = "Mod4";
-      terminal = "${alacritty}";
+      terminal = spawn-alacritty "";
       menu = "${wofi} -S run";
       fonts = {
         names = [ config.fontProfiles.regular.family ];
@@ -244,10 +246,10 @@ rec {
         "${modifier}+control+w" = "exec ${makoctl} invoke";
 
         # Programs
-        "${modifier}+v" = "exec ${terminal} -e $SHELL -i -c ${nvim}";
-        "${modifier}+o" = "exec ${terminal} -e $SHELL -i -c ${octave}";
-        "${modifier}+m" = "exec ${terminal} -e $SHELL -i -c ${neomutt}";
-        "${modifier}+a" = "exec ${terminal} -e $SHELL -i -c ${amfora}";
+        "${modifier}+v" = "exec ${spawn-alacritty "-e $SHELL -i -c ${nvim}"}";
+        "${modifier}+o" = "exec ${spawn-alacritty "-e $SHELL -i -c ${octave}"}";
+        "${modifier}+m" = "exec ${spawn-alacritty "-e $SHELL -i -c ${neomutt}"}";
+        "${modifier}+a" = "exec ${spawn-alacritty "-e $SHELL -i -c ${amfora}"}";
         "${modifier}+b" = "exec ${qutebrowser}";
         "${modifier}+z" = "exec ${zathura}";
 
diff --git a/users/misterio/home/games/steam.nix b/users/misterio/home/games/steam.nix
index c2cf0a38..cf08587a 100644
--- a/users/misterio/home/games/steam.nix
+++ b/users/misterio/home/games/steam.nix
@@ -8,6 +8,7 @@
       directories = [
         "Games/Steam"
         ".local/share/Steam"
+        ".steam"
 
         ".factorio"
         ".config/Hero_Siege"
@@ -17,7 +18,6 @@
         ".local/share/Paradox Interactive"
         ".paradoxlauncher"
       ];
-      files = [ ".steam/steam.token" ".steam/registry.vdf" ];
     };
   };
 }