diff --git a/flake.lock b/flake.lock index 4f6ecdf..c56ea0c 100644 --- a/flake.lock +++ b/flake.lock @@ -44,9 +44,7 @@ }, "dwarffs": { "inputs": { - "nix": [ - "nix" - ], + "nix": "nix", "nixpkgs": [ "nixpkgs" ] @@ -73,11 +71,11 @@ ] }, "locked": { - "lastModified": 1653971985, - "narHash": "sha256-BxahBocT7OuJkAOV3LwLTaAjhoBQOZnnpaVCswGVLXM=", + "lastModified": 1653994544, + "narHash": "sha256-AgUcuxeFEAqxp3rS2vUwvHhhgq6rfhdKKdrIcsfOtl8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "563a7a4b38efb5c99ef4638bfa8064136c05b19f", + "rev": "00cbfa093fc1a9769271f0a9ea019b1ccc569482", "type": "github" }, "original": { @@ -212,24 +210,20 @@ "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1653936575, - "narHash": "sha256-W6aTsTpCTb+vXQEXDjnKqetOuJmEfSuK2CXvAMqwo74=", + "lastModified": 1646337190, + "narHash": "sha256-7rdubErpmKjNlmjR1GfwAyazJeqUnJUw/Xf1uon/BqQ=", "owner": "NixOS", "repo": "nix", - "rev": "daa14b89103b1246e8d7297ffe8ac5b4f4c8c45c", + "rev": "b09baf690bb00125805a02e0feae9636b2114599", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "latest-release", - "repo": "nix", - "type": "github" + "id": "nix", + "type": "indirect" } }, "nixos-hardware": { @@ -250,18 +244,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1653920503, - "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", + "lastModified": 1632864508, + "narHash": "sha256-d127FIvGR41XbVRDPVvozUPQ/uRHbHwvfyKHwEt5xFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", + "rev": "82891b5e2c2359d7e58d08849e4c89511ab94234", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-21.05-small", + "type": "indirect" } }, "nixpkgs-21_05": { @@ -358,6 +351,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1653920503, + "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1626852498, "narHash": "sha256-lOXUJvi0FJUXHTVSiC5qsMRtEUgqM4mGZpMESLuGhmo=", @@ -379,9 +388,8 @@ "emacs-overlay": "emacs-overlay", "flake-utils-plus": "flake-utils-plus", "home-manager": "home-manager", - "nix": "nix", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "simple-nixos-mailserver": "simple-nixos-mailserver", "sops-nix": "sops-nix" @@ -390,7 +398,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-21_05": "nixpkgs-21_05", "nixpkgs-21_11": "nixpkgs-21_11", "utils": "utils" diff --git a/flake.nix b/flake.nix index f076c3c..837c0bf 100644 --- a/flake.nix +++ b/flake.nix @@ -6,10 +6,11 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - nix = { - url = "github:NixOS/nix?ref=latest-release"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #nix = { + # url = "github:NixOS/nix?ref=latest-release"; + # url = "github:NixOS/nix"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; nixos-hardware = { url = "github:NixOS/nixos-hardware/master"; @@ -41,7 +42,7 @@ dwarffs = { url = "github:edolstra/dwarffs"; inputs = { - nix.follows = "nix"; + #nix.follows = "nix"; nixpkgs.follows = "nixpkgs"; }; }; @@ -85,7 +86,7 @@ unstable = channels.nixpkgs-unstable; }) (flake-utils-plus.lib.genPkgOverlay inputs.comma "comma") - inputs.nix.overlay + #inputs.nix.overlay inputs.emacs-overlay.overlay ]; diff --git a/machines/stel-xps/default.nix b/machines/stel-xps/default.nix index dd85a88..5090758 100644 --- a/machines/stel-xps/default.nix +++ b/machines/stel-xps/default.nix @@ -22,6 +22,9 @@ # dpi = 180; }; + # enable deamon to generate nix-index-db + nix-index-db-update.enable = false; + # add TUD vpn openvpn.enable = true;