Compare commits

...

7 Commits

16 changed files with 319 additions and 44 deletions

View File

@@ -1,2 +1,3 @@
# nix fmt # nix fmt & statix
f011c8d71ba09bd94ab04b8d771858b90a03fbf9 f011c8d71ba09bd94ab04b8d771858b90a03fbf9
3aff25b4486a143cd6282f8845c16216598e1c7e

View File

@@ -4,3 +4,11 @@ repos:
hooks: hooks:
- id: nixfmt-nix - id: nixfmt-nix
args: [--, --check] args: [--, --check]
- repo: local
hooks:
- id: statix
name: statix
entry: statix check
language: system
files: \.nix$
pass_filenames: false

View File

@@ -50,15 +50,19 @@
}: }:
let let
my-lib = import ./lib { lib = nixpkgs.lib; }; my-lib = import ./lib { inherit (nixpkgs) lib; };
overlays = [ overlays = [
(_: prev: { (_: prev: {
claude-code = inherit
(
(import inputs.nixpkgs-unstable { (import inputs.nixpkgs-unstable {
system = prev.stdenv.hostPlatform.system; inherit (prev.stdenv.hostPlatform) system;
config.allowUnfree = true; config.allowUnfree = true;
}).claude-code; })
)
claude-code
;
}) })
]; ];
@@ -90,11 +94,17 @@
system = "x86_64-linux"; system = "x86_64-linux";
users = [ ]; users = [ ];
}; };
# nixos-rebuild build-image --image-variant qemu --flake .#sandbox
sandbox = mkHost "sandbox" {
system = "x86_64-linux";
users = [ "gorazd" ];
};
}; };
nixosModules = import ./modules/nixos { nixosModules = import ./modules/nixos {
inherit my-lib; inherit my-lib;
lib = nixpkgs.lib; inherit (nixpkgs) lib;
} { }; } { };
} }
// flake-utils.lib.eachDefaultSystem ( // flake-utils.lib.eachDefaultSystem (
@@ -103,15 +113,25 @@
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
in in
{ {
packages = import ./packages { packages =
import ./packages
{
inherit my-lib; inherit my-lib;
lib = nixpkgs.lib; inherit (nixpkgs) lib;
} (inputs // { inherit system; }); }
{
pkgs = nixpkgs.legacyPackages.${system};
pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.${system};
pkgs-master = inputs.nixpkgs-master.legacyPackages.${system};
};
formatter = pkgs.nixfmt-tree; formatter = pkgs.nixfmt-tree;
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
packages = [ pkgs.pre-commit ]; packages = [
pkgs.pre-commit
pkgs.statix
];
}; };
} }
); );

View File

@@ -0,0 +1,132 @@
{
pkgs,
lib,
inputs,
...
}:
{
imports = [
./hardware-configuration.nix
inputs.self.nixosModules.vm-guest
inputs.self.nixosModules.desktop
inputs.self.nixosModules.zsh
];
vm-guest.enable = true;
desktop.enable = true;
zsh.enable = true;
programs.labwc.enable = true;
# labwc stacking compositor with auto-login
services.greetd =
let
labwc-session = pkgs.writeShellScript "labwc-session" ''
export XDG_SESSION_TYPE=wayland
export XDG_CURRENT_DESKTOP=labwc:wlroots
# software renderer for qemu virtio-vga
export WLR_RENDERER=pixman
export WLR_DRM_NO_ATOMIC=1
exec ${pkgs.labwc}/bin/labwc
'';
in
{
enable = true;
settings = {
default_session = {
command = labwc-session;
user = "gorazd";
};
initial_session = {
command = labwc-session;
user = "gorazd";
};
};
};
users = {
groups.gorazd = {
gid = 1000;
};
users.gorazd = {
group = "gorazd";
uid = 1000;
isNormalUser = true;
home = "/home/gorazd";
createHome = true;
password = "sandbox";
extraGroups = [
"wheel"
"users"
];
};
};
# 9p mounts for host files
fileSystems."/home/gorazd/projects" = {
device = "projects";
fsType = "9p";
options = [
"trans=virtio"
"version=9p2000.L"
"msize=65536"
"nofail"
];
};
fileSystems."/mnt/host-claude" = {
device = "hostclaude";
fsType = "9p";
options = [
"trans=virtio"
"version=9p2000.L"
"msize=65536"
"nofail"
];
};
fileSystems."/mnt/host-home" = {
device = "hosthome";
fsType = "9p";
options = [
"trans=virtio"
"version=9p2000.L"
"msize=65536"
"nofail"
"ro"
];
};
# pre-auth claude-code from host config
systemd.services.claude-auth = {
description = "Copy claude-code credentials from host mount";
after = [
"mnt-host\\x2dclaude.mount"
"mnt-host\\x2dhome.mount"
];
requires = [
"mnt-host\\x2dclaude.mount"
"mnt-host\\x2dhome.mount"
];
wantedBy = [ "multi-user.target" ];
serviceConfig = {
Type = "oneshot";
ExecStart = pkgs.writeShellScript "claude-auth" ''
mkdir -p /home/gorazd/.claude
cp -a /mnt/host-claude/. /home/gorazd/.claude/
cp /mnt/host-home/.claude.json /home/gorazd/.claude.json || true
chown -R gorazd:gorazd /home/gorazd/.claude /home/gorazd/.claude.json
'';
};
};
environment.systemPackages = with pkgs; [
claude-code
labwc
sfwbar
foot
firefox
];
system.stateVersion = "25.11";
}

