From 861f58946b33b55930e4c54bd45c7d9dfa43e8c0 Mon Sep 17 00:00:00 2001
From: Sam <samual.shop@proton.me>
Date: Thu, 6 Jun 2024 18:07:59 +0100
Subject: [PATCH] added zotero package and persist cinnamon-monitors.xml

---
 .../optional/desktop/common/default.nix       |  3 +-
 home/sparky.nix                               | 10 ++--
 hosts/common/users/media/default.nix          | 53 ++++++++++---------
 3 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/home/common/optional/desktop/common/default.nix b/home/common/optional/desktop/common/default.nix
index 037c9d6..15bf3dc 100644
--- a/home/common/optional/desktop/common/default.nix
+++ b/home/common/optional/desktop/common/default.nix
@@ -1,4 +1,4 @@
-{pkgs, ... }: {
+{ pkgs, ... }: {
   imports = [
     ./firefox.nix
     ./alacritty.nix
@@ -11,5 +11,6 @@
     pkgs.zathura
     pkgs.xfce.thunar
     pkgs.kcolorchooser
+    pkgs.zotero
   ];
 }
diff --git a/home/sparky.nix b/home/sparky.nix
index fec9160..8b938dd 100644
--- a/home/sparky.nix
+++ b/home/sparky.nix
@@ -1,15 +1,11 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
+{ inputs
+, ...
 }: {
   imports = [
     # Import users
     ./users/media
 
     ./common/core
-    ./common/optional/sops.nix
 
     # Import optional
     ./common/optional/git.nix
@@ -17,4 +13,6 @@
     ./common/optional/desktop/cinnamon
 
   ];
+
+  colorScheme = inputs.nix-colors.colorSchemes.kanagawa;
 }
diff --git a/hosts/common/users/media/default.nix b/hosts/common/users/media/default.nix
index f1e1f3a..3a8f470 100644
--- a/hosts/common/users/media/default.nix
+++ b/hosts/common/users/media/default.nix
@@ -16,9 +16,9 @@ in
     openssh.authorizedKeys.keys = lib.lists.forEach pubKeys (key: builtins.readFile key);
 
     extraGroups =
-       [
-         "wheel"
-       ];
+      [
+        "wheel"
+      ];
 
     packages = with pkgs; [
       flatpak
@@ -28,19 +28,20 @@ in
 
   environment.persistence."/persist" = {
     hideMounts = true;
-    users.${username}= {
-        directories = [
-          "Sync"
-          "Keep"
-          ".ssh"
-          ".config/dconf"
-          ".config/cinnamon"
-          ".config/nemo"
-	        ".mozilla"
-	        ".local"
-        ];
-        files = [
-        ];
+    users.${username} = {
+      directories = [
+        "Sync"
+        "Keep"
+        ".ssh"
+        ".config/dconf"
+        ".config/cinnamon"
+        ".config/nemo"
+        ".mozilla"
+        ".local"
+      ];
+      files = [
+        ".config/cinnamon-monitors.xml"
+      ];
     };
   };
 
@@ -53,7 +54,7 @@ in
       path = "/home/${username}/.ssh/id_ed25519";
       mode = "0600";
       owner = "${username}";
-      };
+    };
     "ssh_keys/${username}/id_ed25519.pub" = {
       path = "/home/${username}/.ssh/id_ed25519.pub";
       mode = "0644";
@@ -64,14 +65,16 @@ in
   # The containing ssh folders are created as root and if this is the first ~/.ssh/ entry when writing keys,
   # the ownership is busted and home-manager can't target because it can't write into .ssh...
   # FIXME: We might not need this depending on how https://github.com/Mic92/sops-nix/issues/381 is fixed
-  system.activationScripts.sopsSetSshOwnwership = let
-    sshFolder = "/home/${username}/.ssh";
-    user = config.users.users.${username}.name;
-    group = config.users.users.${username}.group;
-  in ''
-    mkdir -p ${sshFolder} || true
-    chown -R ${user}:${group} /home/${username}/.ssh
-  '';
+  system.activationScripts.sopsSetSshOwnwership =
+    let
+      sshFolder = "/home/${username}/.ssh";
+      user = config.users.users.${username}.name;
+      group = config.users.users.${username}.group;
+    in
+    ''
+      mkdir -p ${sshFolder} || true
+      chown -R ${user}:${group} /home/${username}/.ssh
+    '';
 
   services.flatpak.enable = true;