From 5ea44fdee95e9039d488d35a14fa9a1c9329522c Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Thu, 27 Jul 2023 02:05:23 -0700 Subject: [PATCH] Update lockfile --- flake.lock | 187 +++++++++++++++++++++++++++++++++------ modules/user/general.nix | 4 +- 2 files changed, 162 insertions(+), 29 deletions(-) diff --git a/flake.lock b/flake.lock index 23fd743..f085ab6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,29 @@ { "nodes": { + "crane": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "ironbar", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1688772518, + "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", + "owner": "ipetkov", + "repo": "crane", + "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "emacs-overlay": { "inputs": { "flake-utils": [ @@ -25,6 +49,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -43,6 +83,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -73,11 +131,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1690284788, - "narHash": "sha256-6QKfaqw6tU+VF6tLEduxyx+67+FGpsEtl3Rd7riU3uw=", + "lastModified": 1690447864, + "narHash": "sha256-iEbpYIZonILeWlQcRARw8bgTgPg57T/rcR44AbEx/Mk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a9b8e2159c2813a6951d0b0186fbb7f2f8554d3e", + "rev": "ef26f711c90fd1bbf912e76b298718a84d71cc70", "type": "github" }, "original": { @@ -134,11 +192,11 @@ ] }, "locked": { - "lastModified": 1690043288, - "narHash": "sha256-csT+Lla4AVMprI2EJroYweRXRWDbc3xfDaOOUX+INMc=", + "lastModified": 1690361100, + "narHash": "sha256-e3V2avzF3yY+OBWr5fZ5jTHq6Jm2olnmd95E2jAkyCY=", "owner": "hyprwm", "repo": "Hyprpaper", - "rev": "5d896893deb02941817bb4fc93a486a2bf48a794", + "rev": "9261356bd74fadbc544bec22c16aec62ebba13bd", "type": "github" }, "original": { @@ -164,6 +222,8 @@ }, "ironbar": { "inputs": { + "crane": "crane", + "naersk": "naersk", "nixpkgs": [ "nixpkgs" ], @@ -172,11 +232,11 @@ ] }, "locked": { - "lastModified": 1690230704, - "narHash": "sha256-xcYy+NAVE+wtyWvmbDz8WPerqZGG3S1YsShLE1zJ48A=", + "lastModified": 1690408276, + "narHash": "sha256-HNjaROiRBO9wsXj13L0R+neT4qP7+1oyXl4cWaw0hps=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "00d5606f0603884aa22fe120df1aad7ede59acb1", + "rev": "c094179fcab68ab4f53cc55ee78b548209564118", "type": "github" }, "original": { @@ -185,18 +245,34 @@ "type": "github" } }, - "nixpkgs": { + "naersk": { + "inputs": { + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1690179384, - "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a", + "lastModified": 1688534083, + "narHash": "sha256-/bI5vsioXscQTsx+Hk9X5HfweeNZz/6kVKsbdqfwW7g=", + "owner": "nix-community", + "repo": "naersk", + "rev": "abca1fb7a6cfdd355231fc220c3d0302dbb4369a", "type": "github" }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1687412861, + "narHash": "sha256-Z/g0wbL68C+mSGerYS2quv9FXQ1RRP082cAC0Bh4vcs=", + "path": "/nix/store/s1z7nb9n6r5n0r34fabp6yybwkbr8mjk-source", + "rev": "e603dc5f061ca1d8a19b3ede6a8cf9c9fcba6cdc", + "type": "path" + }, "original": { "id": "nixpkgs", - "ref": "nixos-unstable", "type": "indirect" } }, @@ -216,13 +292,28 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1690272529, + "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "nur": { "locked": { - "lastModified": 1690357517, - "narHash": "sha256-ZbClX1V1WWCzYEBwx3/9x7vUY6fTjZGidvWDnbvIcBQ=", + "lastModified": 1690442491, + "narHash": "sha256-P7X5kQYcX0keEBbJgcdtIIb7l68CXXlvjIpgUGlEDZ4=", "owner": "nix-community", "repo": "NUR", - "rev": "d4872f6d5a43f04ed19f780e5d918ac3786e163c", + "rev": "2168d5fff432bb7ee332984712ee32e66ecce651", "type": "github" }, "original": { @@ -241,13 +332,40 @@ "hyprpaper": "hyprpaper", "impurity": "impurity", "ironbar": "ironbar", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nur": "nur", - "rust-overlay": "rust-overlay", + "rust-overlay": "rust-overlay_2", "stable": "stable" } }, "rust-overlay": { + "inputs": { + "flake-utils": [ + "ironbar", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "ironbar", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688351637, + "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "f9b92316727af9e6c7fee4a761242f7f46880329", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "flake-utils": [ "flake-utils" @@ -257,11 +375,11 @@ ] }, "locked": { - "lastModified": 1690338181, - "narHash": "sha256-Sz2oQ9aNS3MVncnCMndr0302G26UrFUfPynoH2iLjsg=", + "lastModified": 1690424156, + "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b7f0b7b58b3c6f14a1377ec31a3d78b23ab843ec", + "rev": "f335a0213504c7e6481c359dc1009be9cf34432c", "type": "github" }, "original": { @@ -272,11 +390,11 @@ }, "stable": { "locked": { - "lastModified": 1690148897, - "narHash": "sha256-l/j/AX1d2K79EWslwgWR2+htkzCbtjKZsS5NbWXnhz4=", + "lastModified": 1690370995, + "narHash": "sha256-9z//23jGegLJrf3ITStLwVf715O39dq5u48Kr/XW14U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac1acba43b2f9db073943ff5ed883ce7e8a40a2c", + "rev": "f3fbbc36b4e179a5985b9ab12624e9dfe7989341", "type": "github" }, "original": { @@ -300,6 +418,21 @@ "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" + } + }, "wlroots": { "flake": false, "locked": { diff --git a/modules/user/general.nix b/modules/user/general.nix index bc1a32c..9741c4c 100644 --- a/modules/user/general.nix +++ b/modules/user/general.nix @@ -6,9 +6,9 @@ system.extraDependencies = with pkgs; [ ungoogled-chromium ]; fonts = { - enableDefaultFonts = false; + enableDefaultPackages = false; - fonts = with inputs.stable.legacyPackages.${system}; [ + packages = with inputs.stable.legacyPackages.${system}; [ dejavu_fonts nerdfonts noto-fonts