From 68d7df796eb2116bdd291580e20dfcb0fc769496 Mon Sep 17 00:00:00 2001 From: lulusilly Date: Mon, 1 Sep 2025 00:32:34 -0400 Subject: [PATCH] More nonsense not worth describing --- .config/home-manager/flake.nix | 21 ------------------ .config/{nixos => nix}/flake.lock | 0 .config/{nixos => nix}/flake.nix | 12 ++++------ .../{home-manager => nix/hosts}/common.nix | 0 .config/nix/hosts/generic-linux/home.nix | 0 .config/{nixos => nix/hosts}/mecca/bg.jpg | Bin .../hosts}/mecca/configuration.nix | 0 .../hosts}/mecca/hardware-configuration.nix | 0 .../hosts}/mecca/home.nix | 0 .../hosts}/syntheticnexus/bg.jpg | Bin .../hosts}/syntheticnexus/configuration.nix | 0 .../syntheticnexus/hardware-configuration.nix | 0 12 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 .config/home-manager/flake.nix rename .config/{nixos => nix}/flake.lock (100%) rename .config/{nixos => nix}/flake.nix (86%) rename .config/{home-manager => nix/hosts}/common.nix (100%) create mode 100644 .config/nix/hosts/generic-linux/home.nix rename .config/{nixos => nix/hosts}/mecca/bg.jpg (100%) rename .config/{nixos => nix/hosts}/mecca/configuration.nix (100%) rename .config/{nixos => nix/hosts}/mecca/hardware-configuration.nix (100%) rename .config/{home-manager => nix/hosts}/mecca/home.nix (100%) rename .config/{nixos => nix/hosts}/syntheticnexus/bg.jpg (100%) rename .config/{nixos => nix/hosts}/syntheticnexus/configuration.nix (100%) rename .config/{nixos => nix/hosts}/syntheticnexus/hardware-configuration.nix (100%) diff --git a/.config/home-manager/flake.nix b/.config/home-manager/flake.nix deleted file mode 100644 index 8f63eb5..0000000 --- a/.config/home-manager/flake.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - description = "Multi-machine Home Manager (Linux/macOS/NixOS)"; - - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; - }; - - outputs = { self, nixpkgs, ... }@inputs: { - homeConfigurations = { - mecca = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ - ./common.nix - ./mecca/home.nix - ]; - }; - }; - } -} diff --git a/.config/nixos/flake.lock b/.config/nix/flake.lock similarity index 100% rename from .config/nixos/flake.lock rename to .config/nix/flake.lock diff --git a/.config/nixos/flake.nix b/.config/nix/flake.nix similarity index 86% rename from .config/nixos/flake.nix rename to .config/nix/flake.nix index 0886e6f..47c0884 100755 --- a/.config/nixos/flake.nix +++ b/.config/nix/flake.nix @@ -8,24 +8,20 @@ stylix.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = { self, nixpkgs, ... }@inputs: { - - /* homeConfigurations = { mecca = home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = [ - ./common.nix - ./mecca/home.nix + ./hosts/common.nix + ./hosts/mecca/home.nix ]; }; }; - */ - nixosConfigurations = { mecca = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs;}; modules = [ - ./mecca/configuration.nix + ./hosts/mecca/configuration.nix inputs.stylix.nixosModules.stylix ]; }; @@ -33,7 +29,7 @@ system = "x86_64-linux"; specialArgs = {inherit inputs;}; modules = [ - ./syntheticnexus/configuration.nix + ./hosts/syntheticnexus/configuration.nix inputs.stylix.nixosModules.stylix ]; }; diff --git a/.config/home-manager/common.nix b/.config/nix/hosts/common.nix similarity index 100% rename from .config/home-manager/common.nix rename to .config/nix/hosts/common.nix diff --git a/.config/nix/hosts/generic-linux/home.nix b/.config/nix/hosts/generic-linux/home.nix new file mode 100644 index 0000000..e69de29 diff --git a/.config/nixos/mecca/bg.jpg b/.config/nix/hosts/mecca/bg.jpg similarity index 100% rename from .config/nixos/mecca/bg.jpg rename to .config/nix/hosts/mecca/bg.jpg diff --git a/.config/nixos/mecca/configuration.nix b/.config/nix/hosts/mecca/configuration.nix similarity index 100% rename from .config/nixos/mecca/configuration.nix rename to .config/nix/hosts/mecca/configuration.nix diff --git a/.config/nixos/mecca/hardware-configuration.nix b/.config/nix/hosts/mecca/hardware-configuration.nix similarity index 100% rename from .config/nixos/mecca/hardware-configuration.nix rename to .config/nix/hosts/mecca/hardware-configuration.nix diff --git a/.config/home-manager/mecca/home.nix b/.config/nix/hosts/mecca/home.nix similarity index 100% rename from .config/home-manager/mecca/home.nix rename to .config/nix/hosts/mecca/home.nix diff --git a/.config/nixos/syntheticnexus/bg.jpg b/.config/nix/hosts/syntheticnexus/bg.jpg similarity index 100% rename from .config/nixos/syntheticnexus/bg.jpg rename to .config/nix/hosts/syntheticnexus/bg.jpg diff --git a/.config/nixos/syntheticnexus/configuration.nix b/.config/nix/hosts/syntheticnexus/configuration.nix similarity index 100% rename from .config/nixos/syntheticnexus/configuration.nix rename to .config/nix/hosts/syntheticnexus/configuration.nix diff --git a/.config/nixos/syntheticnexus/hardware-configuration.nix b/.config/nix/hosts/syntheticnexus/hardware-configuration.nix similarity index 100% rename from .config/nixos/syntheticnexus/hardware-configuration.nix rename to .config/nix/hosts/syntheticnexus/hardware-configuration.nix