From 770d8cc913d3ec55732fb57020d44502156dc3a6 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 21 Jun 2020 21:48:26 +0300 Subject: [PATCH] Update lambda-launcher --- flake.lock | 51 +++++++++++++++++++++----- flake.nix | 5 +++ modules/applications.nix | 59 ++++++++++++++++--------------- modules/applications/packages.nix | 3 +- modules/packages.nix | 4 ++- 5 files changed, 84 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index efc8912..f5eb272 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "NUR": { "flake": false, "locked": { - "lastModified": 1591945664, - "narHash": "sha256-ChFW3QGFwokXp7YAkjXtXgGa8xkWiEsvOM/GyHGFIfY=", + "lastModified": 1592760432, + "narHash": "sha256-x9IcjohICpEhLAkdFKR090wR27B8SyTnVbw/9RVnt0s=", "owner": "nix-community", "repo": "NUR", - "rev": "eb18cceff0fb3b2c1e65dbba7eee94cbf3872bd1", + "rev": "f8162f2ee1d26d850f3ed56dec9337ca5f9a9e15", "type": "github" }, "original": { @@ -67,6 +67,24 @@ "type": "github" } }, + "lambda-launcher": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1592763689, + "narHash": "sha256-qUA7qgDr9jgMVGM//OALAphpRb05u2tDxSEE0XLxumg=", + "owner": "balsoft", + "repo": "lambda-launcher", + "rev": "031fec7e39efe64bd08b58860d0868f8205c1fbd", + "type": "github" + }, + "original": { + "owner": "balsoft", + "repo": "lambda-launcher", + "type": "github" + } + }, "materia-theme": { "flake": false, "locked": { @@ -101,7 +119,7 @@ }, "nix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1591915976, @@ -196,6 +214,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1592754205, + "narHash": "sha256-CQzP4Ur/lNGKQQCQlA5E44rmJmZcAparDDHAus5evH4=", + "owner": "balsoft", + "repo": "nixpkgs", + "rev": "a50dd17125c2923e30ff06aeafdfee29b9be9ade", + "type": "github" + }, + "original": { + "owner": "balsoft", + "ref": "fix-gi-gtk-declarative", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1591633336, "narHash": "sha256-oVXv4xAnDJB03LvZGbC72vSVlIbbJr8tpjEW5o/Fdek=", @@ -210,7 +244,7 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1591946521, "narHash": "sha256-Z9WtCDcSETJ6+wTIxNFjSFeWg3yJDAKc1nH2p6mm96s=", @@ -224,7 +258,7 @@ "type": "indirect" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1587390417, "narHash": "sha256-dLQebnBviLNiN2Ei3Iqyxm73EFwz77YcvitvMYwRNA8=", @@ -244,11 +278,12 @@ "NUR": "NUR", "base16-unclaimed-schemes": "base16-unclaimed-schemes", "home-manager": "home-manager", + "lambda-launcher": "lambda-launcher", "materia-theme": "materia-theme", "mobile-broadband-provider-info": "mobile-broadband-provider-info", "nix": "nix", "nixos-fhs-compat": "nixos-fhs-compat", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-mopidy": "nixpkgs-mopidy", "nixpkgs-old": "nixpkgs-old", "nixpkgs-wayland": "nixpkgs-wayland", @@ -310,7 +345,7 @@ "yt-utilities": { "inputs": { "haskell-nix": "haskell-nix", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1588006875, diff --git a/flake.nix b/flake.nix index f799da4..c175901 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,11 @@ ref = "mopidy"; flake = false; }; + lambda-launcher = { + type = "github"; + owner = "balsoft"; + repo = "lambda-launcher"; + }; NUR = { type = "github"; owner = "nix-community"; diff --git a/modules/applications.nix b/modules/applications.nix index ff3a399..79035f2 100755 --- a/modules/applications.nix +++ b/modules/applications.nix @@ -15,7 +15,7 @@ with import ../support.nix { inherit lib config; }; { name = "emacsclient"; text = '' #!${pkgs.bash}/bin/bash - ${pkgs.emacs}/bin/emacsclient -s /tmp/emacs1000/server -c $@''; + ${config.home-manager.users.balsoft.programs.emacs.finalPackage}/bin/emacsclient -s /tmp/emacs1000/server -c $@''; executable = true; }); desktop = "emacsclient"; @@ -53,33 +53,36 @@ with import ../support.nix { inherit lib config; }; { desktop = "gnumeric"; }; }; - home-manager.users.balsoft.xdg.mimeApps.defaultApplications = + home-manager.users.balsoft.xdg.mimeApps = { + enable = true; + defaultApplications = - with config.defaultApplications; - builtins.mapAttrs (name: value: - if value ? desktop then [ "${value.desktop}.desktop" ] else value) { - "text/html" = browser; - "image/*" = { desktop = "org.kde.gwenview"; }; - "application/x-bittorrent" = torrent; - "application/zip" = archive; - "application/rar" = archive; - "application/7z" = archive; - "application/*tar" = archive; - "application/x-kdenlive" = archive; - "x-scheme-handler/http" = browser; - "x-scheme-handler/https" = browser; - "x-scheme-handler/about" = browser; - "x-scheme-handler/unknown" = browser; - "x-scheme-handler/mailto" = mail; - "application/pdf" = { desktop = "org.kde.okular"; }; - "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = - text_processor; - "application/msword" = text_processor; - "application/vnd.oasis.opendocument.text" = text_processor; - "text/csv" = spreadsheet; - "application/vnd.oasis.opendocument.spreadsheet" = spreadsheet; - "text/plain" = - editor; # This actually makes Emacs an editor for everything... XDG is wierd - }; + with config.defaultApplications; + builtins.mapAttrs (name: value: + if value ? desktop then [ "${value.desktop}.desktop" ] else value) { + "text/html" = browser; + "image/*" = { desktop = "org.kde.gwenview"; }; + "application/x-bittorrent" = torrent; + "application/zip" = archive; + "application/rar" = archive; + "application/7z" = archive; + "application/*tar" = archive; + "application/x-kdenlive" = archive; + "x-scheme-handler/http" = browser; + "x-scheme-handler/https" = browser; + "x-scheme-handler/about" = browser; + "x-scheme-handler/unknown" = browser; + "x-scheme-handler/mailto" = mail; + "application/pdf" = { desktop = "org.kde.okular"; }; + "application/vnd.openxmlformats-officedocument.wordprocessingml.document" = + text_processor; + "application/msword" = text_processor; + "application/vnd.oasis.opendocument.text" = text_processor; + "text/csv" = spreadsheet; + "application/vnd.oasis.opendocument.spreadsheet" = spreadsheet; + "text/plain" = + editor; # This actually makes Emacs an editor for everything... XDG is wierd + }; + }; }; } diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix index f6cd8a1..747374b 100644 --- a/modules/applications/packages.nix +++ b/modules/applications/packages.nix @@ -34,8 +34,9 @@ xdg_utils nheko git-crypt - nix-patch inputs.yt-utilities.defaultPackage.x86_64-linux + lambda-launcher + nix-patch pass-wayland papirus-icon-theme ] ++ (with pkgs.kdeApplications; [ diff --git a/modules/packages.nix b/modules/packages.nix index 82de8a3..3cc6813 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -21,7 +21,9 @@ in { nurpkgs = pkgs; }).repos; - inherit (nur.balsoft.pkgs) termNote lambda-launcher nix-patch; + inherit (nur.balsoft.pkgs) termNote nix-patch; + + inherit (inputs.lambda-launcher.packages.x86_64-linux) lambda-launcher; inherit (old) mautrix-telegram;