From 380dcc5c148fb58a475e281f46aec446d866c1ff Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 26 Nov 2019 12:23:16 +0100
Subject: satoshipad: start and assign ripcord at startup

---
 user/satoshipad.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'user')

diff --git a/user/satoshipad.nix b/user/satoshipad.nix
index 2fd24fea..e20a8931 100644
--- a/user/satoshipad.nix
+++ b/user/satoshipad.nix
@@ -29,10 +29,12 @@
     config = {
       assigns = {
         "1" = [{ class = "^Firefox Developer Edition$"; }];
+        "2" = [{ class = "^Ripcord$"; }];
         "6" = [{ class = "^Emacs$"; }];
       };
       startup = [
         { command = "firefox-devedition"; }
+        { command = "ripcord"; }
         { command = "emacs"; }
       ];
     };
-- 
cgit 1.4.1


From 8bdea73adc7e5df81b23cd64a1a1a3ad1f7f98df Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 26 Nov 2019 12:23:38 +0100
Subject: satoshipad: set browser to Firefox Developer Edition

---
 user/satoshipad.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user')

diff --git a/user/satoshipad.nix b/user/satoshipad.nix
index e20a8931..445f28a3 100644
--- a/user/satoshipad.nix
+++ b/user/satoshipad.nix
@@ -24,6 +24,7 @@
   ];
 
   home.sessionVariables.EMAIL = "alan@satoshipay.io";
+  home.sessionVariables.BROWSER = "firefox-devedition";
 
   xsession.windowManager.i3 = {
     config = {
-- 
cgit 1.4.1


From eeb20ec76fd4c3c48af600462bb8a8e12a5dbbd1 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 26 Nov 2019 12:57:32 +0100
Subject: Update ripcord to 0.4.21

---
 user/packages/ripcord/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'user')

diff --git a/user/packages/ripcord/default.nix b/user/packages/ripcord/default.nix
index 659de92e..1a1c015b 100644
--- a/user/packages/ripcord/default.nix
+++ b/user/packages/ripcord/default.nix
@@ -1,13 +1,13 @@
 { pkgs, lib, fetchurl, ... }:
 
 let
-  version = "0.4.20";
+  version = "0.4.21";
 in
 pkgs.appimageTools.wrapType2 {
   name = "ripcord";
 
   src = fetchurl {
     url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage";
-    sha256 = "3a300d994164be4c6ab6de58267a97f419155d5e4995ee375baaf2f0b0a9db1d";
+    sha256 = "63a16a1369bc9c6d7b24c12044e3d2e341264f65ac38bd16bf01576f6cceb3df";
   };
 }
-- 
cgit 1.4.1


From b3fb3c581c5914db69a764388705070c4886b6fd Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 26 Nov 2019 12:58:10 +0100
Subject: ripcord: use standard package naming convention

---
 user/packages/ripcord/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'user')

diff --git a/user/packages/ripcord/default.nix b/user/packages/ripcord/default.nix
index 1a1c015b..f4874119 100644
--- a/user/packages/ripcord/default.nix
+++ b/user/packages/ripcord/default.nix
@@ -1,13 +1,18 @@
 { pkgs, lib, fetchurl, ... }:
 
 let
+  pname = "ripcord";
   version = "0.4.21";
 in
-pkgs.appimageTools.wrapType2 {
-  name = "ripcord";
+pkgs.appimageTools.wrapType2 rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage";
     sha256 = "63a16a1369bc9c6d7b24c12044e3d2e341264f65ac38bd16bf01576f6cceb3df";
   };
+
+  extraInstallCommands = ''
+    mv $out/bin/{${name},${pname}}
+  '';
 }
-- 
cgit 1.4.1


From 09d261ca71408893c14da39cf8299d2d9e2c678b Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 26 Nov 2019 12:58:25 +0100
Subject: ripcord: add a desktop item

---
 user/packages/ripcord/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'user')

diff --git a/user/packages/ripcord/default.nix b/user/packages/ripcord/default.nix
index f4874119..02f1cf0e 100644
--- a/user/packages/ripcord/default.nix
+++ b/user/packages/ripcord/default.nix
@@ -1,8 +1,17 @@
-{ pkgs, lib, fetchurl, ... }:
+{ pkgs, lib, fetchurl, makeDesktopItem, ... }:
 
 let
   pname = "ripcord";
   version = "0.4.21";
+
+  desktopItem = makeDesktopItem {
+    name = "Ripcord";
+    exec = "ripcord";
+    comment = "Desktop chat client for Slack (and Discord)";
+    desktopName = "Ripcord";
+    categories = "Network;InstantMessaging;Chat";
+    genericName = "Team messenger";
+  };
 in
 pkgs.appimageTools.wrapType2 rec {
   name = "${pname}-${version}";
@@ -14,5 +23,6 @@ pkgs.appimageTools.wrapType2 rec {
 
   extraInstallCommands = ''
     mv $out/bin/{${name},${pname}}
+    ${desktopItem.buildCommand}
   '';
 }
-- 
cgit 1.4.1