Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
112 changes: 13 additions & 99 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 1 addition & 29 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
};

# Tools + Utils
deploy-rs.url = "github:serokell/deploy-rs";
flake-utils.url = "github:numtide/flake-utils";
agenix = {
url = "github:ryantm/agenix";
Expand Down Expand Up @@ -90,7 +89,6 @@
let
overlays = [
inputs.agenix.overlays.default
inputs.deploy-rs.overlays.default
inputs.i3ws.overlay
inputs.annodate.overlay
inputs.nixon.overlay
Expand Down Expand Up @@ -119,14 +117,6 @@
# NixOS machines
nixosConfigurations = lib.myme.allProfiles lib.myme.makeNixOS;

# Deploy nodes
deploy.nodes = lib.myme.allProfilesIf (_: host: host ? deploy) (
lib.myme.deployConf {
inherit (inputs) deploy-rs;
inherit (self) nixosConfigurations;
}
);

# Non-NixOS machines (Fedora, WSL, ++)
homeConfigurations = lib.myme.nixos2hm { inherit (self) nixosConfigurations; };

Expand Down Expand Up @@ -174,29 +164,14 @@
formatter = treefmtEval.config.build.wrapper;

# `nix flake check`
checks = {
pre-commit = pre-commit-check;
}
// lib.optionalAttrs (inputs.deploy-rs.lib ? ${system}) (
# Only check deploy nodes that target the current system —
# cross-arch builds would require qemu emulation in CI.
inputs.deploy-rs.lib.${system}.deployChecks {
nodes = lib.filterAttrs (
name: _: self.nixosConfigurations.${name}.pkgs.stdenv.hostPlatform.system == system
) self.deploy.nodes;
}
);
checks.pre-commit = pre-commit-check;

# Apps for `nix run .#<app>` (Linux only)
apps = lib.optionalAttrs isLinux {
agenix = {
type = "app";
program = "${pkgs.agenix}/bin/agenix";
};
deploy = {
type = "app";
program = "${pkgs.deploy-rs.deploy-rs}/bin/deploy";
};
};

# All packages under pkgs.myme.pkgs from the overlay (Linux only)
Expand All @@ -219,9 +194,6 @@
};
}
// lib.optionalAttrs isLinux {
# Deployment to other nodes
deploy = pkgs.mkShell { buildInputs = with pkgs; [ deploy-rs.deploy-rs ]; };

# For hacking on XMonad
xmonad = pkgs.mkShell {
buildInputs = with pkgs; [
Expand Down
1 change: 0 additions & 1 deletion lib/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ in
allNixFiles = import ./allNixFiles.nix { inherit lib; };
allProfiles = allProfilesIf (_: _: true);
inherit allProfilesIf;
deployConf = import ./deployConf.nix;
nixos2hm = import ./nixos2hm.nix { inherit lib; };
makeNixOS = import ./makeNixOS.nix { inherit inputs overlays; };
};
Expand Down
12 changes: 0 additions & 12 deletions lib/deployConf.nix

This file was deleted.

8 changes: 0 additions & 8 deletions machines/deque.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@ let
in
{
inherit system;
deploy = {
host = "deque.myme.no";
sshOpts = [
"-A"
"-p"
(builtins.toString sshPort)
];
};
stable = true;
config =
{
Expand Down
4 changes: 0 additions & 4 deletions machines/nuckie/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{
system = "x86_64-linux";
deploy = {
host = "192.168.1.5";
sshOpts = [ "-tt" ];
};
config =
{
config,
Expand Down
4 changes: 0 additions & 4 deletions machines/rassie.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@ let
in
{
inherit system;
deploy = {
host = "192.168.1.7";
sshOpts = [ "-t" ];
};
stable = true;
config =
{
Expand Down
Loading