From 2a7ae8db063a9581005484f8e2c249ff3978b98a Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Mon, 18 Mar 2024 11:06:21 +0100
Subject: [PATCH] fixup! unify home-manager configurations of workmac and main
 laptop

---
 home/common.nix           |  3 ---
 home/desktop.nix          |  3 +++
 home/modules/packages.nix |  2 +-
 home/workmac.nix          | 14 +++++++-------
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/home/common.nix b/home/common.nix
index 9b1e892..2156be7 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -38,9 +38,6 @@
     terminal = "screen-256color";
   };
 
-  # for backwards compatibility
-  services.lorri.enable = true;
-
   fonts.fontconfig.enable = true;
 
   programs.git = {
diff --git a/home/desktop.nix b/home/desktop.nix
index 2c5a2c1..31d33b1 100644
--- a/home/desktop.nix
+++ b/home/desktop.nix
@@ -23,6 +23,9 @@
     latex.guiTools = true;
   };
 
+  # for backwards compatibility
+  services.lorri.enable = true;
+
   programs.git =
     let
       # TODO profile specific
diff --git a/home/modules/packages.nix b/home/modules/packages.nix
index 0c05a15..93718f2 100644
--- a/home/modules/packages.nix
+++ b/home/modules/packages.nix
@@ -154,7 +154,7 @@ let
 
   games = [
     superTuxKart
-    hedgewars
+    #hedgewars
   ];
 
   desktopApps = [
diff --git a/home/workmac.nix b/home/workmac.nix
index 408f055..9bb5bf7 100644
--- a/home/workmac.nix
+++ b/home/workmac.nix
@@ -18,9 +18,6 @@ in
     nixHelpers = true;
     devTools = true;
     pythonTools = true;
-    games = true;
-    desktop = true;
-    kde = true;
   };
 
   home.packages = [
@@ -52,7 +49,7 @@ in
 
   programs.git =
     let
-      contacts = import ./secrets/contacts.nix;
+      contacts = import "${inputs.mysecrets}/contacts.nix";
     in
     {
       includes =
@@ -83,9 +80,12 @@ in
     };
 
   # some extra shell scripts
-  programs.zsh.initExtra =
-    lib.mkAfter (import ./scripts/reporsync.nix { inherit pkgs; })
-    + (import ./scripts/ssh-loop-fc.nix { inherit pkgs; });
+  programs.zsh.initExtra = lib.mkAfter (
+    import ./scripts/reporsync.nix { inherit pkgs; }
+    + import ./scripts/ssh-loop-fc.nix { inherit pkgs; }
+  );
+
+  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "1password-cli" ];
 
   home.stateVersion = "22.05";
 }