From 5f0040da7235995e1e0f04a0409a0ad2b44a82a4 Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Sun, 16 Apr 2023 11:40:59 +0530 Subject: [PATCH] update --- flake.lock | 132 ++++++++++++++++++++++++++++----------------- flake.nix | 8 ++- system/default.nix | 2 +- 3 files changed, 91 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 0708686..aec1180 100644 --- a/flake.lock +++ b/flake.lock @@ -7,7 +7,7 @@ "nixpkgs" ], "poetry2nix": "poetry2nix", - "utils": "utils_2" + "utils": "utils" }, "locked": { "lastModified": 1680308980, @@ -151,12 +151,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -180,6 +183,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -228,15 +249,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1681127522, - "narHash": "sha256-Eo4dd0AmKshM+A6msQRMwT42QvWGNxa8RjmZ4tY7g9E=", + "lastModified": 1681586243, + "narHash": "sha256-vdP79IZuDZVNSl4RN1LgEuab1Tkbv4gCxiE8VLdRf7U=", "owner": "nix-community", "repo": "home-manager", - "rev": "93f5cb2482dd20e57eb8ca6c819cdad9738f98a0", + "rev": "40ebb62101c83de81e5fd7c3cfe5cea2ed21b1ad", "type": "github" }, "original": { @@ -255,11 +275,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1681138040, - "narHash": "sha256-yek+1+ofYGgLT2x03dIjQgHDj0r7MvaoNNNNXY1dF10=", + "lastModified": 1681604834, + "narHash": "sha256-C+S7iViWG/N0ueax8WPTCQ5q1/IYZ1x2avzgvAtij50=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "56a307d734e1284b3d3fb490a59e50014285fa88", + "rev": "c86f06caa0be207882266947da67125177bba5af", "type": "github" }, "original": { @@ -315,14 +335,16 @@ ], "nixpkgs-test": "nixpkgs-test", "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { - "lastModified": 1681126332, - "narHash": "sha256-OTaVsjqnGCNgq3czNZ074qNdd1g1cRyUvOLZSvSNl6c=", + "lastModified": 1681503721, + "narHash": "sha256-jWmTTUejSCa5qO0D/FJMbgXKdFEllRdvA+jG0KX+MfY=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f0cc345caa9eb3f8e033ddd74865f57b35825170", + "rev": "83a357eb7c261c82e2fa6412216b3c4f8f0d1d18", "type": "github" }, "original": { @@ -347,11 +369,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1681036984, - "narHash": "sha256-AbScJXshYzbeUKHh+Y3OICc3iAtr+NqJ3Xb81GW+ptU=", + "lastModified": 1681465517, + "narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd531dee22c9a3d4336cc2da39e8dd905e8f3de4", + "rev": "abe7316dd51a313ce528972b104f4f04f56eefc4", "type": "github" }, "original": { @@ -437,11 +459,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1680988170, - "narHash": "sha256-QCl2A80m3p/lkRCO9C/PipdkV9I1mbqhnFftjoY4dQ8=", + "lastModified": 1681569130, + "narHash": "sha256-Q89X46ghC1AfDxm8gp83112sOJxde2Y6P2wz7boXJGw=", "owner": "pta2002", "repo": "nixvim", - "rev": "b6706fa0ec59f37b35bd4c6f3f3be0011bf14964", + "rev": "a9e3ff3f73929499dd726295ffc0cd5f80b5619d", "type": "github" }, "original": { @@ -489,11 +511,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1680769543, - "narHash": "sha256-b+aLX7w2cVsHtTTs1wgKsYeNw3SKyMn9Qkb42RK5Yx8=", + "lastModified": 1681413034, + "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "bb9e597b33641a8df00f17334db55fa10981c94f", + "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5", "type": "github" }, "original": { @@ -538,26 +560,23 @@ "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixvim": "nixvim" + "nixvim": "nixvim", + "rust-overlay": "rust-overlay" } }, "rust-overlay": { "inputs": { - "flake-utils": [ - "lanzaboote", - "flake-utils" - ], + "flake-utils": "flake-utils_4", "nixpkgs": [ - "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1681093076, - "narHash": "sha256-6uLZNeuP5jDDGlFkXgcoAxsJhTKy8yUTw25zdLHzdxE=", + "lastModified": 1681611682, + "narHash": "sha256-gT4wfOdVyxtB3NV5U914uAOqzFYMdNK8ObPmtqHxlUg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "45c2ed9dd1397526dad35fc867c43955d87f9f3f", + "rev": "18cdcb7b4017f266117a4d164f9d71c0535ef5ec", "type": "github" }, "original": { @@ -566,6 +585,36 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1678901627, @@ -581,21 +630,6 @@ "type": "github" } }, - "utils_2": { - "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 578acb2..adfdeb3 100644 --- a/flake.nix +++ b/flake.nix @@ -20,9 +20,15 @@ url = "github:nix-community/impermanence"; }; + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + lanzaboote = { url = "github:nix-community/lanzaboote"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.rust-overlay.follows = "rust-overlay"; }; nixvim = { @@ -31,7 +37,7 @@ }; }; - outputs = { self, nixpkgs, home-manager, hyprland, impermanence, lanzaboote, nixos-hardware, nixvim }@inputs: { + outputs = { self, nixpkgs, home-manager, hyprland, impermanence, lanzaboote, nixos-hardware, nixvim, rust-overlay }@inputs: { formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".nixpkgs-fmt; nixosConfigurations = { Skipper = nixpkgs.lib.nixosSystem { diff --git a/system/default.nix b/system/default.nix index e700474..6d8ae31 100644 --- a/system/default.nix +++ b/system/default.nix @@ -11,7 +11,7 @@ ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - boot.cleanTmpDir = true; + boot.tmp.cleanOnBoot = true; console.useXkbConfig = true; environment.sessionVariables = {