From 5a93aa1a7a33781291aa499e18403d03e0b7c6de Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Mon, 26 Feb 2024 20:43:08 -0500 Subject: [PATCH] Flatten dir structure --- Makefile | 4 ++-- modules/darwin.nix => darwin.nix | 0 modules/fonts.nix => fonts.nix | 0 .../hephaestus/configuration.nix | 0 .../hephaestus/hardware.nix | 0 .../zelus/configuration.nix | 0 outputs.nix | 24 +++++++++---------- {modules/overlays => overlays}/default.nix | 0 .../tmux-sessionizer/default.nix | 0 .../tmux-sessionizer/tmux-sessionizer | 0 .../overlays => overlays}/vpngate/default.nix | 0 modules/packages.nix => packages.nix | 0 .../services => services}/netdata/default.nix | 0 .../netdata/netdata.conf | 0 modules/upgrade-diff.nix => upgrade-diff.nix | 0 15 files changed, 14 insertions(+), 14 deletions(-) rename modules/darwin.nix => darwin.nix (100%) rename modules/fonts.nix => fonts.nix (100%) rename {modules/machines => machines}/hephaestus/configuration.nix (100%) rename {modules/machines => machines}/hephaestus/hardware.nix (100%) rename {modules/machines => machines}/zelus/configuration.nix (100%) rename {modules/overlays => overlays}/default.nix (100%) rename {modules/overlays => overlays}/tmux-sessionizer/default.nix (100%) rename {modules/overlays => overlays}/tmux-sessionizer/tmux-sessionizer (100%) rename {modules/overlays => overlays}/vpngate/default.nix (100%) rename modules/packages.nix => packages.nix (100%) rename {modules/services => services}/netdata/default.nix (100%) rename {modules/services => services}/netdata/netdata.conf (100%) rename modules/upgrade-diff.nix => upgrade-diff.nix (100%) diff --git a/Makefile b/Makefile index 90edad4..8ce9179 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ HOSTNAME ?= $(shell hostname) UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Linux) - SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#' + SWITCH_CMD := nixos-rebuild --use-remote-sudo -I nixos-config="machines/$(HOSTNAME)/configuration.nix" switch --flake '.\#' endif ifeq ($(UNAME_S),Darwin) SWITCH_CMD := exec darwin-rebuild switch --flake . @@ -18,7 +18,7 @@ switch: $(SWITCH_CMD) rollback: - nixos-rebuild --use-remote-sudo switch --rollback -I nixos-config="modules/machines/$(HOSTNAME)/configuration.nix" + nixos-rebuild --use-remote-sudo switch --rollback -I nixos-config="machines/$(HOSTNAME)/configuration.nix" update: @./nix-flake-update.sh diff --git a/modules/darwin.nix b/darwin.nix similarity index 100% rename from modules/darwin.nix rename to darwin.nix diff --git a/modules/fonts.nix b/fonts.nix similarity index 100% rename from modules/fonts.nix rename to fonts.nix diff --git a/modules/machines/hephaestus/configuration.nix b/machines/hephaestus/configuration.nix similarity index 100% rename from modules/machines/hephaestus/configuration.nix rename to machines/hephaestus/configuration.nix diff --git a/modules/machines/hephaestus/hardware.nix b/machines/hephaestus/hardware.nix similarity index 100% rename from modules/machines/hephaestus/hardware.nix rename to machines/hephaestus/hardware.nix diff --git a/modules/machines/zelus/configuration.nix b/machines/zelus/configuration.nix similarity index 100% rename from modules/machines/zelus/configuration.nix rename to machines/zelus/configuration.nix diff --git a/outputs.nix b/outputs.nix index 73e6cf6..81fa5f4 100644 --- a/outputs.nix +++ b/outputs.nix @@ -19,9 +19,9 @@ }; defaultModules = [ home-manager.nixosModules.home-manager - ./modules/fonts.nix - ./modules/packages.nix - ./modules/upgrade-diff.nix + ./fonts.nix + ./packages.nix + ./upgrade-diff.nix ({ config, @@ -53,7 +53,7 @@ }; nixpkgs.overlays = [ - (import ./modules/overlays) + (import ./overlays) ]; home-manager = { @@ -71,15 +71,15 @@ }) ]; desktopLinuxModules = [ - ./modules/services/netdata/default.nix + ./services/netdata/default.nix ]; in { hephaestus = nixpkgs.lib.nixosSystem { specialArgs = {inherit unstable;}; modules = [ - ./modules/machines/hephaestus/configuration.nix - ./modules/machines/hephaestus/hardware.nix + ./machines/hephaestus/configuration.nix + ./machines/hephaestus/hardware.nix ] ++ defaultModules ++ desktopLinuxModules; @@ -98,15 +98,15 @@ modules = [ home-manager.darwinModules.home-manager - ./modules/darwin.nix - ./modules/machines/zelus/configuration.nix - ./modules/packages.nix - ./modules/upgrade-diff.nix + ./darwin.nix + ./machines/zelus/configuration.nix + ./packages.nix + ./upgrade-diff.nix ({config, ...}: { config = { nixpkgs.overlays = [ - (import ./modules/overlays) + (import ./overlays) ]; home-manager = { useGlobalPkgs = true; diff --git a/modules/overlays/default.nix b/overlays/default.nix similarity index 100% rename from modules/overlays/default.nix rename to overlays/default.nix diff --git a/modules/overlays/tmux-sessionizer/default.nix b/overlays/tmux-sessionizer/default.nix similarity index 100% rename from modules/overlays/tmux-sessionizer/default.nix rename to overlays/tmux-sessionizer/default.nix diff --git a/modules/overlays/tmux-sessionizer/tmux-sessionizer b/overlays/tmux-sessionizer/tmux-sessionizer similarity index 100% rename from modules/overlays/tmux-sessionizer/tmux-sessionizer rename to overlays/tmux-sessionizer/tmux-sessionizer diff --git a/modules/overlays/vpngate/default.nix b/overlays/vpngate/default.nix similarity index 100% rename from modules/overlays/vpngate/default.nix rename to overlays/vpngate/default.nix diff --git a/modules/packages.nix b/packages.nix similarity index 100% rename from modules/packages.nix rename to packages.nix diff --git a/modules/services/netdata/default.nix b/services/netdata/default.nix similarity index 100% rename from modules/services/netdata/default.nix rename to services/netdata/default.nix diff --git a/modules/services/netdata/netdata.conf b/services/netdata/netdata.conf similarity index 100% rename from modules/services/netdata/netdata.conf rename to services/netdata/netdata.conf diff --git a/modules/upgrade-diff.nix b/upgrade-diff.nix similarity index 100% rename from modules/upgrade-diff.nix rename to upgrade-diff.nix