From a885d52572b5c4447c5514fb24d27829b49050c7 Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Thu, 9 Jun 2022 22:22:47 -0400 Subject: [PATCH] Update nix inputs --- flake.lock | 89 ++++++++++++++++++++++---------------- flake.nix | 3 +- nki-home/configuration.nix | 1 - 3 files changed, 52 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index da83514..b7958b0 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ ] }, "locked": { - "lastModified": 1653937612, - "narHash": "sha256-HybwffYKOM3UwlY54ZVCZgX7o5xpp2KhbZyyOnvwFMo=", + "lastModified": 1654113405, + "narHash": "sha256-VpK+0QaWG2JRgB00lw77N9TjkE3ec0iMYIX1TzGpxa4=", "owner": "nix-community", "repo": "home-manager", - "rev": "bda2c80b4c1a8d85c84c343a25ac7303fbc7999d", + "rev": "ac2287df5a2d6f0a44bbcbd11701dbbf6ec43675", "type": "github" }, "original": { @@ -152,16 +152,14 @@ }, "nix-gaming": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1653991346, - "narHash": "sha256-92fB9x9jK6wQJyk1Wd5iH/AMFpt8jrnNlm9gp2UwX+w=", + "lastModified": 1654096541, + "narHash": "sha256-GDy7RnRH7idcF6uzNQXPII14OWgb49ExwAu8MHeZTtI=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "9788079154ec98b07a6ab85dc253681e56b6d1ba", + "rev": "0b4e36ef5347ef4fefd469279490851b2bfa5116", "type": "github" }, "original": { @@ -188,11 +186,11 @@ }, "nixpkgs-21_11": { "locked": { - "lastModified": 1653819578, - "narHash": "sha256-a1vaUl6VZz1NsWxMw0i5lRyHIOVUIuMZdQzV+4s+rY8=", + "lastModified": 1654346688, + "narHash": "sha256-Y7QtZkfdxTvACCvWmDjpN6qOf4OKkZATufHcJP2VMKM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "baa82d4b626288c7439eeea073a18aabbe435991", + "rev": "2de556c4cd46a59e8ce2f85ee4dd400983213d45", "type": "github" }, "original": { @@ -204,11 +202,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1653822412, - "narHash": "sha256-xZwMDQ8MdNiTwE8dcKAX1h3qCmLtuudNGxmFUX3xIes=", + "lastModified": 1654373220, + "narHash": "sha256-3vKFnZz2oYHo4YcelaNOhO4XQ2jiIEXrp1s4w+e773c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "db78278ff296cf21eca7e8c08ee99707387a54fa", + "rev": "d6cb04299ce8964290ae7fdcb87aa50da0500b5c", "type": "github" }, "original": { @@ -220,11 +218,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1653918805, - "narHash": "sha256-6ahwAnBNGgqSNSn/6RnsxrlFi+fkA+RyT6o/5S1915o=", + "lastModified": 1654694478, + "narHash": "sha256-nFAMETXEhIrqnBe28u6vqy4ixSRr0BRrlZLlS0e7eoM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a0a69be4b5ee63f1b5e75887a406e9194012b492", + "rev": "18de53ca965bd0678aaf09e5ce0daae05c58355a", "type": "github" }, "original": { @@ -251,11 +249,26 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1653920503, - "narHash": "sha256-BBeCZwZImtjP3oYy4WogkQYy5OxNyfNciVSc1AfZgLQ=", + "lastModified": 1653307806, + "narHash": "sha256-VPej3GE4IBMwYnXRfbiVqMWKa32+ysuvbHRkQXD0gTw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9d7aff488a8f9429d9e6cd82c10dffbf21907fb1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1654758790, + "narHash": "sha256-bXimktlkjL9s8ldMzMBslxEs80cjZDqrof1g8MbhmQI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a634c8f6c1fbf9b9730e01764999666f3436f10a", + "rev": "e5556c75ac012ee6e03f39a56c1c51b0f7d658c2", "type": "github" }, "original": { @@ -265,13 +278,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1653738054, - "narHash": "sha256-IaR8iLN4Ms3f5EjU1CJkXSc49ZzyS5qv03DtVAti6/s=", + "lastModified": 1654245945, + "narHash": "sha256-PV6MZ+HuNnyLxQGa2rwt0BmCRkQS2xqhc+SeJLQM+WU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "17b62c338f2a0862a58bb6951556beecd98ccda9", + "rev": "442db9429b9fbdb6352cfb937afc8ecccfe2633f", "type": "github" }, "original": { @@ -283,11 +296,11 @@ }, "nur": { "locked": { - "lastModified": 1653970042, - "narHash": "sha256-EcphYipFvqkFV9PrWUUz034G7WQHZwYVwzGiyU5384A=", + "lastModified": 1654827084, + "narHash": "sha256-y5w9cvuZyqvdaJeVjy9OuzxcTMslH0e29QqJa1RnYTs=", "owner": "nix-community", "repo": "NUR", - "rev": "83f9a7c7287210b20da844b1ccd7c79cb696f51e", + "rev": "aa528e947a2b9419814d6ecccd83d7ec59c31b48", "type": "github" }, "original": { @@ -325,7 +338,7 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "rnix-lsp": "rnix-lsp", @@ -342,25 +355,25 @@ "rev": "f8320c88e4c073f18e49abeb60091c1c73dd0d9a", "revCount": 2, "type": "git", - "url": "ssh://git@github.com/natsukagami/nix-deploy-secrets" + "url": "https://github.com/natsukagami/nix-deploy-secrets" }, "original": { "type": "git", - "url": "ssh://git@github.com/natsukagami/nix-deploy-secrets" + "url": "https://github.com/natsukagami/nix-deploy-secrets" } }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nixpkgs-21_11": "nixpkgs-21_11", "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1653827546, - "narHash": "sha256-va51HFf7UwktvriIbe9pjRPMr7p8IaxrwcDlZe7twzI=", + "lastModified": 1654401128, + "narHash": "sha256-uCdQ2fzIPGakHw2TkvOncUvCl7Fo7z/vagpDWYooO7s=", "owner": "Mic92", "repo": "sops-nix", - "rev": "36b5901782e7fbfc191cace910f67f8b8743f678", + "rev": "f075361ecbde21535b38e41dfaa28a28f160855c", "type": "github" }, "original": { @@ -409,11 +422,11 @@ "nixpkgs-unstable": "nixpkgs-unstable_2" }, "locked": { - "lastModified": 1651774715, - "narHash": "sha256-WznLNfe4o91YWZCNiwUSMfbaNKu+s6eHJpqpsobSJ+w=", + "lastModified": 1654638361, + "narHash": "sha256-UEG7mYtexoPj5GCxJHDT7ubfY41z5harxgT2cYKi2rU=", "owner": "natsukagami", "repo": "youmubot", - "rev": "0663d34cce5f1f8b1e0094a78814c2c87bd4e7d0", + "rev": "dd1867e222ac8ad7be84c8c30c34b99863440293", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d089e42..459312d 100644 --- a/flake.nix +++ b/flake.nix @@ -21,11 +21,10 @@ youmubot.url = "github:natsukagami/youmubot"; youmubot.inputs.nixpkgs.follows = "nixpkgs"; nix-gaming.url = github:fufexan/nix-gaming; - nix-gaming.inputs.nixpkgs.follows = "nixpkgs"; # --- # DEPLOYMENT ONLY! secrets - secrets.url = "git+ssh://git@github.com/natsukagami/nix-deploy-secrets"; + secrets.url = "git+https://github.com/natsukagami/nix-deploy-secrets"; }; outputs = { self, darwin, nixpkgs, nixpkgs-unstable, home-manager, deploy-rs, sops-nix, nur, ... }@inputs: diff --git a/nki-home/configuration.nix b/nki-home/configuration.nix index 89fd883..30b0ea4 100644 --- a/nki-home/configuration.nix +++ b/nki-home/configuration.nix @@ -176,7 +176,6 @@ }; # List services that you want to enable: - services.gnome.gnome-keyring.enable = true; nki.services.edns.enable = true; nki.services.edns.ipv6 = true; services.flatpak.enable = true;