From d2336f16a66816ca9f0ac77163ea482415e5ed48 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Tue, 16 Jul 2024 22:04:08 +0200
Subject: [PATCH] move users config into modules

---
 home-modules/default.nix                 |  1 +
 home-modules/users/default.nix           |  6 ++++
 home-modules/users/jopejoe1/default.nix  | 36 ++++++++++++++++++++++++
 nixos-modules/users/jopejoe1/default.nix | 13 ++-------
 4 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 home-modules/users/default.nix
 create mode 100644 home-modules/users/jopejoe1/default.nix

diff --git a/home-modules/default.nix b/home-modules/default.nix
index cab677e..1181ed5 100644
--- a/home-modules/default.nix
+++ b/home-modules/default.nix
@@ -9,5 +9,6 @@
     ./gpg
     ./nushell
     ./sway
+    ./users
   ];
 }
diff --git a/home-modules/users/default.nix b/home-modules/users/default.nix
new file mode 100644
index 0000000..9f3cf27
--- /dev/null
+++ b/home-modules/users/default.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  imports = [
+    ./jopejoe1
+  ];
+}
diff --git a/home-modules/users/jopejoe1/default.nix b/home-modules/users/jopejoe1/default.nix
new file mode 100644
index 0000000..e46ec25
--- /dev/null
+++ b/home-modules/users/jopejoe1/default.nix
@@ -0,0 +1,36 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.jopejoe1.users.jopejoe1;
+in
+{
+  options.jopejoe1.users.jopejoe1 = {
+    enable = lib.mkEnableOption "Enable jopejoe1 user";
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.nushell = {
+      enable = true;
+    };
+    jopejoe1 = {
+      common = {
+        enable = true;
+      };
+      nushell.enable = true;
+      git.enable = true;
+      direnv.enable = true;
+      sway.enable = true;
+      firefox.enable = config.jopejoe1.common.gui;
+    };
+    catppuccin = {
+      enable = true;
+      flavor = "frappe";
+      accent = "mauve";
+    };
+  };
+}
diff --git a/nixos-modules/users/jopejoe1/default.nix b/nixos-modules/users/jopejoe1/default.nix
index 234314c..44aee7d 100644
--- a/nixos-modules/users/jopejoe1/default.nix
+++ b/nixos-modules/users/jopejoe1/default.nix
@@ -64,7 +64,7 @@ in
       jopejoe1 = {
         common = {
           enable = true;
-          gui.enable = config.jopejoe1.gui.enable;
+          gui = config.jopejoe1.gui.enable;
           fonts = {
             serif = config.fonts.fontconfig.defaultFonts.serif;
             sansSerif = config.fonts.fontconfig.defaultFonts.sansSerif;
@@ -72,16 +72,7 @@ in
             emoji = config.fonts.fontconfig.defaultFonts.emoji;
           };
         };
-        nushell.enable = true;
-        git.enable = true;
-        direnv.enable = true;
-        sway.enable = true;
-        firefox.enable = config.jopejoe1.gui.enable;
-      };
-      catppuccin = {
-        enable = true;
-        flavor = "frappe";
-        accent = "mauve";
+        users.jopejoe1.enable = true;
       };
     };
   };