From 7b5bf013daf1038cc11872868e6822eb14eb2861 Mon Sep 17 00:00:00 2001
From: Miran Bastaja <miran.bastaja04@gmail.com>
Date: Thu, 7 Mar 2024 00:34:30 +0100
Subject: Slim down client machines, fix some issues

- completely remove emacs module
- use nixpkgs hyprland package instead of the flake
- fix tofi desktop file cache issue
- update flake lock
- wonderland: remove madhatter
- remove hyprdesktop module from clients' sharedModules and move it into
  the users' individual modules wherever it's needed
---
 hosts/underworld/home.nix | 20 ++++----------------
 hosts/wonderland/home.nix | 10 ++--------
 2 files changed, 6 insertions(+), 24 deletions(-)

(limited to 'hosts')

diff --git a/hosts/underworld/home.nix b/hosts/underworld/home.nix
index 9132a42..4e3b519 100644
--- a/hosts/underworld/home.nix
+++ b/hosts/underworld/home.nix
@@ -1,30 +1,18 @@
-{ flakeRoot
-, inputs
-, pkgs
-, ...
-}: {
+{ flakeRoot, inputs, ... }: {
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    sharedModules = [{
-      imports = [
-        (flakeRoot + /share/home/hyprdesktop.nix)
-        (flakeRoot + /share/home/fish.nix)
-      ];
-    }];
+    sharedModules = [{ imports = [ (flakeRoot + /share/home/fish.nix) ]; }];
     extraSpecialArgs = { inherit inputs; };
   };
 
   home-manager.users.osiris = {
     imports = [
+      (flakeRoot + /share/home/hyprdesktop.nix)
       (flakeRoot + /share/home/gallery-dl.nix)
     ];
-    home.packages = with pkgs; [ mullvad tor tor-browser ];
-
     home.stateVersion = "23.11";
   };
 
-  home-manager.users.root = {
-    home.stateVersion = "23.11";
-  };
+  home-manager.users.root.home.stateVersion = "23.11";
 }
diff --git a/hosts/wonderland/home.nix b/hosts/wonderland/home.nix
index 759f728..753ad85 100644
--- a/hosts/wonderland/home.nix
+++ b/hosts/wonderland/home.nix
@@ -8,7 +8,6 @@
     useUserPackages = true;
     sharedModules = [{
       imports = [
-        (flakeRoot + /share/home/hyprdesktop.nix)
         (flakeRoot + /share/home/fish.nix)
       ];
     }];
@@ -17,6 +16,7 @@
 
   home-manager.users.alice = {
     imports = [
+      (flakeRoot + /share/home/hyprdesktop.nix)
       (flakeRoot + /share/home/gallery-dl.nix)
     ];
 
@@ -26,11 +26,5 @@
     home.stateVersion = "22.05";
   }; # End of users.alice
 
-  home-manager.users.madhatter = {
-    home.stateVersion = "23.05";
-  };
-
-  home-manager.users.root = {
-    home.stateVersion = "22.05";
-  };
+  home-manager.users.root.home.stateVersion = "22.05";
 }
-- 
cgit v1.3.1