Skip to content

upate flakes, add certstrap #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 2 commits into from
May 11, 2026
Merged

upate flakes, add certstrap #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcba40c
update: nix flakes
sebastian-de May 11, 2026
489a4ec
feat: add certstrap
sebastian-de May 11, 2026
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
36 changes: 18 additions & 18 deletions flake.lock
View file
Open in desktop

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

75 changes: 46 additions & 29 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@
};
};

outputs = inputs@{ self, nixpkgs, flake-parts, home-manager, plasma-manager, ... }:
outputs =
inputs@{
self,
nixpkgs,
flake-parts,
home-manager,
plasma-manager,
...
}:

flake-parts.lib.mkFlake { inherit inputs; } {

Expand All @@ -30,38 +38,47 @@
"aarch64-linux"
];

perSystem = { config, pkgs, ... }: {
formatter = pkgs.nixpkgs-fmt;
packages = {
fos-export = pkgs.writeShellScriptBin "fos-export" (builtins.readFile ./fos-export);
fos-flash = pkgs.writeShellScriptBin "fos-flash" (builtins.readFile ./fos-flash);
fos-generate = pkgs.writeShellScriptBin "fos-generate" (builtins.readFile ./fos-generate);
fos-mount = pkgs.writeShellScriptBin "fos-mount" (builtins.readFile ./fos-mount);
fos-partitions = pkgs.writeShellScriptBin "fos-partitions" (builtins.readFile ./fos-partitions);
fos-renew = pkgs.writeShellScriptBin "fos-renew" (builtins.readFile ./fos-renew);
fos-rotate-passwords = pkgs.writeShellScriptBin "fos-rotate-passwords" (builtins.readFile ./fos-rotate-passwords);
fos-sync = pkgs.writeShellScriptBin "fos-sync" (builtins.readFile ./fos-sync);
fos-working-directory = pkgs.writeShellScriptBin "fos-working-directory" (builtins.readFile ./fos-working-directory);
openpgp-ca = pkgs.openpgp-ca.overrideAttrs (prevAttrs: rec {
version = "${prevAttrs.version}-famedly";
src = pkgs.fetchFromGitHub {
owner = "famedly";
repo = "openpgp-ca";
rev = "expose-more-functionality";
hash = "sha256-+dAwGq3/86A1oLGdjvRHLmS+SiZrv/DqTi+fTRG8uZQ=";
};
cargoDeps = prevAttrs.cargoDeps.overrideAttrs (pkgs.lib.const {
name = "${prevAttrs.pname}-vendor.tar.gz";
inherit src;
outputHash = "sha256-hmgWa4pas3qngs6MNPzk3fPG5+jFRph0lGZvtUF4/tA=";
perSystem =
{ pkgs, ... }:
{
formatter = pkgs.nixpkgs-fmt;
packages = {
fos-export = pkgs.writeShellScriptBin "fos-export" (builtins.readFile ./fos-export);
fos-flash = pkgs.writeShellScriptBin "fos-flash" (builtins.readFile ./fos-flash);
fos-generate = pkgs.writeShellScriptBin "fos-generate" (builtins.readFile ./fos-generate);
fos-mount = pkgs.writeShellScriptBin "fos-mount" (builtins.readFile ./fos-mount);
fos-partitions = pkgs.writeShellScriptBin "fos-partitions" (builtins.readFile ./fos-partitions);
fos-renew = pkgs.writeShellScriptBin "fos-renew" (builtins.readFile ./fos-renew);
fos-rotate-passwords = pkgs.writeShellScriptBin "fos-rotate-passwords" (
builtins.readFile ./fos-rotate-passwords
);
fos-sync = pkgs.writeShellScriptBin "fos-sync" (builtins.readFile ./fos-sync);
fos-working-directory = pkgs.writeShellScriptBin "fos-working-directory" (
builtins.readFile ./fos-working-directory
);
openpgp-ca = pkgs.openpgp-ca.overrideAttrs (prevAttrs: rec {
version = "${prevAttrs.version}-famedly";
src = pkgs.fetchFromGitHub {
owner = "famedly";
repo = "openpgp-ca";
rev = "expose-more-functionality";
hash = "sha256-+dAwGq3/86A1oLGdjvRHLmS+SiZrv/DqTi+fTRG8uZQ=";
};
cargoDeps = prevAttrs.cargoDeps.overrideAttrs (
pkgs.lib.const {
name = "${prevAttrs.pname}-vendor.tar.gz";
inherit src;
outputHash = "sha256-hmgWa4pas3qngs6MNPzk3fPG5+jFRph0lGZvtUF4/tA=";
}
);
});
});
};
};
};

flake =
let
mkSystem = system:
mkSystem =
system:
nixpkgs.lib.nixosSystem {
inherit system;
modules = [
Expand All @@ -72,7 +89,7 @@
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.sharedModules = [ plasma-manager.homeManagerModules.plasma-manager ];
home-manager.sharedModules = [ plasma-manager.homeModules.plasma-manager ];
home-manager.users.nixos = import ./home.nix;
}
];
Expand Down
4 changes: 1 addition & 3 deletions home.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{ config, pkgs, ... }:

{
# https://nix-community.github.io/home-manager/options.xhtml
home.username = "nixos";
Expand Down Expand Up @@ -69,7 +67,7 @@
];
kscreenlocker = {
lockOnResume = false;
passwordRequired = false;
passwordRequired = false;
};
powerdevil = {
AC.autoSuspend.action = "nothing";
Expand Down
51 changes: 33 additions & 18 deletions iso.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.

{ lib, pkgs, flake, ... }:
{
lib,
pkgs,
flake,
...
}:
let
viewYubikeyGuide = pkgs.writeShellScriptBin "view-yubikey-guide" ''
viewer="$(type -P xdg-open || true)"
Expand All @@ -30,13 +35,15 @@ let
};
yubikeyGuide = pkgs.symlinkJoin {
name = "yubikey-guide";
paths = [ viewYubikeyGuide shortcut ];
paths = [
viewYubikeyGuide
shortcut
];
};
in
{
image.fileName = "fos.iso";
isoImage = {
isoName = "fos.iso";

makeEfiBootable = true;
makeUsbBootable = true;
};
Expand All @@ -45,7 +52,9 @@ in

boot = {
tmp.cleanOnBoot = true;
kernel.sysctl = { "kernel.unprivileged_bpf_disabled" = 1; };
kernel.sysctl = {
"kernel.unprivileged_bpf_disabled" = 1;
};
};

services = {
Expand All @@ -63,7 +72,7 @@ in
user = "nixos";
};
default_session = {
command = "${pkgs.greetd.greetd}/bin/agreety --cmd startplasma-wayland";
command = "${pkgs.greetd}/bin/agreety --cmd startplasma-wayland";
user = "greeter";
};
};
Expand Down Expand Up @@ -93,7 +102,10 @@ in
users.users = {
nixos = {
isNormalUser = true;
extraGroups = [ "wheel" "video" ];
extraGroups = [
"wheel"
"video"
];
initialHashedPassword = "";
};
root.initialHashedPassword = "";
Expand Down Expand Up @@ -125,8 +137,11 @@ in
# to open it in a non-graphical environment).
yubikeyGuide

# certstrap for managing the mTLS root CA
certstrap

cfssl
flake.packages.${system}.openpgp-ca # openpgp-ca with famedly patches
flake.packages.${stdenv.hostPlatform.system}.openpgp-ca # openpgp-ca with famedly patches
git
htop
jq
Expand All @@ -135,7 +150,7 @@ in
nano
neovim
openpgp-card-tools
pcsctools
pcsc-tools
pwgen
rusty-diceware
sequoia-sq
Expand All @@ -145,15 +160,15 @@ in
wl-clipboard

# Famedly OpenPGP Scripts
flake.packages.${system}.fos-export
flake.packages.${system}.fos-flash
flake.packages.${system}.fos-generate
flake.packages.${system}.fos-mount
flake.packages.${system}.fos-partitions
flake.packages.${system}.fos-renew
flake.packages.${system}.fos-rotate-passwords
flake.packages.${system}.fos-sync
flake.packages.${system}.fos-working-directory
flake.packages.${stdenv.hostPlatform.system}.fos-export
flake.packages.${stdenv.hostPlatform.system}.fos-flash
flake.packages.${stdenv.hostPlatform.system}.fos-generate
flake.packages.${stdenv.hostPlatform.system}.fos-mount
flake.packages.${stdenv.hostPlatform.system}.fos-partitions
flake.packages.${stdenv.hostPlatform.system}.fos-renew
flake.packages.${stdenv.hostPlatform.system}.fos-rotate-passwords
flake.packages.${stdenv.hostPlatform.system}.fos-sync
flake.packages.${stdenv.hostPlatform.system}.fos-working-directory
];

environment.plasma6.excludePackages = with pkgs.kdePackages; [
Expand Down
Loading