From 8ce232f5d250e1bf8feb3bd100e7f8248468223f Mon Sep 17 00:00:00 2001
From: Bad <bad@badat.dev>
Date: Fri, 1 Jul 2022 21:32:23 +0200
Subject: [PATCH] Unify desktop and laptop user configs

---
 suites/default.nix              |  6 +++---
 users/mae-desk/default.nix      |  7 -------
 users/mae-lap/default.nix       |  7 -------
 users/mae/default.nix           | 37 +++++++++++++++++++++++++++++++++
 users/mae/home-manager-base.nix | 27 ------------------------
 users/mae/user.nix              | 11 ----------
 6 files changed, 40 insertions(+), 55 deletions(-)
 delete mode 100644 users/mae-desk/default.nix
 delete mode 100644 users/mae-lap/default.nix
 create mode 100644 users/mae/default.nix
 delete mode 100644 users/mae/home-manager-base.nix
 delete mode 100644 users/mae/user.nix

diff --git a/suites/default.nix b/suites/default.nix
index 2e1fe5d..24619c8 100644
--- a/suites/default.nix
+++ b/suites/default.nix
@@ -1,7 +1,7 @@
 { profiles, ... }:
 with profiles; rec {
   base = [ users.root core dnscrypt ];
-  workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix ];
-  desktop = workstation ++ [ users.mae-desk amd three_dee ];
-  lap = workstation ++ [ users.mae-lap laptop bluetooth print ];
+  workstation = base ++ [ sway develop game profiles.workstation ssh flatpak torrents pwn tor rust virtualization java networkmanager pipewire flatpak peerix users.mae ];
+  desktop = workstation ++ [ amd three_dee ];
+  lap = workstation ++ [ laptop bluetooth print ];
 }
diff --git a/users/mae-desk/default.nix b/users/mae-desk/default.nix
deleted file mode 100644
index 04d4601..0000000
--- a/users/mae-desk/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home-manager.users.mae = {
-    imports = [ ../mae/home-manager-base.nix ];
-  };
-  users = (import ../mae/user.nix { inherit pkgs; });
-}
diff --git a/users/mae-lap/default.nix b/users/mae-lap/default.nix
deleted file mode 100644
index 04d4601..0000000
--- a/users/mae-lap/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home-manager.users.mae = {
-    imports = [ ../mae/home-manager-base.nix ];
-  };
-  users = (import ../mae/user.nix { inherit pkgs; });
-}
diff --git a/users/mae/default.nix b/users/mae/default.nix
new file mode 100644
index 0000000..14b6527
--- /dev/null
+++ b/users/mae/default.nix
@@ -0,0 +1,37 @@
+{ pkgs, ... }:
+{
+  users.users.mae = {
+    uid = 1000;
+
+    isNormalUser = true;
+    hashedPassword = "$6$vyS4lqYbl3$OXztJnAC5ZayA4eCBSIRlYtsi9u1HnafsfNL28l4CJh0BISVlSj6D48CA80cshnvYW/EEzfEj7z4zTNFpJAT/.";
+    shell = pkgs.zsh;
+    extraGroups = [ "wheel" "video" "lp" "scanner" "adbusers" "render" "libvirtd" "podman" "docker" ];
+  };
+  home-manager.users.mae = {pkgs, ...}: {
+    imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ../profiles/syncthing ../profiles/kdeconnect ../profiles/podman ../profiles/alacritty ../profiles/tmux ../profiles/mpv ../profiles/sway ];
+
+    home.sessionVariables = {
+      XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share";
+      EDITOR = "${pkgs.neovim}/bin/nvim";
+      MOZ_ENABLE_WAYLAND = 1;
+    };
+    home.stateVersion = "18.09";
+    gtk = {
+      enable = true;
+
+      theme = {
+        name = "Arc-Dark";
+        package = pkgs.arc-theme;
+      };
+
+      gtk3.extraConfig = {
+        gtk-application-prefer-dark-theme = true;
+      };
+    };
+    programs.go = {
+      enable = true;
+      goPath = ".local/go";
+    };
+  };
+}
diff --git a/users/mae/home-manager-base.nix b/users/mae/home-manager-base.nix
deleted file mode 100644
index c9a67fb..0000000
--- a/users/mae/home-manager-base.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ pkgs, ... }:
-{
-  imports = [ ../profiles/direnv ../profiles/git ../profiles/zsh ../profiles/neovim ../profiles/syncthing ../profiles/kdeconnect ../profiles/podman ../profiles/alacritty ../profiles/tmux ../profiles/mpv ../profiles/sway ];
-
-  home.sessionVariables = {
-    XDG_DATA_DIRS = "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:$HOME/.local/share/flatpak/exports/share";
-    EDITOR = "${pkgs.neovim}/bin/nvim";
-    MOZ_ENABLE_WAYLAND = 1;
-  };
-  home.stateVersion = "18.09";
-  gtk = {
-    enable = true;
-
-    theme = {
-      name = "Arc-Dark";
-      package = pkgs.arc-theme;
-    };
-
-    gtk3.extraConfig = {
-      gtk-application-prefer-dark-theme = true;
-    };
-  };
-  programs.go = {
-    enable = true;
-    goPath = ".local/go";
-  };
-}
diff --git a/users/mae/user.nix b/users/mae/user.nix
deleted file mode 100644
index 054f83c..0000000
--- a/users/mae/user.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-{
-  users.mae = {
-    uid = 1000;
-
-    isNormalUser = true;
-    hashedPassword = "$6$vyS4lqYbl3$OXztJnAC5ZayA4eCBSIRlYtsi9u1HnafsfNL28l4CJh0BISVlSj6D48CA80cshnvYW/EEzfEj7z4zTNFpJAT/.";
-    shell = pkgs.zsh;
-    extraGroups = [ "wheel" "video" "lp" "scanner" "adbusers" "render" "libvirtd" "podman" "docker" ];
-  };
-}