From 564907d9871a91198ab0a70b02c842c480b65da4 Mon Sep 17 00:00:00 2001 From: oddlama Date: Mon, 30 Jan 2023 22:36:44 +0100 Subject: [PATCH] feat: remove preference about disabling udisks2 --- flake.lock | 62 ++++++++++++++++++++-------------------- flake.nix | 2 +- modules/core/default.nix | 3 +- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 239caa5..d43e5a1 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1675112851, - "narHash": "sha256-PAyCKssbhSTZfIMgfRdHuECjR5Bzw74oK+zLSVHcVwU=", + "lastModified": 1675114231, + "narHash": "sha256-lIPXmd2JRNv1D0CUmv8/djiIUZnm04MIHxLR7sm1PPo=", "owner": "oddlama", "repo": "agenix-rekey", - "rev": "cae8d9ffeaed228382f60a208f1447385720c137", + "rev": "60829dfc172260dcff7bce9e03b24dd686a0a512", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1672327199, - "narHash": "sha256-pFlngSHXKBhAmbaKZ4FYtu57LLunG+vWdL7a5vw1RvQ=", + "lastModified": 1674127017, + "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=", "owner": "serokell", "repo": "deploy-rs", - "rev": "a5619f5660a00f58c2b7c16d89058e92327ac9b8", + "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77", "type": "github" }, "original": { @@ -75,11 +75,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -134,11 +134,11 @@ ] }, "locked": { - "lastModified": 1672954852, - "narHash": "sha256-xkMJs1KTyKwxVErNdbgC4K6GRHU24Uv2DhbcFtfzLrk=", + "lastModified": 1674928308, + "narHash": "sha256-elVU4NUZEl11BdT4gC+lrpLYM8Ccxqxs19Ix84HTI9o=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ecd5305a41b6dd87f6cdf8cfe83ac07bdc47a0f", + "rev": "08a778d80308353f4f65c9dcd3790b5da02d6306", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1672644464, - "narHash": "sha256-RYlvRMcQNT7FDoDkViijQBHg9g+blsB+U6AvL/gAsPI=", + "lastModified": 1674550793, + "narHash": "sha256-ljJlIFQZwtBbzWqWTmmw2O5BFmQf1A/DspwMOQtGXHk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ca29e25c39b8e117d4d76a81f1e229824a9b3a26", + "rev": "b7ac0a56029e4f9e6743b9993037a5aaafd57103", "type": "github" }, "original": { @@ -179,11 +179,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1672791794, - "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=", + "lastModified": 1674641431, + "narHash": "sha256-qfo19qVZBP4qn5M5gXc/h1MDgAtPA5VxJm9s8RUAkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", + "rev": "9b97ad7b4330aacda9b2343396eb3df8a853b4fc", "type": "github" }, "original": { @@ -195,16 +195,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1671271954, - "narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=", + "lastModified": 1673800717, + "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3", + "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } @@ -224,11 +224,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1672912243, - "narHash": "sha256-QnQeKUjco2kO9J4rBqIBPp5XcOMblIMnmyhpjeaJBYc=", + "lastModified": 1674761200, + "narHash": "sha256-v0ypL0eDhFWmgd3f5nnbffaMA5BUoOnYUiEso7fk+q0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a4548c09eac4afb592ab2614f4a150120b29584c", + "rev": "8539119ba0b17b15e60de60da0348d8c73bbfdf2", "type": "github" }, "original": { @@ -251,11 +251,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1672569413, - "narHash": "sha256-WedPMfZ3rPTkxMrvvpMjYaZntlbfilJly9Vaf2fGuAI=", + "lastModified": 1673786180, + "narHash": "sha256-5tu71eDtQVmVUorho/GKaCzr4cdmNpvG8ZYxMhDCVKY=", "owner": "yaxitech", "repo": "ragenix", - "rev": "2cc694606c3eec2ce073892f8ea13d5f3def8217", + "rev": "92248738a21db5687744d9e7796cf2433b96a7a5", "type": "github" }, "original": { @@ -292,11 +292,11 @@ ] }, "locked": { - "lastModified": 1672453260, - "narHash": "sha256-ruR2xo30Vn7kY2hAgg2Z2xrCvNePxck6mgR5a8u+zow=", + "lastModified": 1673662873, + "narHash": "sha256-/YOtiDKPUXKKpIhsAds11llfC42ScGW27bbHnNZebco=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "176b6fd3dd3d7cea8d22ab1131364a050228d94c", + "rev": "90163bbbadce526f8b248a5fe545b06c59597108", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 38248d7..e7099ec 100644 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,7 @@ homeConfigurations = import ./nix/home-manager.nix inputs; nixosConfigurations = import ./nix/nixos.nix inputs; } - // flake-utils.lib.eachSystem ["aarch64-linux" "x86_64-linux"] (localSystem: rec { + // flake-utils.lib.eachDefaultSystem (localSystem: rec { checks = import ./nix/checks.nix inputs localSystem; devShells.default = import ./nix/dev-shell.nix inputs localSystem; diff --git a/modules/core/default.nix b/modules/core/default.nix index 808780e..875ae06 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -22,8 +22,7 @@ in { boot.kernelParams = ["log_buf_len=10M"]; environment.etc."nixos/configuration.nix".source = dummyConfig; - # Disable unnecessary stuff from the nixos defaults. - services.udisks2.enable = false; + # Disable sudo which is entierly unnecessary. security.sudo.enable = false; rekey.hostPubkey = ../../secrets/pubkeys + "/${config.networking.hostName}.pub";