move more packages to software

home-manager/desktop.nix

@@ -2,10 +2,10 @@
 {
   imports = [
     ./common.nix
-    ./common/git/git.nix
-    ./obsidian.nix
     ./work-desktop.nix
+    ./software/git
     ./software/keeweb
+    ./software/obsidian
     ./software/pycharm
     ./software/signal
     ./software/telegram

home-manager/ubuntu.nix

@@ -2,7 +2,7 @@
 {
   imports = [
     ./common.nix
-    ./common/git/git.nix
+    ./software/git
   ];
 
   programs.git.userEmail = "andreas@zweili.ch";

home-manager/work-wsl.nix

@@ -2,7 +2,7 @@
 {
   imports = [
     ./common.nix
-    ./common/git/git.nix
+    ./software/git
   ];
   programs.git.userEmail = "zweili@contria.com";