From 5cd582cdac496f88f3a1fab25cc40a1afc63319a Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Mon, 5 Jun 2023 21:14:44 -0400 Subject: [PATCH] meta: Use src directory There's something cool about having a separate main.nix for your NixOS configuration. --- flake.nix | 4 ++-- common.nix => src/main.nix | 10 +++++----- variables.nix => src/variables.nix | 0 3 files changed, 7 insertions(+), 7 deletions(-) rename common.nix => src/main.nix (96%) rename variables.nix => src/variables.nix (100%) diff --git a/flake.nix b/flake.nix index 72ddba62..e8b8c522 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ nix-gaming, ... } @ attrs: let - VARIABLES = import ./variables.nix; + VARIABLES = import ./src/variables.nix; in { formatter."${VARIABLES.system}" = nixpkgs.legacyPackages."${VARIABLES.system}".alejandra; nixosConfigurations."${VARIABLES.hostname}" = nixpkgs.lib.nixosSystem { @@ -19,7 +19,7 @@ hyprland.nixosModules.default stylix.nixosModules.stylix nix-gaming.nixosModules.pipewireLowLatency - ./common.nix + ./src/main.nix ./hardware-configuration.nix ]; }; diff --git a/common.nix b/src/main.nix similarity index 96% rename from common.nix rename to src/main.nix index 2da18940..1cb4ff2c 100644 --- a/common.nix +++ b/src/main.nix @@ -8,9 +8,9 @@ VARIABLES = import ./variables.nix; in { imports = [ - ./modules - ./containers/rar.nix - ./containers/wine.nix + ../modules + ../containers/rar.nix + ../containers/wine.nix ]; # locale @@ -41,8 +41,8 @@ in { environment.systemPackages = with pkgs; [ hypr-contrib.packages."${VARIABLES.system}".grimblast nix-gaming.packages."${VARIABLES.system}".osu-stable - (pkgs.callPackage ./packages/waycorner {}) - (pkgs.callPackage ./packages/srb2 {}) + (pkgs.callPackage ../packages/waycorner {}) + (pkgs.callPackage ../packages/srb2 {}) slade typespeed osu-lazer-bin diff --git a/variables.nix b/src/variables.nix similarity index 100% rename from variables.nix rename to src/variables.nix