View File

@@ -0,0 +1,18 @@
{
lib,
modulesPath,
...
}:
{
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
fileSystems."/" = {
device = "/dev/disk/by-label/nixos";
autoResize = true;
fsType = "ext4";
};
boot.loader.grub.device = lib.mkDefault "/dev/vda";
}

View File

@@ -24,3 +24,37 @@ iso:
# garbage collect old generations # garbage collect old generations
clean: clean:
sudo nix-collect-garbage $(nix eval --raw -f ./nix.nix nix.gc.options) sudo nix-collect-garbage $(nix eval --raw -f ./nix.nix nix.gc.options)
# build sandbox VM image
sandbox-build:
nixos-rebuild build-image --image-variant qemu --flake .#sandbox
# run sandbox with GUI (ephemeral, changes discarded)
sandbox-run:
nix shell nixpkgs#qemu -c qemu-system-x86_64 -enable-kvm -m 8G -smp 4 \
-drive file=$(find -L result -name '*.qcow2' | head -1),format=qcow2,snapshot=on \
-vga virtio -display gtk,zoom-to-fit=false \
-device virtio-serial-pci \
-chardev qemu-vdagent,id=ch1,name=vdagent,clipboard=on \
-device virtserialport,chardev=ch1,id=ch1,name=com.redhat.spice.0 \
-virtfs local,path=$HOME/git,mount_tag=projects,security_model=mapped-xattr,id=fs0 \
-virtfs local,path=$HOME/.claude,mount_tag=hostclaude,security_model=mapped-xattr,id=fs1 \
-virtfs local,path=$HOME,mount_tag=hosthome,security_model=mapped-xattr,id=fs2,readonly=on \
-nic user,hostfwd=tcp::2222-:22
# run sandbox headless (ephemeral, changes discarded)
sandbox-run-headless:
nix shell nixpkgs#qemu -c qemu-system-x86_64 -enable-kvm -m 8G -smp 4 \
-drive file=$(find -L result -name '*.qcow2' | head -1),format=qcow2,snapshot=on \
-virtfs local,path=$HOME/git,mount_tag=projects,security_model=mapped-xattr,id=fs0 \
-virtfs local,path=$HOME/.claude,mount_tag=hostclaude,security_model=mapped-xattr,id=fs1 \
-virtfs local,path=$HOME,mount_tag=hosthome,security_model=mapped-xattr,id=fs2,readonly=on \
-nic user,hostfwd=tcp::2222-:22 -nographic
# ssh into running sandbox
sandbox-ssh:
ssh -A -p 2222 gorazd@localhost
# hot-mount a host directory into the running sandbox
sandbox-mount path:
ssh -p 2222 gorazd@localhost "mkdir -p ~/mnt/$(basename {{path}}) && sshfs matej@10.0.2.2:{{path}} ~/mnt/$(basename {{path}})"

View File

@@ -7,8 +7,6 @@ let
# TODO:(@janezicmatej) restructure keys import # TODO:(@janezicmatej) restructure keys import
keys = import ../../users/matej/keys.nix; keys = import ../../users/matej/keys.nix;
cfg = config.initrd-ssh;
# generate host keys for new machines: ./scripts/initrd-ssh-keygen.sh # generate host keys for new machines: ./scripts/initrd-ssh-keygen.sh
keyDir = "/etc/secrets/initrd"; keyDir = "/etc/secrets/initrd";
@@ -63,10 +61,10 @@ in
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf config.initrd-ssh.enable {
boot.initrd.kernelModules = [ cfg.networkModule ]; boot.initrd.kernelModules = [ config.initrd-ssh.networkModule ];
boot.kernelParams = lib.mkIf cfg.ip.enable [ boot.kernelParams = lib.mkIf config.initrd-ssh.ip.enable [
"ip=${mkIpString cfg.ip}" "ip=${mkIpString config.initrd-ssh.ip}"
]; ];
boot.initrd.network = { boot.initrd.network = {
@@ -78,7 +76,7 @@ in
"${keyDir}/ssh_host_rsa_key" "${keyDir}/ssh_host_rsa_key"
"${keyDir}/ssh_host_ed25519_key" "${keyDir}/ssh_host_ed25519_key"
]; ];
authorizedKeys = cfg.authorizedKeys; inherit (config.initrd-ssh) authorizedKeys;
}; };
postCommands = '' postCommands = ''
echo 'cryptsetup-askpass' >> /root/.profile echo 'cryptsetup-askpass' >> /root/.profile

