From 8a8ab7e38bb58c3a43cfb9d69cf2b8895a94ffdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 13 Sep 2023 23:31:20 +0200 Subject: [PATCH] drop disko and srvos --- .envrc | 1 - examples/default.nix | 19 ++----------- flake.lock | 66 +++----------------------------------------- flake.nix | 7 ++--- 4 files changed, 8 insertions(+), 85 deletions(-) delete mode 100644 .envrc diff --git a/.envrc b/.envrc deleted file mode 100644 index 3550a30..0000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/examples/default.nix b/examples/default.nix index b884be2..30638b7 100644 --- a/examples/default.nix +++ b/examples/default.nix @@ -2,27 +2,12 @@ let # some example configuration to make it eval dummy = { config, modulesPath, ... }: { - imports = [ - #srvos.nixosModules.server - #srvos.nixosModules.hardware-hetzner-cloud - disko.nixosModules.disko - ./disko.nix - "${modulesPath}/profiles/qemu-guest.nix" - ]; config = { networking.hostName = "example-common"; system.stateVersion = config.system.nixos.version; - services.openssh.enable = true; users.users.root.initialPassword = "fnord23"; - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbBp2dH2X3dcU1zh+xW3ZsdYROKpJd3n13ssOP092qE joerg@turingmachine" - ]; - - #users.users.root.initialPassword = "fnord23"; - #boot.loader.grub.devices = lib.mkForce [ "/dev/sda" ]; - #fileSystems."/".device = lib.mkDefault "/dev/sda"; - - #systemd.network.networks."10-uplink".networkConfig.Address = [ "2a01:4f9:c012:539b::/64" ]; + boot.loader.grub.devices = lib.mkForce [ "/dev/sda" ]; + fileSystems."/".device = lib.mkDefault "/dev/sda"; }; }; diff --git a/flake.lock b/flake.lock index b8e5bc3..83e2df4 100644 --- a/flake.lock +++ b/flake.lock @@ -1,28 +1,10 @@ { "nodes": { - "disko": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1694266353, - "narHash": "sha256-NutPFFKc5FK05zq8JYm8quBKJ93goYowxjW/FKcXAdI=", - "owner": "nix-community", - "repo": "disko", - "rev": "f9907fcf6df79a76ea7e3a3afe9340a672cb9c6e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1693611461, @@ -54,50 +36,10 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1693471703, - "narHash": "sha256-0l03ZBL8P1P6z8MaSDS/MvuU8E75rVxe5eE1N6gxeTo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3e52e76b70d5508f3cec70b882a29199f4d1ee85", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { - "disko": "disko", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs", - "srvos": "srvos" - } - }, - "srvos": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1694049767, - "narHash": "sha256-/S1mbeHO1JAV0hIBK8b92lBw2V34oPfhYPzXr73JCy4=", - "owner": "numtide", - "repo": "srvos", - "rev": "6a824ca672288a6c8e4b8ade835f01b7b25fca2c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "srvos", - "type": "github" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 3dfd5eb..7e80f5a 100644 --- a/flake.nix +++ b/flake.nix @@ -4,14 +4,11 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - srvos.url = "github:numtide/srvos"; - srvos.inputs.nixpkgs.follows = "nixpkgs"; - disko.url = "github:nix-community/disko"; - disko.inputs.nixpkgs.follows = "nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts"; + flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; }; - outputs = inputs@{ self, srvos, flake-parts, ... }: + outputs = inputs@{ self, flake-parts, ... }: flake-parts.lib.mkFlake { inherit inputs; } ({ lib, ... }: { systems = [ "x86_64-linux" ]; flake = {