From ffc6ae96371bbae04ab4e55714d5d19f007fcdc6 Mon Sep 17 00:00:00 2001
From: Tristan Druyen <tristan@vault81.de>
Date: Fri, 20 Oct 2023 13:53:08 +0200
Subject: [PATCH] Sync tester & tristand user conf

---
 flake.lock                           |  6 ++---
 os-mods/{base => common}/default.nix |  0
 systems/nixos-pulse/default.nix      |  2 +-
 users/tester.nix                     | 34 +++-------------------------
 users/tristand.nix                   |  2 +-
 5 files changed, 8 insertions(+), 36 deletions(-)
 rename os-mods/{base => common}/default.nix (100%)

diff --git a/flake.lock b/flake.lock
index 0aa69ea..7a8b4a0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -31,11 +31,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1697769700,
-        "narHash": "sha256-ox9E90lRTKim6rb92kOfvqed+0jOmqgKpsAItsVdGdk=",
+        "lastModified": 1697799469,
+        "narHash": "sha256-9KT+HBqy/wZZ04FDo3Kovjr/utjnleKz4FTo/sbdr8Y=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "7e236c963a46bc712971f9f6ff78f4ea50b64c0f",
+        "rev": "4a09e468458ee95f18c162e69f3d667686fee02a",
         "type": "github"
       },
       "original": {
diff --git a/os-mods/base/default.nix b/os-mods/common/default.nix
similarity index 100%
rename from os-mods/base/default.nix
rename to os-mods/common/default.nix
diff --git a/systems/nixos-pulse/default.nix b/systems/nixos-pulse/default.nix
index ffd0dbe..423a02a 100644
--- a/systems/nixos-pulse/default.nix
+++ b/systems/nixos-pulse/default.nix
@@ -8,7 +8,7 @@
 }: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
-    ../../os-mods/base
+    ../../os-mods/common
     ../../os-mods/desktop
     ../../os-mods/network
     ../../os-mods/virt
diff --git a/users/tester.nix b/users/tester.nix
index 5d58351..475af7b 100644
--- a/users/tester.nix
+++ b/users/tester.nix
@@ -4,47 +4,19 @@
 , system
 , ...
 }:
-let
-  wallpaper = inputs.nix-wallpaper.packages.${pkgs.system}.default.override {
-    logoSize = 24;
-    preset = "gruvbox-dark-rainbow";
-  };
-  wallpaperPath = "${wallpaper}/share/wallpapers/nixos-wallpaper.png";
-in
 {
   imports = [
+    ../home-mods/common
     ../home-mods/dev
+    ../home-mods/desktop
     ../home-mods/firefox
     ../home-mods/plasma
+    ../home-mods/shell
     ../home-mods/virt
   ];
 
   home = {
-    file.".background".source = wallpaperPath;
     username = "tester";
-    homeDirectory = "/home/tester";
-
-    packages = with pkgs.unstable-pkgs; [
-      bitwarden
-      brave
-      btop
-      cavalier
-      freetube
-      imagemagick
-      inkscape
-      jellyfin-media-player
-      kate
-      neofetch
-      nextcloud-client
-      onlyoffice-bin
-      rust-motd
-      rustdesk
-      tutanota-desktop
-      signal-desktop
-      thunderbird
-      zellij
-    ];
-
     stateVersion = "23.05";
   };
 }
diff --git a/users/tristand.nix b/users/tristand.nix
index 072db10..fbf7f9f 100644
--- a/users/tristand.nix
+++ b/users/tristand.nix
@@ -8,11 +8,11 @@
 {
   imports = [
     ../home-mods/common
-    ../home-mods/shell
     ../home-mods/desktop
     ../home-mods/dev
     ../home-mods/firefox
     ../home-mods/plasma
+    ../home-mods/shell
     ../home-mods/virt
   ];