basic implementation for own packages/services

This commit is contained in:
Kabbone 2025-09-15 13:01:04 +02:00
parent 583dd62731
commit fc71ffdb18
Signed by: Kabbone
SSH Key Fingerprint: SHA256:A5zPB5I6u5V78V51c362BBdCwhDhfDUVbt7NfKdjWBY
4 changed files with 28 additions and 10 deletions

View File

@ -36,6 +36,11 @@ let
config.allowUnfree = true; # Allow proprietary software config.allowUnfree = true; # Allow proprietary software
}; };
pkgs-kabbone = import ../packages {
inherit system;
inherit pkgs;
};
lib = nixpkgs.lib; lib = nixpkgs.lib;
users.defaultShell = "pkgs.zsh"; users.defaultShell = "pkgs.zsh";
@ -43,7 +48,7 @@ in
{ {
hades = lib.nixosSystem { # Desktop profile hades = lib.nixosSystem { # Desktop profile
inherit system; inherit system;
specialArgs = { inherit inputs pkgs-stable user location nixos-hardware agenix microvm nixpkgs lanzaboote; }; specialArgs = { inherit inputs pkgs-stable user location nixos-hardware agenix microvm nixpkgs lanzaboote pkgs-kabbone; };
modules = [ modules = [
agenix.nixosModules.default agenix.nixosModules.default
microvm.nixosModules.host microvm.nixosModules.host
@ -205,7 +210,7 @@ in
jupiter = lib.nixosSystem { # Desktop profile jupiter = lib.nixosSystem { # Desktop profile
inherit system; inherit system;
specialArgs = { inherit inputs user location nixos-hardware agenix; }; specialArgs = { inherit inputs user location nixos-hardware agenix pkgs-kabbone; };
modules = [ modules = [
agenix.nixosModules.default agenix.nixosModules.default
./jupiter ./jupiter

View File

@ -17,7 +17,7 @@
# └─ default.nix # └─ default.nix
# #
{ config, nixpkgs, pkgs, user, lib, ... }: { config, nixpkgs, pkgs, user, lib, pkgs-kabbone, ... }:
{ {
imports = # For now, if applying to other system, swap files imports = # For now, if applying to other system, swap files
@ -25,6 +25,7 @@
[(import ../../modules/wm/sway/default.nix)] ++ # Window Manager [(import ../../modules/wm/sway/default.nix)] ++ # Window Manager
(import ../../modules/wm/virtualisation) ++ # libvirt + Docker (import ../../modules/wm/virtualisation) ++ # libvirt + Docker
[(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++ # kvm module options [(import ../../modules/wm/virtualisation/kvm-amd.nix)] ++ # kvm module options
#[(import ../../modules/kabbone/corosync-qdevice.nix)] ++ # corosync qdevice quorum
(import ../../modules/hardware); # Hardware devices (import ../../modules/hardware); # Hardware devices
boot = { # Boot options boot = { # Boot options
@ -54,8 +55,9 @@
# }; # };
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = [
linux-firmware pkgs.linux-firmware
pkgs-kabbone.corosync-qdevice
]; ];
}; };

View File

@ -17,7 +17,7 @@
# └─ default.nix # └─ default.nix
# #
{ config, pkgs, user, ... }: { config, pkgs, user, pkgs-kabbone, ... }:
{ {
imports = # For now, if applying to other ssystem, swap files imports = # For now, if applying to other ssystem, swap files
@ -40,10 +40,11 @@
}; };
# environment = { # environment = {
# systemPackages = with pkgs; [ # systemPackages = with pkgs-kabbone; [
## simple-scan # corosync-qdevice
## intel-media-driver ### simple-scan
## alacritty ### intel-media-driver
### alacritty
# ]; # ];
# }; # };

View File

@ -7,6 +7,7 @@
}: }:
let let
cfg = config.services.corosync-qnetd; cfg = config.services.corosync-qnetd;
dataDir = "/var/run/corosync-qnetd";
in in
{ {
# interface # interface
@ -27,6 +28,15 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = [ cfg.package ]; environment.systemPackages = [ cfg.package ];
users.users.coroqnetd = {
isSystemUser = true;
group = "coroqnetd";
home = dataDir;
description = "Corosync-qnetd Service User";
};
users.groups.coroqnetd = { };
# environment.etc."corosync/corosync-qnetd.conf".text = '' # environment.etc."corosync/corosync-qnetd.conf".text = ''
# totem { # totem {
# version: 2 # version: 2