diff --git a/home-manager/pop-os.nix b/configuration/pop-os/default.nix similarity index 51% rename from home-manager/pop-os.nix rename to configuration/pop-os/default.nix index 42af21f7..9ed9e698 100644 --- a/home-manager/pop-os.nix +++ b/configuration/pop-os/default.nix @@ -2,11 +2,11 @@ { imports = [ - ./modules/alacritty.nix - ./modules/git.nix - ./modules/home-manager.nix - ./modules/tmux.nix - ./modules/zsh.nix + ../../home-manager/modules/alacritty.nix + ../../home-manager/modules/git.nix + ../../home-manager/modules/home-manager.nix + ../../home-manager/modules/tmux.nix + ../../home-manager/modules/zsh.nix ]; fonts.fontconfig.enable = true; @@ -16,7 +16,6 @@ docker-compose jetbrains-mono just - meslo-lg neovim ]; diff --git a/configuration/wsl2/default.nix b/configuration/wsl2/default.nix new file mode 100644 index 00000000..84c12423 --- /dev/null +++ b/configuration/wsl2/default.nix @@ -0,0 +1,18 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ../../home-manager/modules/git.nix + ../../home-manager/modules/home-manager.nix + ../../home-manager/modules/tmux.nix + ../../home-manager/modules/zsh.nix + ]; + + home.packages = with pkgs; [ + just + neovim + zsh + ]; + + programs.bat.enable = true; +} diff --git a/flake.nix b/flake.nix index e62af6de..4ccae06a 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ pop-os = home-manager.lib.homeManagerConfiguration { modules = [ { nixpkgs.overlays = overlays; } - ./home-manager/pop-os.nix + ./configuration/pop-os ]; pkgs = nixpkgs.legacyPackages.x86_64-linux; }; @@ -23,7 +23,7 @@ wsl2 = home-manager.lib.homeManagerConfiguration { modules = [ { nixpkgs.overlays = overlays; } - ./home-manager/wsl2.nix + ./configuration/wsl2 ]; pkgs = nixpkgs.legacyPackages.x86_64-linux; }; diff --git a/home-manager/wsl2.nix b/home-manager/wsl2.nix deleted file mode 100644 index 45d0b44d..00000000 --- a/home-manager/wsl2.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - imports = [ - ./modules/git.nix - ./modules/home-manager.nix - ./modules/tmux.nix - ./modules/zsh.nix - ]; - - home.packages = with pkgs; [ - just - neovim - zsh - ]; - - programs.bat.enable = true; -}