From 95f11fc8d027a04e0dc62a0deca25051311df212 Mon Sep 17 00:00:00 2001 From: John Bowdre Date: Fri, 4 Aug 2023 08:53:54 -0500 Subject: [PATCH] promote nix content to top-level dir --- flake.nix | 16 ++++++++-------- {nix/home => home}/features/cli/default.nix | 0 {nix/home => home}/features/cli/exa.nix | 0 .../features/cli/extras/default.nix | 0 .../home => home}/features/cli/extras/direnv.nix | 0 {nix/home => home}/features/cli/extras/go.nix | 0 {nix/home => home}/features/cli/fish.nix | 0 {nix/home => home}/features/cli/git.nix | 0 {nix/home => home}/features/cli/tmux.nix | 0 {nix/home => home}/features/cli/vim.nix | 0 {nix/home => home}/features/desktop/default.nix | 0 {nix/home => home}/features/desktop/firefox.nix | 0 {nix/home => home}/features/desktop/vscode.nix | 0 {nix/home => home}/global/default.nix | 0 {nix/home => home}/lib/chromeos.nix | 0 {nix/home => home}/penguin-duet.nix | 0 {nix/home => home}/penguin-fw.nix | 0 {nix/home => home}/pixnix.nix | 0 .../modules => modules}/home-manager/default.nix | 0 {nix/modules => modules}/nixos/default.nix | 0 {nix/overlays => overlays}/default.nix | 0 {nix/pkgs => pkgs}/default.nix | 0 {nix/pkgs => pkgs}/trekscii/default.nix | 0 23 files changed, 8 insertions(+), 8 deletions(-) rename {nix/home => home}/features/cli/default.nix (100%) rename {nix/home => home}/features/cli/exa.nix (100%) rename {nix/home => home}/features/cli/extras/default.nix (100%) rename {nix/home => home}/features/cli/extras/direnv.nix (100%) rename {nix/home => home}/features/cli/extras/go.nix (100%) rename {nix/home => home}/features/cli/fish.nix (100%) rename {nix/home => home}/features/cli/git.nix (100%) rename {nix/home => home}/features/cli/tmux.nix (100%) rename {nix/home => home}/features/cli/vim.nix (100%) rename {nix/home => home}/features/desktop/default.nix (100%) rename {nix/home => home}/features/desktop/firefox.nix (100%) rename {nix/home => home}/features/desktop/vscode.nix (100%) rename {nix/home => home}/global/default.nix (100%) rename {nix/home => home}/lib/chromeos.nix (100%) rename {nix/home => home}/penguin-duet.nix (100%) rename {nix/home => home}/penguin-fw.nix (100%) rename {nix/home => home}/pixnix.nix (100%) rename {nix/modules => modules}/home-manager/default.nix (100%) rename {nix/modules => modules}/nixos/default.nix (100%) rename {nix/overlays => overlays}/default.nix (100%) rename {nix/pkgs => pkgs}/default.nix (100%) rename {nix/pkgs => pkgs}/trekscii/default.nix (100%) diff --git a/flake.nix b/flake.nix index 85b8130..9e045eb 100644 --- a/flake.nix +++ b/flake.nix @@ -38,19 +38,19 @@ in { inherit lib; - nixosModules = import ./nix/modules/nixos; - homeManagerModules = import ./nix/modules/home-manager; + nixosModules = import ./modules/nixos; + homeManagerModules = import ./modules/home-manager; - overlays = import ./nix/overlays { inherit inputs outputs; }; + overlays = import ./overlays { inherit inputs outputs; }; - packages = forEachSystem (pkgs: import ./nix/pkgs { inherit pkgs; }); + packages = forEachSystem (pkgs: import ./pkgs { inherit pkgs; }); devShells = forEachSystem (pkgs: import ./shell.nix { inherit pkgs; }); formatter = forEachSystem (pkgs: pkgs.nixpkgs-fmt); nixosConfigurations = { # Pixelbook converted to NixOS pixnix = lib.nixosSystem { - modules = [ ./nix/hosts/pixnix ]; + modules = [ ./hosts/pixnix ]; specialArgs = { inherit inputs outputs; }; }; }; @@ -59,17 +59,17 @@ # Available through 'home-manager --flake .#your-username@your-hostname' homeConfigurations = { "john@penguin-fw" = lib.homeManagerConfiguration { - modules = [ ./nix/home/penguin-fw.nix ]; + modules = [ ./home/penguin-fw.nix ]; pkgs = pkgsFor.x86_64-linux; extraSpecialArgs = { inherit inputs outputs; }; }; "john@penguin-duet" = lib.homeManagerConfiguration { - modules = [ ./nix/home/penguin-duet.nix ]; + modules = [ ./home/penguin-duet.nix ]; pkgs = pkgsFor.aarch64-linux; extraSpecialArgs = { inherit inputs outputs; }; }; "john@pixnix" = lib.homeManagerConfiguration { - modules = [ ./nix/home/pixnix.nix ]; + modules = [ ./home/pixnix.nix ]; pkgs = pkgsFor.x86_64-linux; extraSpecialArgs = { inherit inputs outputs; }; }; diff --git a/nix/home/features/cli/default.nix b/home/features/cli/default.nix similarity index 100% rename from nix/home/features/cli/default.nix rename to home/features/cli/default.nix diff --git a/nix/home/features/cli/exa.nix b/home/features/cli/exa.nix similarity index 100% rename from nix/home/features/cli/exa.nix rename to home/features/cli/exa.nix diff --git a/nix/home/features/cli/extras/default.nix b/home/features/cli/extras/default.nix similarity index 100% rename from nix/home/features/cli/extras/default.nix rename to home/features/cli/extras/default.nix diff --git a/nix/home/features/cli/extras/direnv.nix b/home/features/cli/extras/direnv.nix similarity index 100% rename from nix/home/features/cli/extras/direnv.nix rename to home/features/cli/extras/direnv.nix diff --git a/nix/home/features/cli/extras/go.nix b/home/features/cli/extras/go.nix similarity index 100% rename from nix/home/features/cli/extras/go.nix rename to home/features/cli/extras/go.nix diff --git a/nix/home/features/cli/fish.nix b/home/features/cli/fish.nix similarity index 100% rename from nix/home/features/cli/fish.nix rename to home/features/cli/fish.nix diff --git a/nix/home/features/cli/git.nix b/home/features/cli/git.nix similarity index 100% rename from nix/home/features/cli/git.nix rename to home/features/cli/git.nix diff --git a/nix/home/features/cli/tmux.nix b/home/features/cli/tmux.nix similarity index 100% rename from nix/home/features/cli/tmux.nix rename to home/features/cli/tmux.nix diff --git a/nix/home/features/cli/vim.nix b/home/features/cli/vim.nix similarity index 100% rename from nix/home/features/cli/vim.nix rename to home/features/cli/vim.nix diff --git a/nix/home/features/desktop/default.nix b/home/features/desktop/default.nix similarity index 100% rename from nix/home/features/desktop/default.nix rename to home/features/desktop/default.nix diff --git a/nix/home/features/desktop/firefox.nix b/home/features/desktop/firefox.nix similarity index 100% rename from nix/home/features/desktop/firefox.nix rename to home/features/desktop/firefox.nix diff --git a/nix/home/features/desktop/vscode.nix b/home/features/desktop/vscode.nix similarity index 100% rename from nix/home/features/desktop/vscode.nix rename to home/features/desktop/vscode.nix diff --git a/nix/home/global/default.nix b/home/global/default.nix similarity index 100% rename from nix/home/global/default.nix rename to home/global/default.nix diff --git a/nix/home/lib/chromeos.nix b/home/lib/chromeos.nix similarity index 100% rename from nix/home/lib/chromeos.nix rename to home/lib/chromeos.nix diff --git a/nix/home/penguin-duet.nix b/home/penguin-duet.nix similarity index 100% rename from nix/home/penguin-duet.nix rename to home/penguin-duet.nix diff --git a/nix/home/penguin-fw.nix b/home/penguin-fw.nix similarity index 100% rename from nix/home/penguin-fw.nix rename to home/penguin-fw.nix diff --git a/nix/home/pixnix.nix b/home/pixnix.nix similarity index 100% rename from nix/home/pixnix.nix rename to home/pixnix.nix diff --git a/nix/modules/home-manager/default.nix b/modules/home-manager/default.nix similarity index 100% rename from nix/modules/home-manager/default.nix rename to modules/home-manager/default.nix diff --git a/nix/modules/nixos/default.nix b/modules/nixos/default.nix similarity index 100% rename from nix/modules/nixos/default.nix rename to modules/nixos/default.nix diff --git a/nix/overlays/default.nix b/overlays/default.nix similarity index 100% rename from nix/overlays/default.nix rename to overlays/default.nix diff --git a/nix/pkgs/default.nix b/pkgs/default.nix similarity index 100% rename from nix/pkgs/default.nix rename to pkgs/default.nix diff --git a/nix/pkgs/trekscii/default.nix b/pkgs/trekscii/default.nix similarity index 100% rename from nix/pkgs/trekscii/default.nix rename to pkgs/trekscii/default.nix