From 884a8df73c129e4a2d4e3a12c64a57c4fddf9bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= Date: Tue, 7 Feb 2023 20:03:04 -0300 Subject: [PATCH] update --- flake.lock | 124 +++++++++++++++++++++++-------------------- flake.nix | 3 +- overlays/default.nix | 2 +- user/home.nix | 2 +- 4 files changed, 68 insertions(+), 63 deletions(-) diff --git a/flake.lock b/flake.lock index 1eccf3d..be106fa 100644 --- a/flake.lock +++ b/flake.lock @@ -2,14 +2,15 @@ "nodes": { "agenix": { "inputs": { + "darwin": "darwin", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1673301561, - "narHash": "sha256-gRUWHbBAtMuPDJQXotoI8u6+3DGBIUZHkyQWpIv7WpM=", + "lastModified": 1675176355, + "narHash": "sha256-Qjxh5cmN56siY97mzmBLI1+cdjXSPqmfPVsKxBvHmwI=", "owner": "ryantm", "repo": "agenix", - "rev": "42d371d861a227149dc9a7e03350c9ab8b8ddd68", + "rev": "b7ffcfe77f817d9ee992640ba1f270718d197f28", "type": "github" }, "original": { @@ -34,6 +35,28 @@ "type": "github" } }, + "darwin": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "demoji": { "inputs": { "nixpkgs": [ @@ -124,11 +147,11 @@ "dzgui_2": { "flake": false, "locked": { - "lastModified": 1674502482, - "narHash": "sha256-X3Sze8Quexy2vp3A78+1buvsAwAGQR71aLAXNCHdka0=", + "lastModified": 1674148870, + "narHash": "sha256-VmW0ohXK+9CAr4yGaA/NSW7+E1vUvZthom8MculmOEs=", "owner": "aclist", "repo": "dztui", - "rev": "e76070818c434f43ee4dd4305069c29235a390f4", + "rev": "10c29c0542a07fb81b5922f96b416e3a2e8079cc", "type": "github" }, "original": { @@ -250,11 +273,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1672244468, - "narHash": "sha256-xaZb8AZqoXRCSqPusCk4ouf+fUNP8UJdafmMTF1Ltlw=", + "lastModified": 1674440933, + "narHash": "sha256-CASRcD/rK3fn5vUCti3jzry7zi0GsqRsBohNq9wPgLs=", "owner": "nix-community", "repo": "home-manager", - "rev": "89a8ba0b5b43b3350ff2e3ef37b66736b2ef8706", + "rev": "65c47ced082e3353113614f77b1bc18822dc731f", "type": "github" }, "original": { @@ -274,11 +297,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1674661101, - "narHash": "sha256-iFFUngau5KHjsKScLhovpb7kCMjJvw/mXXOj6I62sVM=", + "lastModified": 1675689419, + "narHash": "sha256-UyCVZVhkZiisMPjfDTAzQIe0YpIkN1Gic97bie3Kf0A=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "fc89e70a1fb74429ad0f772d399325f69e65b357", + "rev": "863812a0979646fbc1a51b6593fa25fbad77a7be", "type": "github" }, "original": { @@ -349,11 +372,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1674573236, - "narHash": "sha256-VN1KG1Sh9s5IpLzVhCYAQcBITh4jmG8gl0F4wBX8lVk=", + "lastModified": 1675471872, + "narHash": "sha256-HBW6qBF/niMbdFxTuucSnDda9H/RSbbOs48fcXXImx0=", "owner": "oxalica", "repo": "nil", - "rev": "6e5321582ca7595455edf2a9643f83ce390d0a71", + "rev": "1a15174958729ca578db517e735479ed5fb963db", "type": "github" }, "original": { @@ -393,11 +416,11 @@ ] }, "locked": { - "lastModified": 1674357402, - "narHash": "sha256-oxOCYORXBh0KW4KEwKpzs2LThDdVmEwREV+SsP4CIpg=", + "lastModified": 1675567746, + "narHash": "sha256-huugg+7ok2VjmoLhkT+mAcw6iVK+hOqrYV0jMMD4EpQ=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "e9e7c5c62965e7e656febb5ba578d53f751eb41f", + "rev": "3880fa89727c622ae4674a2b6169c81112b43cf4", "type": "github" }, "original": { @@ -408,11 +431,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665732960, - "narHash": "sha256-WBZ+uSHKFyjvd0w4inbm0cNExYTn8lpYFcHEes8tmec=", + "lastModified": 1674641431, + "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4428e23312933a196724da2df7ab78eb5e67a88e", + "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", "type": "github" }, "original": { @@ -456,11 +479,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1674459583, - "narHash": "sha256-L0UZl/u2H3HGsrhN+by42c5kNYeKtdmJiPzIRvEVeiM=", + "lastModified": 1675673983, + "narHash": "sha256-8hzNh1jtiPxL5r3ICNzSmpSzV7kGb3KwX+FS5BWJUTo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1b1f50645af2a70dc93eae18bfd88d330bfbcf7f", + "rev": "5a350a8f31bb7ef0c6e79aea3795a890cf7743d4", "type": "github" }, "original": { @@ -471,11 +494,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1674407282, - "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", + "lastModified": 1675681488, + "narHash": "sha256-0E/oYpixC+joFk7UrY60TwZcdthzP2BXmJwne3Ni8ZI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", + "rev": "13fdd3945d8a2da5e4afe35d8a629193a9680911", "type": "github" }, "original": { @@ -486,11 +509,11 @@ }, "nur": { "locked": { - "lastModified": 1674679506, - "narHash": "sha256-QTq21QzB3js8+8R8rEOOyBp6UEKmNzXSZSUae6XcXSk=", + "lastModified": 1675806285, + "narHash": "sha256-s2UNSRVUSu3srjIUuWlFEznu9Gpeh9CFPeYJQgXxS94=", "owner": "nix-community", "repo": "NUR", - "rev": "1e7181b58e88c9a190b44ffd09898caad7d97f11", + "rev": "ee91675b2b155b274137fe6d2d3a6e29a63a862f", "type": "github" }, "original": { @@ -562,11 +585,11 @@ "ranger-sixel": { "flake": false, "locked": { - "lastModified": 1668021677, - "narHash": "sha256-iI+d4kaP7n4gEtVXI5rNB+ikg14FhkTvCAJC6YFUS8Y=", + "lastModified": 1675681884, + "narHash": "sha256-VisK4ca2FTUjVXgzT+ATKnKtSu/cfokFoEI5wHbYIa8=", "owner": "remi6397", "repo": "ranger", - "rev": "858bc2319be6588f9bb87ad51dc995a8c6caf9dc", + "rev": "e2851f9ded311df87a3f4d6d56f74447e2d10a6a", "type": "github" }, "original": { @@ -596,7 +619,6 @@ "ranger-icons": "ranger-icons", "ranger-sixel": "ranger-sixel", "sea-orm-cli": "sea-orm-cli", - "webcord": "webcord", "wegank": "wegank" } }, @@ -629,11 +651,11 @@ ] }, "locked": { - "lastModified": 1674095406, - "narHash": "sha256-RexH/1rZTiX4OhdYkuJP3MuANJ+JRgoLKL60iHm//T0=", + "lastModified": 1675391458, + "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5f7315b9800e2e500e6834767a57e39f7dbfd495", + "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf", "type": "github" }, "original": { @@ -673,22 +695,6 @@ "type": "github" } }, - "webcord": { - "locked": { - "lastModified": 1672958964, - "narHash": "sha256-3SB6mTMTiek1B1zie7oD3DWJWVqKDaB5znQ+Nz6jz/Y=", - "owner": "huantianad", - "repo": "nixpkgs", - "rev": "1d1ed8fbb244fe3d242ebd3d2ad4e647235719eb", - "type": "github" - }, - "original": { - "owner": "huantianad", - "ref": "webcord", - "repo": "nixpkgs", - "type": "github" - } - }, "wegank": { "inputs": { "nixpkgs": [ @@ -696,11 +702,11 @@ ] }, "locked": { - "lastModified": 1674278346, - "narHash": "sha256-FehXiRYyZFpLAH+FKiHWTagwQqqbr6rr6X7ixt9ha6A=", + "lastModified": 1675189325, + "narHash": "sha256-Xa0e3gc2q6yXKGcJEu19NFWkLiFESKi3Mg4xgenDprc=", "owner": "wegank", "repo": "nur-packages", - "rev": "816a65f4ef349bd14ed4836d26be800e4223b3ee", + "rev": "f2336f1b0d1a6cc8d6157e8d6a16c841691cd6b3", "type": "github" }, "original": { @@ -713,11 +719,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1672824257, - "narHash": "sha256-SbYoZj57VlopTzI+OSW9jlgYxN1gI1KLg/s/HV+87eE=", + "lastModified": 1675374853, + "narHash": "sha256-BSrjNcddYWhFUMtjGwxiEXw67MYRaIHGvLn19Mvm1NE=", "owner": "wlroots", "repo": "wlroots", - "rev": "5f264a7d6c8af27d41ff440c05262b022c055593", + "rev": "677a3f2f8847ed2de49dd60868f9d9487a546f58", "type": "gitlab" }, "original": { diff --git a/flake.nix b/flake.nix index a036e45..176583e 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,6 @@ material-wifi-icons.flake = false; sea-orm-cli.url = "github:lucperkins/nixpkgs/lperkins/sea-orm-cli"; - webcord.url = "github:huantianad/nixpkgs/webcord"; nil-lsp.url = "github:oxalica/nil"; nil-lsp.inputs.nixpkgs.follows = "nixpkgs-unstable"; @@ -84,7 +83,7 @@ ./system/secrets.nix ./system/specialisation.nix # nur.nixosModules.nur - inputs.agenix.nixosModule + inputs.agenix.nixosModules.default inputs.hyprland.nixosModules.default { programs.hyprland.enable = true; diff --git a/overlays/default.nix b/overlays/default.nix index e6c24f1..c804958 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -46,7 +46,7 @@ mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper; sea-orm-cli = inputs.sea-orm-cli.legacyPackages.${prev.system}.sea-orm-cli; - webcord = inputs.webcord.legacyPackages.${prev.system}.webcord; + webcord = prev.webcord or prev.unstable.webcord; nil-lsp = inputs.nil-lsp.packages.${prev.system}.nil; }); diff --git a/user/home.nix b/user/home.nix index 176111e..76d3045 100644 --- a/user/home.nix +++ b/user/home.nix @@ -97,7 +97,7 @@ deluge ## Nix secrets management - inputs.agenix.defaultPackage.x86_64-linux + inputs.agenix.packages.x86_64-linux.default ## Programming vscode