From bec8f40023118bf6f7c4cd93b2ad22beafcb1274 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@zweili.ch>
Date: Wed, 22 Dec 2021 17:22:57 +0100
Subject: [PATCH] move keeweb package and service into a file

---
 common/desktop.nix                              |  1 -
 home-manager/desktop.nix                        |  2 +-
 .../keeweb.nix => software/keeweb/default.nix}  | 17 +++++++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)
 rename home-manager/{desktop/services/keeweb.nix => software/keeweb/default.nix} (51%)

diff --git a/common/desktop.nix b/common/desktop.nix
index 92c791b..59f7e08 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -10,7 +10,6 @@
     ./docker.nix
     ./restic
     ./droidcam
-    ../home-manager/desktop/services/keeweb.nix
   ];
 
   networking = {
diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
index 581835c..4b6d778 100644
--- a/home-manager/desktop.nix
+++ b/home-manager/desktop.nix
@@ -5,13 +5,13 @@
     ./common/git/git.nix
     ./obsidian.nix
     ./work-desktop.nix
+    ./software/keeweb
     ./software/pycharm
     ./software/signal
     ./software/telegram
   ];
   home.packages = with pkgs; [
     appimage-run
-    keeweb
     unstable.vscode
     unstable.youtube-dl
   ];
diff --git a/home-manager/desktop/services/keeweb.nix b/home-manager/software/keeweb/default.nix
similarity index 51%
rename from home-manager/desktop/services/keeweb.nix
rename to home-manager/software/keeweb/default.nix
index 3982385..953c825 100644
--- a/home-manager/desktop/services/keeweb.nix
+++ b/home-manager/software/keeweb/default.nix
@@ -1,11 +1,16 @@
-# needs to be imported into the main nix config
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 {
+  home.packages = with pkgs; [
+    keeweb
+  ];
+
   systemd.user.services.keeweb = {
-    description = "Keeweb";
-    partOf = [ "graphical-session.target" ];
-    wantedBy = [ "graphical-session.target" ];
-    serviceConfig = {
+    Unit = {
+      description = "KeeWeb";
+      partOf = [ "graphical-session.target" ];
+      wantedBy = [ "graphical-session.target" ];
+    };
+    Service = {
       Type = "simple";
       ExecStart = "${pkgs.keeweb}/bin/keeweb";
       ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";