From 06512b823a880bbe331d1d017df4055ecfc8ca11 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Thu, 26 Dec 2024 13:57:52 +0200 Subject: [PATCH] Refactoring some stuff --- flake.nix | 26 ------------------- configuration.nix => nixos/configuration.nix | 0 disk-config.nix => nixos/disk-config.nix | 1 - flake.lock => nixos/flake.lock | 0 nixos/flake.nix | 16 ++++++++++++ .../hardware-configuration.nix | 0 6 files changed, 16 insertions(+), 27 deletions(-) delete mode 100644 flake.nix rename configuration.nix => nixos/configuration.nix (100%) rename disk-config.nix => nixos/disk-config.nix (95%) rename flake.lock => nixos/flake.lock (100%) create mode 100644 nixos/flake.nix rename hardware-configuration.nix => nixos/hardware-configuration.nix (100%) diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 8fb64e7..0000000 --- a/flake.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - inputs.disko.url = "github:nix-community/disko"; - inputs.disko.inputs.nixpkgs.follows = "nixpkgs"; - # inputs.nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; - - outputs = - { - nixpkgs, - disko, - # nixos-facter-modules, - ... - }: - { - # Use this for all other targets - # nixos-anywhere --flake .#generic-nixos-facter --generate-hardware-config nixos-generate-config ./hardware-configuration.nix - nixosConfigurations.generic = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - disko.nixosModules.disko - ./configuration.nix - ./hardware-configuration.nix - ]; - }; - }; -} diff --git a/configuration.nix b/nixos/configuration.nix similarity index 100% rename from configuration.nix rename to nixos/configuration.nix diff --git a/disk-config.nix b/nixos/disk-config.nix similarity index 95% rename from disk-config.nix rename to nixos/disk-config.nix index 88e17e5..a51111a 100644 --- a/disk-config.nix +++ b/nixos/disk-config.nix @@ -1,4 +1,3 @@ -# Example to create a bios compatible gpt partition { lib, ... }: { disko.devices = { diff --git a/flake.lock b/nixos/flake.lock similarity index 100% rename from flake.lock rename to nixos/flake.lock diff --git a/nixos/flake.nix b/nixos/flake.nix new file mode 100644 index 0000000..3745d51 --- /dev/null +++ b/nixos/flake.nix @@ -0,0 +1,16 @@ +{ + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + inputs.disko.url = "github:nix-community/disko"; + inputs.disko.inputs.nixpkgs.follows = "nixpkgs"; + + outputs = { nixpkgs, disko, ... }: { + nixosConfigurations.default = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + disko.nixosModules.disko + ./configuration.nix + ./hardware-configuration.nix + ]; + }; + }; +} diff --git a/hardware-configuration.nix b/nixos/hardware-configuration.nix similarity index 100% rename from hardware-configuration.nix rename to nixos/hardware-configuration.nix