Skip to content

Commit

Permalink
Revert "feat(ci): First attempt at building and pushing to cachix via…
Browse files Browse the repository at this point in the history 
… CI"

This reverts commit 45d24fe.
  • Loading branch information
@mrjones2014
mrjones2014 committed Jan 7, 2025
1 parent 5a3d26b commit 164fcf2
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 183 deletions.
43 changes: 0 additions & 43 deletions .github/workflows/nix-build-and-cache.yml
View file

This file was deleted.

238 changes: 101 additions & 137 deletions flake.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
catppuccin.url = "github:catppuccin/nix";
tokyonight.url = "github:mrjones2014/tokyonight.nix";
flake-utils.url = "github:numtide/flake-utils";
wezterm-nightly = {
url = "github:wez/wezterm?dir=nix";
inputs.nixpkgs.follows = "nixpkgs";
Expand All @@ -32,148 +31,113 @@
};
};

nixConfig = {
extra-substituters = [
"https://nix-community.cachix.org"
"https://mrjones2014-dotfiles.cachix.org"
];
extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"mrjones2014-dotfiles.cachix.org-1:c66wfzthG6KZEWnltlzW/EjhlH9FwUVi5jM4rVD1Rw4="
];
};
outputs = inputs@{ self, nixpkgs, home-manager, agenix, flake-utils, ... }:
{
nixosConfigurations = {
server = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
isServer = true;
isLinux = true;
isThinkpad = false;
isDarwin = false;
};
system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
agenix.nixosModules.default
{
environment.systemPackages =
[ agenix.packages.x86_64-linux.default ];
}
./nixos-modules/common.nix
./hosts/server
{
home-manager = {
backupFileExtension = "backup";
useUserPackages = true;
users.mat = import ./home-manager/server.nix;
extraSpecialArgs = {
inherit inputs;
isServer = true;
isLinux = true;
isThinkpad = false;
isDarwin = false;
};
};
}
];
outputs = inputs@{ self, nixpkgs, home-manager, agenix, ... }: {
nixosConfigurations = {
server = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
isServer = true;
isLinux = true;
isThinkpad = false;
isDarwin = false;
};
pc = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
isServer = false;
isDarwin = false;
isLinux = true;
isThinkpad = false;
};
system = "x86_64-linux";
modules = [
./nixos-modules/common.nix
./hosts/pc
home-manager.nixosModules.home-manager
{
home-manager = {
backupFileExtension = "backup";
useUserPackages = true;
users.mat = import ./home-manager/home.nix;
extraSpecialArgs = {
inherit inputs;
isServer = false;
isDarwin = false;
isLinux = true;
isThinkpad = false;
};
system = "x86_64-linux";
modules = [
home-manager.nixosModules.home-manager
agenix.nixosModules.default
{
environment.systemPackages =
[ agenix.packages.x86_64-linux.default ];
}
./nixos-modules/common.nix
./hosts/server
{
home-manager = {
backupFileExtension = "backup";
useUserPackages = true;
users.mat = import ./home-manager/server.nix;
extraSpecialArgs = {
inherit inputs;
isServer = true;
isLinux = true;
isThinkpad = false;
isDarwin = false;
};
}
];
};
}
];
};
pc = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
isServer = false;
isDarwin = false;
isLinux = true;
isThinkpad = false;
};
laptop = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
isServer = false;
isDarwin = false;
isLinux = true;
isThinkpad = true;
};
system = "x86_64-linux";
modules = [
./nixos-modules/common.nix
./hosts/laptop
home-manager.nixosModules.home-manager
{
home-manager = {
backupFileExtension = "backup";
useUserPackages = true;
users.mat = import ./home-manager/home.nix;
extraSpecialArgs = {
inherit inputs;
isServer = false;
isDarwin = false;
isLinux = true;
isThinkpad = true;
};
system = "x86_64-linux";
modules = [
./nixos-modules/common.nix
./hosts/pc
home-manager.nixosModules.home-manager
{
home-manager = {
backupFileExtension = "backup";
useUserPackages = true;
users.mat = import ./home-manager/home.nix;
extraSpecialArgs = {
inherit inputs;
isServer = false;
isDarwin = false;
isLinux = true;
isThinkpad = false;
};
}
];
};
}
];
};
laptop = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
isServer = false;
isDarwin = false;
isLinux = true;
isThinkpad = true;
};
system = "x86_64-linux";
modules = [
./nixos-modules/common.nix
./hosts/laptop
home-manager.nixosModules.home-manager
{
home-manager = {
backupFileExtension = "backup";
useUserPackages = true;
users.mat = import ./home-manager/home.nix;
extraSpecialArgs = {
inherit inputs;
isServer = false;
isDarwin = false;
isLinux = true;
isThinkpad = true;
};
};
}
];
};
homeConfigurations = {
"mac" = home-manager.lib.homeManagerConfiguration {
extraSpecialArgs = {
inherit inputs;
isServer = false;
isDarwin = true;
isLinux = false;
isThinkpad = false;
};
pkgs = nixpkgs.legacyPackages.aarch64-darwin;
modules = [ ./home-manager/home.nix ];
};
homeConfigurations = {
"mac" = home-manager.lib.homeManagerConfiguration {
extraSpecialArgs = {
inherit inputs;
isServer = false;
isDarwin = true;
isLinux = false;
isThinkpad = false;
};
pkgs = nixpkgs.legacyPackages.aarch64-darwin;
modules = [ ./home-manager/home.nix ];
};
} // inputs.flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system};

packages = nixpkgs.lib.filterAttrs
(_: pkg: builtins.any (x: x == system) pkg.meta.platforms)
(import ./packages {
inherit pkgs;
inherit inputs;
});

checksForConfigs = configs: extract:
nixpkgs.lib.attrsets.filterAttrs (_: p: p.system == system)
(nixpkgs.lib.attrsets.mapAttrs (_: extract) configs);
in {
inherit packages;

checks = nixpkgs.lib.lists.foldl nixpkgs.lib.attrsets.unionOfDisjoint
packages [
(checksForConfigs self.homeConfigurations
(hm: hm.activationPackage))
(checksForConfigs self.nixosConfigurations
(c: c.config.system.build.toplevel))
];
});
};
};
}
6 changes: 3 additions & 3 deletions home-manager/modules/fish.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@
${if isDarwin then
"home-manager switch --flake ~/git/dotfiles/.#mac"
else if isServer then
"sudo nixos-rebuild switch --flake ~/git/dotfiles/.#server --accept-nix-config"
"sudo nixos-rebuild switch --flake ~/git/dotfiles/.#server"
else if isThinkpad then
"sudo nixos-rebuild switch --flake ~/git/dotfiles/.#laptop --accept-nix-config"
"sudo nixos-rebuild switch --flake ~/git/dotfiles/.#laptop"
else
"sudo nixos-rebuild switch --flake ~/git/dotfiles/.#pc --accept-nix-config"}
"sudo nixos-rebuild switch --flake ~/git/dotfiles/.#pc"}
'';
};
nix-clean = {
Expand Down

0 comments on commit 164fcf2

Please sign in to comment.