🔥 stop using colmena for build/deploy

This commit is contained in:
Laureηt 2023-05-27 18:11:03 +02:00
parent d5015af7c7
commit 48db300e6e
Signed by: Laurent
SSH key fingerprint: SHA256:kZEpW8cMJ54PDeCvOhzreNr4FSh6R13CMGH/POoO8DI
6 changed files with 37 additions and 50 deletions

View file

@ -5,9 +5,6 @@
Laureηt's Infrastructure <br>
<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/">
<img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Secrets&message=age&color=ea999c&labelColor=303446">
</a>

View file

@ -26,13 +26,11 @@
outputs = { nixpkgs, flake-utils, lanzaboote, agenix, home-manager, ... }:
# Provide colmena
(flake-utils.lib.eachDefaultSystem (system:
let pkgs = nixpkgs.legacyPackages.${system};
in {
devShells.default = pkgs.mkShell {
packages = [
pkgs.colmena # remote deployment
pkgs.nixfmt # formatting
pkgs.git # version control
pkgs.update-nix-fetchgit # auto update fetchs
@ -42,45 +40,26 @@
};
})) // {
# colmena
colmena = {
meta = {
nixpkgs = import nixpkgs {
# neodymium laptop
nixosConfigurations.neodymium = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
overlays = [ ];
};
};
# default config
defaults = { name, ... }: {
imports = [
./hosts/${name}/configuration.nix
modules = [
./hosts/neodymium/configuration.nix
home-manager.nixosModules.home-manager
agenix.nixosModules.default
lanzaboote.nixosModules.lanzaboote
];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
};
};
# personnal laptop
neodymium = { ... }: {
deployment = {
allowLocalDeployment = true;
targetHost = null;
# hydrogen vps
nixosConfigurations.hydrogen = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
./hosts/hydrogen/configuration.nix
home-manager.nixosModules.home-manager
agenix.nixosModules.default
lanzaboote.nixosModules.lanzaboote
];
};
};
# ovh vps
hydrogen = { ... }: {
deployment = {
targetHost = "178.62.253.235";
targetUser = "root";
};
};
};
};
}

View file

@ -1,4 +1,4 @@
{ modulesPath, pkgs, lib, name, ... }: {
{ modulesPath, pkgs, lib, ... }: {
imports =
lib.optional (builtins.pathExists ./do-userdata.nix) ./do-userdata.nix ++ [
(modulesPath + "/virtualisation/digital-ocean-config.nix")
@ -7,7 +7,7 @@
];
networking = {
hostName = name;
hostName = "hydrogen";
domain = "fainsin.bzh";
firewall = {
allowedTCPPorts = [

View file

@ -30,7 +30,11 @@
};
programs.zsh.enable = true;
home-manager = { users.laurent = ./home; };
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.laurent = ./home;
};
# enable gnome virtual file system
services.gvfs.enable = true;

View file

@ -1,6 +1,13 @@
{ pkgs, ... }: {
nixpkgs.config.allowUnfree = false;
services.mpris-proxy.enable = true;
{ pkgs, lib, ... }: {
nixpkgs.config.allowUnfreePredicate = pkg:
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; [
baobab # disk utils
borgbackup # backup

View file

@ -5,7 +5,7 @@
(oldAttrs: {
src = (builtins.fetchTarball {
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";
});
pname = "vscode-insiders";