🔥 stop using colmena for build/deploy
This commit is contained in:
parent
d5015af7c7
commit
48db300e6e
|
@ -5,9 +5,6 @@
|
||||||
Laureηt's Infrastructure <br>
|
Laureηt's Infrastructure <br>
|
||||||
<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/palette/macchiato.png" width="600px">
|
<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/palette/macchiato.png" width="600px">
|
||||||
|
|
||||||
<a href="https://github.com/zhaofengli/colmena">
|
|
||||||
<img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Deployment&message=colmena&color=fab387&labelColor=303446">
|
|
||||||
</a>
|
|
||||||
<a href="https://github.com/yaxitech/ragenix/">
|
<a href="https://github.com/yaxitech/ragenix/">
|
||||||
<img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Secrets&message=age&color=ea999c&labelColor=303446">
|
<img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Secrets&message=age&color=ea999c&labelColor=303446">
|
||||||
</a>
|
</a>
|
||||||
|
|
59
flake.nix
59
flake.nix
|
@ -26,13 +26,11 @@
|
||||||
|
|
||||||
outputs = { nixpkgs, flake-utils, lanzaboote, agenix, home-manager, ... }:
|
outputs = { nixpkgs, flake-utils, lanzaboote, agenix, home-manager, ... }:
|
||||||
|
|
||||||
# Provide colmena
|
|
||||||
(flake-utils.lib.eachDefaultSystem (system:
|
(flake-utils.lib.eachDefaultSystem (system:
|
||||||
let pkgs = nixpkgs.legacyPackages.${system};
|
let pkgs = nixpkgs.legacyPackages.${system};
|
||||||
in {
|
in {
|
||||||
devShells.default = pkgs.mkShell {
|
devShells.default = pkgs.mkShell {
|
||||||
packages = [
|
packages = [
|
||||||
pkgs.colmena # remote deployment
|
|
||||||
pkgs.nixfmt # formatting
|
pkgs.nixfmt # formatting
|
||||||
pkgs.git # version control
|
pkgs.git # version control
|
||||||
pkgs.update-nix-fetchgit # auto update fetchs
|
pkgs.update-nix-fetchgit # auto update fetchs
|
||||||
|
@ -42,45 +40,26 @@
|
||||||
};
|
};
|
||||||
})) // {
|
})) // {
|
||||||
|
|
||||||
# colmena
|
# neodymium laptop
|
||||||
colmena = {
|
nixosConfigurations.neodymium = nixpkgs.lib.nixosSystem {
|
||||||
meta = {
|
system = "x86_64-linux";
|
||||||
nixpkgs = import nixpkgs {
|
modules = [
|
||||||
system = "x86_64-linux";
|
./hosts/neodymium/configuration.nix
|
||||||
overlays = [ ];
|
home-manager.nixosModules.home-manager
|
||||||
};
|
agenix.nixosModules.default
|
||||||
};
|
lanzaboote.nixosModules.lanzaboote
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
# default config
|
# hydrogen vps
|
||||||
defaults = { name, ... }: {
|
nixosConfigurations.hydrogen = nixpkgs.lib.nixosSystem {
|
||||||
imports = [
|
system = "x86_64-linux";
|
||||||
./hosts/${name}/configuration.nix
|
modules = [
|
||||||
home-manager.nixosModules.home-manager
|
./hosts/hydrogen/configuration.nix
|
||||||
agenix.nixosModules.default
|
home-manager.nixosModules.home-manager
|
||||||
lanzaboote.nixosModules.lanzaboote
|
agenix.nixosModules.default
|
||||||
];
|
lanzaboote.nixosModules.lanzaboote
|
||||||
home-manager = {
|
];
|
||||||
useGlobalPkgs = true;
|
|
||||||
useUserPackages = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# personnal laptop
|
|
||||||
neodymium = { ... }: {
|
|
||||||
deployment = {
|
|
||||||
allowLocalDeployment = true;
|
|
||||||
targetHost = null;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# ovh vps
|
|
||||||
hydrogen = { ... }: {
|
|
||||||
deployment = {
|
|
||||||
targetHost = "178.62.253.235";
|
|
||||||
targetUser = "root";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ modulesPath, pkgs, lib, name, ... }: {
|
{ modulesPath, pkgs, lib, ... }: {
|
||||||
imports =
|
imports =
|
||||||
lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [
|
lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [
|
||||||
(modulesPath + "/virtualisation/digital-ocean-config.nix")
|
(modulesPath + "/virtualisation/digital-ocean-config.nix")
|
||||||
|
@ -7,7 +7,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = name;
|
hostName = "hydrogen";
|
||||||
domain = "fainsin.bzh";
|
domain = "fainsin.bzh";
|
||||||
firewall = {
|
firewall = {
|
||||||
allowedTCPPorts = [
|
allowedTCPPorts = [
|
||||||
|
|
|
@ -30,7 +30,11 @@
|
||||||
};
|
};
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
|
|
||||||
home-manager = { users.laurent = ./home; };
|
home-manager = {
|
||||||
|
useGlobalPkgs = true;
|
||||||
|
useUserPackages = true;
|
||||||
|
users.laurent = ./home;
|
||||||
|
};
|
||||||
|
|
||||||
# enable gnome virtual file system
|
# enable gnome virtual file system
|
||||||
services.gvfs.enable = true;
|
services.gvfs.enable = true;
|
||||||
|
|
|
@ -1,6 +1,13 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, lib, ... }: {
|
||||||
nixpkgs.config.allowUnfree = false;
|
nixpkgs.config.allowUnfreePredicate = pkg:
|
||||||
services.mpris-proxy.enable = true;
|
builtins.elem (lib.getName pkg) [
|
||||||
|
"vscode-insiders"
|
||||||
|
"vscode-extension-github-copilot"
|
||||||
|
"vscode-extension-ms-vsliveshare-vsliveshare"
|
||||||
|
];
|
||||||
|
|
||||||
|
services.mpris-proxy.enable = true; # media keys
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
baobab # disk utils
|
baobab # disk utils
|
||||||
borgbackup # backup
|
borgbackup # backup
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
(oldAttrs: {
|
(oldAttrs: {
|
||||||
src = (builtins.fetchTarball {
|
src = (builtins.fetchTarball {
|
||||||
url =
|
url =
|
||||||
"https://code.visualstudio.com/sha/download?build=insider&os=linux-x64#2023-05-26";
|
"https://code.visualstudio.com/sha/download?build=insider&os=linux-x64";
|
||||||
sha256 = "1cgrn4n6y348x0c7ndmn5vssvpj1sdk27bp91cayr27fb59lgmv9";
|
sha256 = "1cgrn4n6y348x0c7ndmn5vssvpj1sdk27bp91cayr27fb59lgmv9";
|
||||||
});
|
});
|
||||||
pname = "vscode-insiders";
|
pname = "vscode-insiders";
|
||||||
|
|
Loading…
Reference in a new issue