From 1444fd91c8ca2dc94efaff57725867516f8a1776 Mon Sep 17 00:00:00 2001
From: tristan <tristan@tristans.cloud>
Date: Fri, 9 Feb 2024 22:09:03 +0000
Subject: [PATCH] add auto-login module

---
 flake.nix                                     | 21 ++++++++++++-------
 .../{personal.nix => personal/default.nix}    |  2 +-
 home/programs/{ => personal}/kodi.nix         |  0
 nixos/programs/auto-login.nix                 | 13 ++++++++++++
 nixos/programs/hyprland.nix                   | 18 ----------------
 nixos/programs/sway.nix                       | 18 ----------------
 6 files changed, 28 insertions(+), 44 deletions(-)
 rename home/programs/{personal.nix => personal/default.nix} (95%)
 rename home/programs/{ => personal}/kodi.nix (100%)
 create mode 100644 nixos/programs/auto-login.nix
 delete mode 100644 nixos/programs/hyprland.nix
 delete mode 100644 nixos/programs/sway.nix

diff --git a/flake.nix b/flake.nix
index f2a4275..739e664 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,6 +21,7 @@
     pkgs = import inputs.nixpkgs {inherit system;};
     user = "tristan";
     userFullname = "Tristan Beedell";
+    auto-login = import ./nixos/programs/auto-login.nix;
 
     mkConf = import ./lib/mkconf.nix {inherit inputs system user userFullname;};
   in {
@@ -29,22 +30,24 @@
       zenix =
         mkConf [
           ./hardware/zenix.nix
-          ./nixos/programs/hyprland.nix
+          (auto-login "Hyprland")
           ./nixos/programs/gamer.nix
           ./nixos/programs/personal.nix
           ./nixos/programs/anki.nix
         ] [
           ./home/programs/gamer.nix
-          ./home/programs/personal.nix
+          ./home/programs/hyprland.nix
+          ./home/programs/personal/.
         ];
 
       FCS-Tristan-Nixbook =
         mkConf [
           ./hardware/fcs-tristan-nixbook.nix
-          ./nixos/programs/hyprland.nix
+          (auto-login "Hyprland")
           ./nixos/modules/work.nix
         ] [
           ./home/programs/work.nix
+          ./home/programs/hyprland.nix
         ];
 
       vm-sway =
@@ -57,8 +60,10 @@
         mkConf
         [
           ./hardware/vm.nix
-          ./nixos/programs/sway.nix
-        ] [];
+          (auto-login "sway")
+        ] [
+          ./home/programs/sway.nix
+        ];
 
       vm-hyprland =
         builtins.trace ''
@@ -72,8 +77,10 @@
         mkConf
         [
           ./hardware/vm.nix
-          ./nixos/programs/hyprland.nix
-        ] [];
+          (./nixos/programs/auto-login.nix "Hyprland")
+        ] [
+          ./home/programs/hyprland.nix
+        ];
 
       vm-tty = mkConf [
         ./hardware/vm.nix
diff --git a/home/programs/personal.nix b/home/programs/personal/default.nix
similarity index 95%
rename from home/programs/personal.nix
rename to home/programs/personal/default.nix
index e1fe7f3..0bec39e 100644
--- a/home/programs/personal.nix
+++ b/home/programs/personal/default.nix
@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   imports = [
-    ./programs/kodi.nix
+    ./kodi.nix
   ];
   roles.email = {
     enable = true;
diff --git a/home/programs/kodi.nix b/home/programs/personal/kodi.nix
similarity index 100%
rename from home/programs/kodi.nix
rename to home/programs/personal/kodi.nix
diff --git a/nixos/programs/auto-login.nix b/nixos/programs/auto-login.nix
new file mode 100644
index 0000000..71cf167
--- /dev/null
+++ b/nixos/programs/auto-login.nix
@@ -0,0 +1,13 @@
+command: {config, ...}: let
+  user = config.user;
+in {
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        inherit command;
+        user = user;
+      };
+    };
+  };
+}
diff --git a/nixos/programs/hyprland.nix b/nixos/programs/hyprland.nix
deleted file mode 100644
index dfe83df..0000000
--- a/nixos/programs/hyprland.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{config, ...}: let
-  user = config.user;
-in {
-  services.greetd = {
-    enable = true;
-    settings = rec {
-      hypr_session = {
-        command = "Hyprland";
-        user = user;
-      };
-      default_session = hypr_session;
-    };
-  };
-
-  home-manager.users.${user}.imports = [
-    ../../home/programs/hyprland.nix
-  ];
-}
diff --git a/nixos/programs/sway.nix b/nixos/programs/sway.nix
deleted file mode 100644
index 5748c73..0000000
--- a/nixos/programs/sway.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{config, ...}: let
-  user = config.user;
-in {
-  services.greetd = {
-    enable = true;
-    settings = rec {
-      sway_session = {
-        command = "sway";
-        user = user;
-      };
-      default_session = sway_session;
-    };
-  };
-
-  home-manager.users.${user}.imports = [
-    ../../home/programs/sway.nix
-  ];
-}