From d8601a39dcb381d8f8f045d620046441e01cdbe6 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Fri, 15 Dec 2023 08:31:31 +0100
Subject: [PATCH] further home manager migrations

---
 flake.lock                                | 12 ++++-----
 flake.nix                                 |  4 +--
 nixos/homes/common/packages.nix           | 31 ++++++++++++++++++-----
 nixos/homes/palo/packages/development.nix |  2 --
 nixos/homes/palo/packages/graphics.nix    |  2 +-
 nixos/homes/palo/ssh.nix                  |  2 ++
 nixos/system/desktop/default.nix          |  2 +-
 7 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4363dad..1092601 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1185,18 +1185,16 @@
     },
     "private_assets": {
       "locked": {
+        "dirtyRev": "ee1b2c870d19e0ed1fe15f8501499e4561ec55b2-dirty",
+        "dirtyShortRev": "ee1b2c8-dirty",
         "lastModified": 1699629396,
-        "narHash": "sha256-SfrvKUU31pytn5IHUqH1tXt2jqM4EMdeDOR5xxHO6B8=",
-        "ref": "main",
-        "rev": "ee1b2c870d19e0ed1fe15f8501499e4561ec55b2",
-        "revCount": 17,
+        "narHash": "sha256-IPSyCKFKk6y/lEpzZKd5YiQuzZRqZKBqDS8/EyJXdHU=",
         "type": "git",
-        "url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git"
+        "url": "file:///home/palo/dev/nixos/nixos-private-assets"
       },
       "original": {
-        "ref": "main",
         "type": "git",
-        "url": "ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git"
+        "url": "file:///home/palo/dev/nixos/nixos-private-assets"
       }
     },
     "retiolum": {
diff --git a/flake.nix b/flake.nix
index 36bb283..f229387 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,8 +42,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     private_assets = {
-      #url = "git+file:///home/palo/dev/nixos/nixos-private-assets";
-      url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git?ref=main";
+      url = "git+file:///home/palo/dev/nixos/nixos-private-assets";
+      #url = "git+ssh://gitea@git.ingolf-wagner.de/palo/nixos-private-assets.git?ref=main";
       flake = true;
     };
     retiolum = {
diff --git a/nixos/homes/common/packages.nix b/nixos/homes/common/packages.nix
index debb0d5..b3ffcd0 100644
--- a/nixos/homes/common/packages.nix
+++ b/nixos/homes/common/packages.nix
@@ -1,13 +1,32 @@
-{ pkgs, ... }:
+{ config, pkgs, lib, ... }:
 with pkgs;
+with lib;
 {
-  home.packages = [
-    bind.dnsutils
-    nmap
-    hexyl
+  config = mkMerge [
+    {
+      home.packages = [
+        bind.dnsutils
+        nmap
+        hexyl
 
-    units
+        units
+      ];
+    }
+    (mkIf config.gui.enable {
+      home.packages = [
+        libreoffice
+        hunspell
+        hunspellDicts.de-de
+        hunspellDicts.en-us
+        aspell
+        aspellDicts.de
+        aspellDicts.en
+        aspellDicts.es
 
+        joplin-desktop
 
+        #yt-dlp
+      ];
+    })
   ];
 }
diff --git a/nixos/homes/palo/packages/development.nix b/nixos/homes/palo/packages/development.nix
index 1f978f6..3c4cd77 100644
--- a/nixos/homes/palo/packages/development.nix
+++ b/nixos/homes/palo/packages/development.nix
@@ -10,8 +10,6 @@ with lib;
       home.packages =
         let
 
-
-
           # to make copilot work
           # jetbrains.pycharm-professional
           fhsPyCharm = pkgs.buildFHSUserEnv {
diff --git a/nixos/homes/palo/packages/graphics.nix b/nixos/homes/palo/packages/graphics.nix
index e590803..e17ec23 100644
--- a/nixos/homes/palo/packages/graphics.nix
+++ b/nixos/homes/palo/packages/graphics.nix
@@ -12,7 +12,7 @@ with lib;
       gimp
       inkscape
       imagemagick
-      sxiv
+      nsxiv
       blender
       lightburn
       darktable
diff --git a/nixos/homes/palo/ssh.nix b/nixos/homes/palo/ssh.nix
index 4c5efb8..76a1f1b 100644
--- a/nixos/homes/palo/ssh.nix
+++ b/nixos/homes/palo/ssh.nix
@@ -1,5 +1,7 @@
 { pkgs, lib, config, ... }:
 {
+
+  home.packages = [ pkgs.sshuttle ];
   programs.ssh.enable = true;
   programs.ssh.matchBlocks = {
     "*" = {
diff --git a/nixos/system/desktop/default.nix b/nixos/system/desktop/default.nix
index e548913..bd708d3 100644
--- a/nixos/system/desktop/default.nix
+++ b/nixos/system/desktop/default.nix
@@ -3,7 +3,7 @@
   imports = [
 
     ../all
-    ./packages.nix
+    #./packages.nix
     ./yubikey.nix
   ];