diff --git a/flake.lock b/flake.lock index 43a2f25..c5f1fea 100644 --- a/flake.lock +++ b/flake.lock @@ -49,6 +49,23 @@ "type": "github" } }, + "crate2nix_2": { + "flake": false, + "locked": { + "lastModified": 1608814925, + "narHash": "sha256-GdFBG2LmpbY4C1OJBFfWLMKXzGyFq4mJBK+SVMNNE+8=", + "owner": "balsoft", + "repo": "crate2nix", + "rev": "68be3d90f31bf0bfd525da77e0ae6e89f48abd24", + "type": "github" + }, + "original": { + "owner": "balsoft", + "ref": "tools-nix-version-comparison", + "repo": "crate2nix", + "type": "github" + } + }, "crdt": { "flake": false, "locked": { @@ -133,6 +150,37 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1606424373, + "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1614513358, + "narHash": "sha256-LakhOx3S1dRjnh0b5Dg3mbZyH0ToC9I8Y2wKSkBaTzU=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5466c5bbece17adaab2d82fae80b46e807611bf3", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "haskell-nix": { "locked": { "lastModified": 1587989559, @@ -149,9 +197,31 @@ "type": "github" } }, + "himalaya": { + "inputs": { + "crate2nix": "crate2nix", + "flake-compat": "flake-compat_3", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1621010971, + "narHash": "sha256-45f23KNCn1EamHdfTGFT4Q7FV7UazJaZfHJe84KUwzI=", + "owner": "soywod", + "repo": "himalaya", + "rev": "c9e1609ea98c0bdb46994058e99f644494f61f1e", + "type": "github" + }, + "original": { + "owner": "soywod", + "repo": "himalaya", + "type": "github" + } + }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1620423550, @@ -169,7 +239,7 @@ }, "lambda-launcher": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1612816152, @@ -242,7 +312,7 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1620308124, @@ -339,6 +409,37 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1617636226, + "narHash": "sha256-iZhBWrOR2DoDs1C+0FlnM9AQLMol/qoGQ+d+S43CKJM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3d1a7716d7f1fccbd7d30ab3b2ed3db831f43bde", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1617325113, + "narHash": "sha256-GksR0nvGxfZ79T91UUtWjjccxazv6Yh/MvEJ82v1Xmw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "54c1e44240d8a527a8f4892608c4bce5440c3ecb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1620425984, "narHash": "sha256-RwHSY3jyQ6YAOTjeppfIBcfR+Y/0GNwKOIP3N9MTYQI=", @@ -352,7 +453,7 @@ "type": "indirect" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { "lastModified": 1592810120, "narHash": "sha256-1xlD1OIs75DvjkWpyZcQBjdu/IgugspPpz8CsBeutaM=", @@ -368,7 +469,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1614309161, "narHash": "sha256-93kRxDPyEW9QIpxU71kCaV1r+hgOgP6/aVgC7vvO8IU=", @@ -383,7 +484,7 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1620340338, "narHash": "sha256-Op/4K0+Z9Sp5jtFH0s/zMM4H7VFZxrekcAmjQ6JpQ4w=", @@ -399,7 +500,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1599773960, "narHash": "sha256-5bL52aaUOOyOBjgKh9/6jQlFbeE+WfVX7dpvjohmD+w=", @@ -414,7 +515,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1587390417, "narHash": "sha256-dLQebnBviLNiN2Ei3Iqyxm73EFwz77YcvitvMYwRNA8=", @@ -454,13 +555,14 @@ "deploy-rs": "deploy-rs", "emacs-overlay": "emacs-overlay", "flake-compat": "flake-compat_2", + "himalaya": "himalaya", "home-manager": "home-manager", "lambda-launcher": "lambda-launcher", "materia-theme": "materia-theme", "nix": "nix", "nix-zsh-completions": "nix-zsh-completions", "nixos-fhs-compat": "nixos-fhs-compat", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_7", "nixpkgs-old": "nixpkgs-old", "nixpkgs-wayland": "nixpkgs-wayland", "pipewire": "pipewire", @@ -474,6 +576,25 @@ "yt-utilities": "yt-utilities" } }, + "rust-overlay": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1617848844, + "narHash": "sha256-nhPuATSHRrzfZNjtl8zmMhZklYFCHiQd7+uf+jQbd+o=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "70330a767d25daa6063e89e38d68b94b2d971831", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "simple-nixos-mailserver": { "flake": false, "locked": { @@ -492,8 +613,8 @@ }, "simple-osd-daemons": { "inputs": { - "crate2nix": "crate2nix", - "nixpkgs": "nixpkgs_6" + "crate2nix": "crate2nix_2", + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1615418763, @@ -556,6 +677,21 @@ "type": "github" } }, + "utils_2": { + "locked": { + "lastModified": 1617631617, + "narHash": "sha256-PARRCz55qN3gy07VJZIlFeOX420d0nGF0RzGI/9hVlw=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b2c27d1a81b0dc266270fa8aeecebbd1807fc610", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "wee-slack": { "flake": false, "locked": { @@ -607,7 +743,7 @@ "yt-utilities": { "inputs": { "haskell-nix": "haskell-nix", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1588006875, diff --git a/flake.nix b/flake.nix index 45c849c..25f9fb8 100644 --- a/flake.nix +++ b/flake.nix @@ -71,6 +71,7 @@ url = "git+https://gitlab.freedesktop.org/pvir/pipewire?ref=bt-mic-volume"; flake = false; }; + himalaya.url = "github:soywod/himalaya"; }; outputs = { nixpkgs, nix, self, deploy-rs, ... }@inputs: { diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix index 39a9615..bbfdd00 100644 --- a/modules/applications/packages.nix +++ b/modules/applications/packages.nix @@ -41,5 +41,6 @@ gnome3.simple-scan shellcheck proselint + inputs.himalaya.defaultPackage.x86_64-linux ]; }