Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremystucki committed May 26, 2024
1 parent 910033d commit 760ba59
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 110 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ jobs:
- "nixosConfigurations.volt-nixos.config.system.build.toplevel"
- "nixosConfigurations.zephyr-nixos.config.system.build.toplevel"
- "[email protected]"
- "[email protected]"

runs-on: ubuntu-latest

Expand Down
11 changes: 0 additions & 11 deletions zephyr/home-manager.nix → common/home-manager.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
targets.genericLinux.enable = true;

imports = map (x: ../components + x) [
/alacritty.nix
/cli.nix
Expand All @@ -10,7 +8,6 @@
/dotnet.nix
/gcloud.nix
/git.nix
/gnome.nix
/haskell.nix
/tex.nix
/tmux.nix
Expand All @@ -24,12 +21,4 @@
home.stateVersion = "23.05";

programs.home-manager.enable = true;

home.file.".config/alacritty/machine-specific-config.yml".text = "";

programs.zathura.enable = true;

programs.vscode.userSettings = {
workbench.colorTheme = "Default Light+";
};
}
1 change: 1 addition & 0 deletions components/code.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

userSettings = {
git.mergeEditor = true;
workbench.colorTheme = "Solarized Dark";
};
};

Expand Down
15 changes: 7 additions & 8 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,17 @@
{ module }:
home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [ module ];
modules = [
./common/home-manager.nix
module
];
extraSpecialArgs = {
inherit pkgs-unstable;
targets.genericLinux.enable = true;
};
};
nixosConfig =
{ nixosModule, homeManagerModule }:
{ nixosModule, homeManagerModule ? {} }:
nixpkgs.lib.nixosSystem {
specialArgs = {
inherit pkgs pkgs-unstable;
Expand All @@ -64,6 +67,7 @@
home-manager.nixosModules.home-manager
{
home-manager.users.jeremy.imports = [
./common/home-manager.nix
./common/nixos-home-manager.nix
homeManagerModule
];
Expand All @@ -77,18 +81,13 @@
in
{
homeConfigurations."jeremy@volt" = homeManagerConfigForArch {
module = ./volt/common-home-manager.nix;
};
homeConfigurations."jeremy@zephyr" = homeManagerConfigForArch {
module = ./zephyr/home-manager.nix;
module = ./volt/home-manager.nix;
};
nixosConfigurations."volt-nixos" = nixosConfig {
nixosModule = ./volt/nixos-configuration.nix;
homeManagerModule = ./volt/common-home-manager.nix;
};
nixosConfigurations."zephyr-nixos" = nixosConfig {
nixosModule = ./zephyr/nixos-configuration.nix;
homeManagerModule = ./zephyr/common-home-manager.nix;
};
};
}
45 changes: 0 additions & 45 deletions volt/common-home-manager.nix

This file was deleted.

3 changes: 3 additions & 0 deletions volt/home-manager.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
home.file.".config/alacritty/machine-specific-config.yml".source = ../resources/alacritty-volt.yml;
}
45 changes: 0 additions & 45 deletions zephyr/common-home-manager.nix

This file was deleted.

0 comments on commit 760ba59

Please sign in to comment.