diff options
| author | Alan Pearce | 2019-11-26 23:24:52 +0100 |
|---|---|---|
| committer | Alan Pearce | 2019-11-26 23:25:29 +0100 |
| commit | 0cb682aa6485f4f9d6fcf4178053fd28f49e81f7 (patch) | |
| tree | 2d7daf8b6e906b28b4d626df5d50200acadee473 | |
| parent | 85484881997989635e719b44889c439e6c8c15a9 (diff) | |
| parent | e59c4f72ce8203882c482718c8e6a9a780e2f964 (diff) | |
| download | nixfiles-0cb682aa6485f4f9d6fcf4178053fd28f49e81f7.tar.lz nixfiles-0cb682aa6485f4f9d6fcf4178053fd28f49e81f7.tar.zst nixfiles-0cb682aa6485f4f9d6fcf4178053fd28f49e81f7.zip | |
Merge branch 'master' of origin/master
| -rw-r--r-- | system/settings/services/xserver.nix | 2 | ||||
| -rw-r--r-- | user/packages/ripcord/default.nix | 25 | ||||
| -rw-r--r-- | user/satoshipad.nix | 3 |
3 files changed, 25 insertions, 5 deletions
diff --git a/system/settings/services/xserver.nix b/system/settings/services/xserver.nix index 4c476794..64bdb238 100644 --- a/system/settings/services/xserver.nix +++ b/system/settings/services/xserver.nix @@ -9,6 +9,8 @@ with lib; i18n.consoleUseXkbConfig = true; + xdg.sounds.enable = false; + environment.systemPackages = with pkgs; [ xorg.xmodmap xorg.xinit diff --git a/user/packages/ripcord/default.nix b/user/packages/ripcord/default.nix index 659de92e..02f1cf0e 100644 --- a/user/packages/ripcord/default.nix +++ b/user/packages/ripcord/default.nix @@ -1,13 +1,28 @@ -{ pkgs, lib, fetchurl, ... }: +{ pkgs, lib, fetchurl, makeDesktopItem, ... }: let - version = "0.4.20"; + 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 { - name = "ripcord"; +pkgs.appimageTools.wrapType2 rec { + name = "${pname}-${version}"; src = fetchurl { url = "https://cancel.fm/dl/Ripcord-${version}-x86_64.AppImage"; - sha256 = "3a300d994164be4c6ab6de58267a97f419155d5e4995ee375baaf2f0b0a9db1d"; + sha256 = "63a16a1369bc9c6d7b24c12044e3d2e341264f65ac38bd16bf01576f6cceb3df"; }; + + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + ${desktopItem.buildCommand} + ''; } diff --git a/user/satoshipad.nix b/user/satoshipad.nix index 2fd24fea..445f28a3 100644 --- a/user/satoshipad.nix +++ b/user/satoshipad.nix @@ -24,15 +24,18 @@ ]; home.sessionVariables.EMAIL = "alan@satoshipay.io"; + home.sessionVariables.BROWSER = "firefox-devedition"; xsession.windowManager.i3 = { config = { assigns = { "1" = [{ class = "^Firefox Developer Edition$"; }]; + "2" = [{ class = "^Ripcord$"; }]; "6" = [{ class = "^Emacs$"; }]; }; startup = [ { command = "firefox-devedition"; } + { command = "ripcord"; } { command = "emacs"; } ]; }; |