From 9c08267fceb09cef79a00729889d97331bc1b4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?= Date: Wed, 13 Nov 2024 22:58:45 +0100 Subject: [PATCH] Clean up what does not belong in `services` --- .../makeInstaller.nix | 0 services/.envrc | 1 - services/disk-layout.nix | 36 ---- services/flake.lock | 187 ------------------ services/flake.nix | 26 --- 5 files changed, 250 deletions(-) rename services/installer.nix => deployment/makeInstaller.nix (100%) delete mode 100644 services/.envrc delete mode 100644 services/disk-layout.nix delete mode 100644 services/flake.lock diff --git a/services/installer.nix b/deployment/makeInstaller.nix similarity index 100% rename from services/installer.nix rename to deployment/makeInstaller.nix diff --git a/services/.envrc b/services/.envrc deleted file mode 100644 index 3550a30f..00000000 --- a/services/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/services/disk-layout.nix b/services/disk-layout.nix deleted file mode 100644 index 13f1a207..00000000 --- a/services/disk-layout.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ ... }: -{ - disko.devices.disk.main = { - device = "/dev/sda"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - MBR = { - priority = 0; - size = "1M"; - type = "EF02"; - }; - ESP = { - priority = 1; - size = "500M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - }; - }; - root = { - priority = 2; - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; - }; - }; - }; - }; - }; -} diff --git a/services/flake.lock b/services/flake.lock deleted file mode 100644 index 42218659..00000000 --- a/services/flake.lock +++ /dev/null @@ -1,187 +0,0 @@ -{ - "nodes": { - "disko": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1727347829, - "narHash": "sha256-y7cW6TjJKy+tu7efxeWI6lyg4VVx/9whx+OmrhmRShU=", - "owner": "nix-community", - "repo": "disko", - "rev": "1879e48907c14a70302ff5d0539c3b9b6f97feaa", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1725194671, - "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-latest": { - "locked": { - "lastModified": 1727220152, - "narHash": "sha256-6ezRTVBZT25lQkvaPrfJSxYLwqcbNWm6feD/vG1FO0o=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "24959f933187217890b206788a85bfa73ba75949", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1730768919, - "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a04d33c0c3f1a59a2c1cb0c6e34cd24500e5a1dc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1730137230, - "narHash": "sha256-0kW6v0alzWIc/Dc/DoVZ7A9qNScv77bj/zYTKI67HZM=", - "owner": "radvendii", - "repo": "nixpkgs", - "rev": "df815998652a1d00ce7c059a1e5ef7d7c0548c90", - "type": "github" - }, - "original": { - "owner": "radvendii", - "ref": "nixos_rebuild_tests", - "repo": "nixpkgs", - "type": "github" - } - }, - "pixelfed": { - "flake": false, - "locked": { - "lastModified": 1719823820, - "narHash": "sha256-CKjqnxp7p2z/13zfp4HQ1OAmaoUtqBKS6HFm6TV8Jwg=", - "owner": "pixelfed", - "repo": "pixelfed", - "rev": "4c245cf429330d01fcb8ebeb9aa8c84a9574a645", - "type": "github" - }, - "original": { - "owner": "pixelfed", - "ref": "v0.12.3", - "repo": "pixelfed", - "type": "github" - } - }, - "root": { - "inputs": { - "disko": "disko", - "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_3", - "nixpkgs-latest": "nixpkgs-latest", - "pixelfed": "pixelfed" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/services/flake.nix b/services/flake.nix index b55b2812..c350d802 100644 --- a/services/flake.nix +++ b/services/flake.nix @@ -2,13 +2,11 @@ inputs = { nixpkgs.url = "github:radvendii/nixpkgs/nixos_rebuild_tests"; nixpkgs-latest.url = "github:nixos/nixpkgs"; - git-hooks.url = "github:cachix/git-hooks.nix"; pixelfed = { url = "github:pixelfed/pixelfed?ref=v0.12.3"; flake = false; }; - disko.url = "github:nix-community/disko"; }; outputs = @@ -16,9 +14,7 @@ self, nixpkgs, nixpkgs-latest, - git-hooks, pixelfed, - disko, }: let system = "x86_64-linux"; @@ -50,16 +46,12 @@ mastodon-vm = import ./vm/mastodon-vm.nix; peertube-vm = import ./vm/peertube-vm.nix; pixelfed-vm = import ./vm/pixelfed-vm.nix; - - disk-layout = import ./disk-layout.nix; }; nixosConfigurations = { mastodon = nixpkgs.lib.nixosSystem { inherit system; modules = with self.nixosModules; [ - disko.nixosModules.default - disk-layout bleedingFediverse fediversity interactive-vm @@ -71,8 +63,6 @@ peertube = nixpkgs.lib.nixosSystem { inherit system; modules = with self.nixosModules; [ - disko.nixosModules.default - disk-layout bleedingFediverse fediversity interactive-vm @@ -84,8 +74,6 @@ pixelfed = nixpkgs.lib.nixosSystem { inherit system; modules = with self.nixosModules; [ - disko.nixosModules.default - disk-layout bleedingFediverse fediversity interactive-vm @@ -97,8 +85,6 @@ all = nixpkgs.lib.nixosSystem { inherit system; modules = with self.nixosModules; [ - disko.nixosModules.default - disk-layout bleedingFediverse fediversity interactive-vm @@ -110,21 +96,9 @@ }; }; - ## Fully-feature ISO installer - mkInstaller = import ./installer.nix; - installers = lib.mapAttrs (_: config: self.mkInstaller nixpkgs config) self.nixosConfigurations; - checks.${system} = { mastodon-garage = import ./tests/mastodon-garage.nix { inherit pkgs self; }; pixelfed-garage = import ./tests/pixelfed-garage.nix { inherit pkgs self; }; - - pre-commit = git-hooks.lib.${system}.run { - src = ./.; - hooks = { - nixfmt-rfc-style.enable = true; - deadnix.enable = true; - }; - }; }; devShells.${system}.default = pkgs.mkShell {