From 8b73315235c690a95cb8b83feb42d1eba0fd4122 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Fri, 3 Jul 2020 11:59:36 +0300 Subject: [PATCH] Update --- flake.lock | 66 ++++++++++---------------- flake.nix | 8 +--- modules/applications/emacs/default.nix | 1 + modules/openvpn.nix | 6 --- modules/packages.nix | 10 +--- modules/services.nix | 1 - modules/workspace/mopidy.nix | 1 + 7 files changed, 29 insertions(+), 64 deletions(-) diff --git a/flake.lock b/flake.lock index f5eb272..12675e9 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "NUR": { "flake": false, "locked": { - "lastModified": 1592760432, - "narHash": "sha256-x9IcjohICpEhLAkdFKR090wR27B8SyTnVbw/9RVnt0s=", + "lastModified": 1593719873, + "narHash": "sha256-AK0s3BOp7qO/d1vGL6Lh7hLjbqv3Zjo9KIr61UjBD78=", "owner": "nix-community", "repo": "NUR", - "rev": "f8162f2ee1d26d850f3ed56dec9337ca5f9a9e15", + "rev": "8654e8b452aee888d4cc67c649b70ddf1f50ea5e", "type": "github" }, "original": { @@ -53,11 +53,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1589826413, - "narHash": "sha256-0qaxqdvPhRiaxtRLdhIYS384gP2VtHG2CzlxZzbfhwI=", + "lastModified": 1591751635, + "narHash": "sha256-KgGtyFlkI/fsp+j8VEgJ/ynY9B91aX35Xp04HlDLRTo=", "owner": "rycee", "repo": "home-manager", - "rev": "a7a96ab121a3df4386499ebaacf23e726f0c5711", + "rev": "b3fee796fcd5531693d9b84ece76ad6836bb1cfa", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1591915976, - "narHash": "sha256-roNsxAHI5gj+nFHrrqndKYj6EGmHXrYu1YmOm/4AZIk=", + "lastModified": 1593628299, + "narHash": "sha256-TG05BV4fbJdDW4RzoYBYaGdFtOq6NNet1JHjP1Au/VE=", "owner": "NixOS", "repo": "nix", - "rev": "7db879e65e83b1c65206b490d36a69e97c5a877a", + "rev": "6ff9aa8df7ce8266147f74c65e2cc529a1e72ce0", "type": "github" }, "original": { @@ -151,11 +151,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1591946521, - "narHash": "sha256-Z9WtCDcSETJ6+wTIxNFjSFeWg3yJDAKc1nH2p6mm96s=", + "lastModified": 1591748508, + "narHash": "sha256-GdYYaYsSBgYUhbDT1JJQ7vEgo8FWeW/AW7/qqJuCvRA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e45ff84e2343b86022b92973a8e15d5dd31147ab", + "rev": "1d8c4410687390f9b8f92dbe6ff39fd8fc2b17c6", "type": "github" }, "original": { @@ -163,23 +163,6 @@ "type": "indirect" } }, - "nixpkgs-mopidy": { - "flake": false, - "locked": { - "lastModified": 1589905641, - "narHash": "sha256-cpyk1p3FAJ5mK4C012/1JFb7N5yx82dQhqcO/eTg6t8=", - "owner": "NickHU", - "repo": "nixpkgs", - "rev": "cf9ca59fbff587aa69c8ba71d1219a10b8c4444e", - "type": "github" - }, - "original": { - "owner": "NickHU", - "ref": "mopidy", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-old": { "flake": false, "locked": { @@ -200,11 +183,11 @@ "nixpkgs-wayland": { "flake": false, "locked": { - "lastModified": 1591943741, - "narHash": "sha256-/P3XmtsYkC4u0HwzXEanew/hcuqYJiGZG+wLMhS05iw=", + "lastModified": 1593705940, + "narHash": "sha256-e1c9uFMDLrHIcG4UywvptBc01tS69sgC3KQsBvfU4mY=", "owner": "colemickens", "repo": "nixpkgs-wayland", - "rev": "2ec4f2f1793d6434babe5ae506444119b9459a8b", + "rev": "04252c283bbce2b5529caf5293f0f7b72b451f83", "type": "github" }, "original": { @@ -246,11 +229,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1591946521, - "narHash": "sha256-Z9WtCDcSETJ6+wTIxNFjSFeWg3yJDAKc1nH2p6mm96s=", + "lastModified": 1593760204, + "narHash": "sha256-M/c2DTP6EUnSgnBYyVScApeHv5I+NbN57nn+px4bEaI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e45ff84e2343b86022b92973a8e15d5dd31147ab", + "rev": "bdac777becdbb8780c35be4f552c9d4518fe0bdb", "type": "github" }, "original": { @@ -284,7 +267,6 @@ "nix": "nix", "nixos-fhs-compat": "nixos-fhs-compat", "nixpkgs": "nixpkgs_4", - "nixpkgs-mopidy": "nixpkgs-mopidy", "nixpkgs-old": "nixpkgs-old", "nixpkgs-wayland": "nixpkgs-wayland", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -313,11 +295,11 @@ "weechat-notify-send": { "flake": false, "locked": { - "lastModified": 1584284218, - "narHash": "sha256-Fj9FuT1Q97yZMvAvH9oGZJWO8d1QutwBhDalPlRrQnA=", + "lastModified": 1592655950, + "narHash": "sha256-++mxafyBwg48rD6C2ZVpAG5NAg5gNLjFmOqEiJ7axcc=", "owner": "s3rvac", "repo": "weechat-notify-send", - "rev": "3390f91a3af23fc49ebb77771d78732501738241", + "rev": "cc701bdebdb1bf550e36aa8b13c59b47905db2dc", "type": "github" }, "original": { @@ -329,11 +311,11 @@ "weechat-scripts": { "flake": false, "locked": { - "lastModified": 1591820790, - "narHash": "sha256-tPgorP9G6u0nCIvhp8PNedau3aGJK+UExW5gOK2dBcs=", + "lastModified": 1593280070, + "narHash": "sha256-fXRUySZRTwGVa0VWP9Uk8qCwS7s0IUGPCu1H09gPwvQ=", "owner": "weechat", "repo": "scripts", - "rev": "c64cc4acdcb746a1a6582150a4fe5a9eb8f38ef6", + "rev": "ffe29d00cc316d6d38bce3fe028ab081e291b14d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c175901..97df10e 100644 --- a/flake.nix +++ b/flake.nix @@ -3,13 +3,6 @@ "A collection of crap, hacks and copy-paste to make my localhosts boot"; inputs = { - nixpkgs-mopidy = { - type = "github"; - owner = "NickHU"; - repo = "nixpkgs"; - ref = "mopidy"; - flake = false; - }; lambda-launcher = { type = "github"; owner = "balsoft"; @@ -99,6 +92,7 @@ specialArgs = { inherit inputs name; }; }; in genAttrs hosts mkHost; + legacyPackages.x86_64-linux = (builtins.head (builtins.attrValues self.nixosConfigurations)).pkgs; diff --git a/modules/applications/emacs/default.nix b/modules/applications/emacs/default.nix index b6f90f9..0249ee3 100644 --- a/modules/applications/emacs/default.nix +++ b/modules/applications/emacs/default.nix @@ -48,6 +48,7 @@ (github-pullrequest.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [pkgs.git]; })) scad-mode scad-preview + languagetool ]; }; diff --git a/modules/openvpn.nix b/modules/openvpn.nix index 3c0b712..a500c2b 100644 --- a/modules/openvpn.nix +++ b/modules/openvpn.nix @@ -34,12 +34,6 @@ lib.mkIf (! isNull config.secrets.openvpn) { #dhcp-option DNS 8.8.8.8 #dhcp-option DNS 8.8.4.4 - route 149.154.160.0 255.255.240.0 - route 149.154.164.0 255.255.252.0 - route 91.108.4.0 255.255.252.0 - route 91.108.56.0 255.255.252.0 - route 91.108.8.0 255.255.252.0 - -----BEGIN CERTIFICATE----- MIIEyzCCA7OgAwIBAgIJAKPYkg7opAaCMA0GCSqGSIb3DQEBCwUAMIGaMQswCQYD diff --git a/modules/packages.nix b/modules/packages.nix index 3cc6813..84da694 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -23,10 +23,10 @@ in { inherit (nur.balsoft.pkgs) termNote nix-patch; - inherit (inputs.lambda-launcher.packages.x86_64-linux) lambda-launcher; - inherit (old) mautrix-telegram; + inherit (inputs.lambda-launcher.packages.x86_64-linux) lambda-launcher; + inherit old; yt-utilities = @@ -41,12 +41,6 @@ in { buildInputs = [ self.libxslt ]; }); }) - (self: super: builtins.mapAttrs (_: v: pkgs.callPackage v.override { }) { - inherit (import inputs.nixpkgs-mopidy { - localSystem.system = "x86_64-linux"; - }) - mopidy mopidy-gmusic mopidy-mpd mopidy-mpris mopidy-youtube pykka; - }) ]; nixpkgs.config = { allowUnfree = true; diff --git a/modules/services.nix b/modules/services.nix index f39ba9f..5ed23c1 100644 --- a/modules/services.nix +++ b/modules/services.nix @@ -35,7 +35,6 @@ services.nix-serve.enable = config.device == "AMD-Workstation"; services.pcscd.enable = true; - hardware.u2f.enable = true; services.keybase.enable = true; diff --git a/modules/workspace/mopidy.nix b/modules/workspace/mopidy.nix index fccaeb2..ebffd05 100644 --- a/modules/workspace/mopidy.nix +++ b/modules/workspace/mopidy.nix @@ -13,6 +13,7 @@ "") + '' [mpd] hostname = 0.0.0.0 + port = 6600 [audio] output = pulsesink server=127.0.0.1 '';