View File

@@ -4,9 +4,6 @@
pkgs, pkgs,
... ...
}: }:
let
cfg = config.tuigreet;
in
{ {
options = { options = {
tuigreet = { tuigreet = {
@@ -18,18 +15,16 @@ in
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf config.tuigreet.enable {
services.greetd = { services.greetd = {
enable = true; enable = true;
useTextGreeter = true; useTextGreeter = true;
settings = { settings = {
default_session = { default_session = {
command = builtins.toString ( command = pkgs.writeShellScript "tuigreet-session" ''
pkgs.writeShellScript "tuigreet-session" ''
${pkgs.util-linux}/bin/setterm --blank 1 --powersave powerdown --powerdown 1 ${pkgs.util-linux}/bin/setterm --blank 1 --powersave powerdown --powerdown 1
exec ${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd ${cfg.command} exec ${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd ${config.tuigreet.command}
'' '';
);
user = "greeter"; user = "greeter";
}; };
}; };

View File

@@ -0,0 +1,55 @@
{
pkgs,
lib,
config,
...
}:
{
options = {
vm-guest = {
enable = lib.mkEnableOption "VM guest configuration";
};
};
config = lib.mkIf config.vm-guest.enable {
services.qemuGuest.enable = true;
services.spice-vdagentd.enable = true;
# 9p for host file mounting
boot.initrd.availableKernelModules = [
"9p"
"9pnet_virtio"
];
boot.kernelModules = [
"9p"
"9pnet_virtio"
];
# ssh with agent forwarding for git and hot-mount
services.openssh = {
enable = true;
ports = [ 22 ];
settings = {
PasswordAuthentication = true;
PermitRootLogin = "no";
AllowAgentForwarding = true;
StreamLocalBindUnlink = "yes";
};
};
networking = {
useDHCP = true;
firewall.allowedTCPPorts = [ 22 ];
};
security.sudo.wheelNeedsPassword = false;
environment.systemPackages = with pkgs; [
curl
wget
htop
sshfs
];
};
}

View File

@@ -4,9 +4,6 @@
pkgs, pkgs,
... ...
}: }:
let
cfg = config.workstation;
in
{ {
options = { options = {
workstation = { workstation = {
@@ -14,7 +11,7 @@ in
}; };
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf config.workstation.enable {
virtualisation.docker = { virtualisation.docker = {
enable = true; enable = true;
logDriver = "json-file"; logDriver = "json-file";

View File

@@ -1,7 +1,6 @@
{ nixpkgs, system, ... }: { pkgs, ... }:
let let
pkgs = import nixpkgs { inherit system; };
version = "v0.3.2"; version = "v0.3.2";
in in
pkgs.rustPlatform.buildRustPackage { pkgs.rustPlatform.buildRustPackage {

View File

@@ -1,13 +1,12 @@
{ nixpkgs, system, ... }: { pkgs, ... }:
let let
pkgs = import nixpkgs { inherit system; };
version = "C6r62em"; version = "C6r62em";
in in
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {
pname = "ca-matheo-si"; pname = "ca-matheo-si";
version = version; inherit version;
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://ipa2.matheo.si/ipa/config/ca.crt"; url = "http://ipa2.matheo.si/ipa/config/ca.crt";

View File

@@ -1,8 +1,7 @@
{ nixpkgs-master, system, ... }: { pkgs-master, ... }:
let let
nixpkgs = nixpkgs-master; pkgs = pkgs-master;
pkgs = import nixpkgs { inherit system; };
version = "e24855c"; version = "e24855c";
in in
pkgs.buildGoModule.override pkgs.buildGoModule.override

View File

@@ -1,7 +1,6 @@
{ nixpkgs, system, ... }: { pkgs, ... }:
let let
pkgs = import nixpkgs { inherit system; };
version = "main"; version = "main";
in in
pkgs.stdenv.mkDerivation { pkgs.stdenv.mkDerivation {

1
statix.toml Normal file
View File

@@ -0,0 +1 @@
disabled = ["repeated_keys"]

View File

@@ -17,6 +17,26 @@ in
pkgs.git pkgs.git
]; ];
# labwc desktop menu (right-click)
xdg.configFile."labwc/menu.xml".text = ''
<?xml version="1.0" encoding="UTF-8"?>
<openbox_menu>
<menu id="root-menu" label="">
<item label="Terminal"><action name="Execute"><command>foot</command></action></item>
<item label="Firefox"><action name="Execute"><command>firefox</command></action></item>
<item label="Files"><action name="Execute"><command>foot -e ranger</command></action></item>
<separator />
<item label="Reconfigure"><action name="Reconfigure" /></item>
<item label="Exit"><action name="Exit" /></item>
</menu>
</openbox_menu>
'';
# labwc autostart panel
xdg.configFile."labwc/autostart".text = ''
sfwbar &
'';
programs.neovim = { programs.neovim = {
enable = true; enable = true;
vimAlias = true; vimAlias = true;