From 693410597aab78188d3060c21edcc6952d2950e6 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Fri, 22 Mar 2024 09:36:42 +0100
Subject: [PATCH 1/3] Desktop/ssh-agent: use home-manager module

---
 roles/desktop/services/ssh-agent.nix | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/roles/desktop/services/ssh-agent.nix b/roles/desktop/services/ssh-agent.nix
index 6f734f8..56fea6b 100644
--- a/roles/desktop/services/ssh-agent.nix
+++ b/roles/desktop/services/ssh-agent.nix
@@ -1,19 +1,3 @@
 {...}: {
-  programs.ssh.startAgent = true;
-  /*
-  Home assistant added an option that does this
-  https://github.com/nix-community/home-manager/commit/2d9210f25ed18d5d4e11e6b886de4027c0c51a94
-  but since I still need to fix home-manager's envvars not applying I'll stick to the NixOS one
-  */
-  /*
-  TODO: fix SSH_AUTH_SOCK not being set in Plasma
-  Turns out the NixOS module also has issues :3
-  The env is set but only in bash, not in the DE, so
-  keepass can't pick it up. For now I'll just set it manually
-  */
-  home-manager.users.toast.xdg.configFile."plasma-workspace/env/ssh-agent.sh".text = ''
-    if [[ -z "$SSH_AUTH_SOCK" ]]; then
-    	export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent
-    fi
-  '';
+  home-manager.users.toast.services.ssh-agent.enable = true;
 }

From 233581eccba465833ef898e879510e8fff68c038 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Fri, 22 Mar 2024 10:00:09 +0100
Subject: [PATCH 2/3] Gaming/steam: remove proton and steam linux runtime
 desktop files

---
 roles/gaming/programs/steam.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/roles/gaming/programs/steam.nix b/roles/gaming/programs/steam.nix
index baf9b11..afbfb67 100644
--- a/roles/gaming/programs/steam.nix
+++ b/roles/gaming/programs/steam.nix
@@ -20,7 +20,13 @@
     else false;
 
   # Celeste mod manager
-  home-manager.users.toast.services.flatpak.packages = [
-    "io.github.everestapi.Olympus"
-  ];
+  home-manager.users.toast = {
+    systemd.user.tmpfiles.rules = [
+      "r '/%h/.local/share/applications/Steam Linux Runtime *.desktop'"
+      "r '/%h/.local/share/applications/Proton *.desktop'"
+    ];
+    services.flatpak.packages = [
+      "io.github.everestapi.Olympus"
+    ];
+  };
 }

From a07ddd315c890ecdd26c8c2caaa3b1a63a90ff04 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Fri, 22 Mar 2024 10:30:38 +0100
Subject: [PATCH 3/3] Common: add atuin

---
 roles/common/programs/atuin.nix   | 15 +++++++++++++++
 roles/common/programs/default.nix |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 roles/common/programs/atuin.nix

diff --git a/roles/common/programs/atuin.nix b/roles/common/programs/atuin.nix
new file mode 100644
index 0000000..ecfe0b9
--- /dev/null
+++ b/roles/common/programs/atuin.nix
@@ -0,0 +1,15 @@
+{...}: {
+  home-manager.users.toast.programs.atuin = {
+    enable = true;
+    settings = {
+      enter_accept = false;
+      workspaces = true;
+      stats = {
+        common_prefix = [
+          "sudo"
+          ","
+        ];
+      };
+    };
+  };
+}
diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix
index feff14d..2f0dd22 100755
--- a/roles/common/programs/default.nix
+++ b/roles/common/programs/default.nix
@@ -13,6 +13,7 @@
     ./btop.nix
     ./helix.nix
     ./direnv.nix
+    ./atuin.nix
   ];
   # Some programs dont have a programs.*.enable option, so I install their package here
   environment.systemPackages = with pkgs; [