From 397813c75b3f8d4f6a2b11ba6ba210080d47044b Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Sun, 27 Feb 2022 22:14:59 +0100
Subject: [PATCH] Update configuration

---
 modules/kakoune.nix |  6 ++----
 modules/webapp.nix  | 25 ++++++++++++-------------
 odin.nix            |  6 +++---
 thor.nix            |  6 +++---
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/modules/kakoune.nix b/modules/kakoune.nix
index eef3453..3ab40ff 100644
--- a/modules/kakoune.nix
+++ b/modules/kakoune.nix
@@ -4,17 +4,15 @@ let
     palette.toRgbShortHex colorPalette;
   packages = with pkgs;
     [
-      (makeDesktopItem
+      (pkgs.makeDesktopItem
         {
           name = "kakoune";
-          type = "Application";
           exec = "kak %U";
           icon = "kakoune";
           desktopName = "Kakoune";
           comment = "Kakoune text editor";
           terminal = true;
-          categories = "Development";
-          mimeType = "text/plain;text/*";
+          categories = [ "Development" ];
         })
     ] ++ [
       # editorconfig-core-c
diff --git a/modules/webapp.nix b/modules/webapp.nix
index cf069be..970b5e4 100644
--- a/modules/webapp.nix
+++ b/modules/webapp.nix
@@ -3,26 +3,25 @@
 let
   cmd = link: "${pkgs.google-chrome}/bin/google-chrome-stable --app=${link}";
   links = [
-    { name = "Protonmail"; link = "https://mail.protonmail.com"; categories = "Office"; icon = builtins.fetchurl "https://mail.protonmail.com/assets/coast-228x228.png"; }
-    { name = "YouTube"; link = "https://www.youtube.com"; categories = "AudioVideo"; }
-    { name = "Twitch"; link = "https://www.twitch.tv"; icon = builtins.fetchurl "https://static.twitchcdn.net/assets/favicon-32-e29e246c157142c94346.png"; categories = "AudioVideo"; }
-    { name = "Netflix"; link = "https://www.netflix.com"; categories = "AudioVideo"; icon = builtins.fetchurl "https://assets.nflxext.com/us/ffe/siteui/common/icons/nficon2016.png"; }
-    { name = "Prime Video"; link = "https://primevideo.com"; categories = "AudioVideo"; icon = builtins.fetchurl "https://m.media-amazon.com/images/G/01/digital/video/DVUI/favicons/apple-touch-icon-152x152._CB527404565_.png"; }
-    { name = "Google Keep"; link = "https://keep.google.com"; categories = "Office"; icon = builtins.fetchurl "https://ssl.gstatic.com/keep/keep_2020q4v2.ico"; }
-    { name = "Google Calendar"; link = "https://google.com/calendar"; categories = "Calendar;Office"; icon = builtins.fetchurl "https://calendar.google.com/googlecalendar/images/favicons_2020q4/calendar_31_256.ico"; }
-    { name = "Notion"; link = "https://notion.so"; categories = "Office"; icon = builtins.fetchurl "https://www.notion.so/images/logo-ios.png"; }
-    { name = "WhatsApp"; link = "https://web.whatsapp.com/"; }
+    { desktopName = "Protonmail"; link = "https://mail.protonmail.com"; categories = [ "Office" ]; icon = builtins.fetchurl "https://mail.protonmail.com/assets/coast-228x228.png"; }
+    { desktopName = "YouTube"; link = "https://www.youtube.com"; categories = [ "AudioVideo" ]; }
+    { desktopName = "Twitch"; link = "https://www.twitch.tv"; icon = builtins.fetchurl "https://static.twitchcdn.net/assets/favicon-32-e29e246c157142c94346.png"; categories = [ "AudioVideo" ]; }
+    { desktopName = "Netflix"; link = "https://www.netflix.com"; categories = [ "AudioVideo" ]; icon = builtins.fetchurl "https://assets.nflxext.com/us/ffe/siteui/common/icons/nficon2016.png"; }
+    { desktopName = "Prime Video"; link = "https://primevideo.com"; categories = [ "AudioVideo" ]; icon = builtins.fetchurl "https://m.media-amazon.com/images/G/01/digital/video/DVUI/favicons/apple-touch-icon-152x152._CB527404565_.png"; }
+    { desktopName = "Google Keep"; link = "https://keep.google.com"; categories = [ "Office" ]; icon = builtins.fetchurl "https://ssl.gstatic.com/keep/keep_2020q4v2.ico"; }
+    { desktopName = "Google Calendar"; link = "https://google.com/calendar"; categories = [ "Calendar" "Office" ]; icon = builtins.fetchurl "https://calendar.google.com/googlecalendar/images/favicons_2020q4/calendar_31_256.ico"; }
+    { desktopName = "Notion"; link = "https://notion.so"; categories = [ "Office" ]; icon = builtins.fetchurl "https://www.notion.so/images/logo-ios.png"; }
+    { desktopName = "WhatsApp"; link = "https://web.whatsapp.com/"; }
   ];
   webAppBuilder =
-    { name
+    { desktopName
+    , name ? builtins.replaceStrings [ " " ] [ "_" ] desktopName
     , link
     , icon ? lib.toLower name
-    , desktopName ? name
     , comment ? null
-    , categories ? "Network"
+    , categories ? [ "Network" ]
     }: pkgs.makeDesktopItem {
       inherit name icon desktopName comment categories;
-      type = "Application";
       exec = cmd link;
     };
 in
diff --git a/odin.nix b/odin.nix
index 2cb0c47..f986352 100644
--- a/odin.nix
+++ b/odin.nix
@@ -97,9 +97,9 @@
       pavucontrol
       pcmanfm
       pentablet-driver
-      procps-ng
+      procps
       ripgrep
-      skype
+      skypeforlinux
       spotify
       tdesktop
       teams
@@ -108,7 +108,7 @@
       virt-manager
       wget
       # wineFull
-      wireguard
+      wireguard-tools
       xclip
       xournalpp
       yq
diff --git a/thor.nix b/thor.nix
index 6ba49fb..1c4ce31 100644
--- a/thor.nix
+++ b/thor.nix
@@ -81,9 +81,9 @@
       openvpn
       pavucontrol
       pentablet-driver
-      procps-ng
+      procps
       ripgrep
-      skype
+      skypeforlinux
       # slack
       spotify
       tdesktop
@@ -93,7 +93,7 @@
       virt-manager
       wget
       # wineFull
-      wireguard
+      wireguard-tools
       xclip
       xournalpp
       zoom-us