Compare commits
17 Commits
edc1e6149a
...
sandbox
| Author | SHA1 | Date | |
|---|---|---|---|
|
3b6f4c7f28
|
|||
|
5b19dec3c3
|
|||
|
97b7348c2b
|
|||
|
b6ae96cb84
|
|||
|
25735d5bd1
|
|||
|
3aff25b448
|
|||
|
e6cad243de
|
|||
|
0a6e024b78
|
|||
|
3c643a411e
|
|||
|
fdd7831732
|
|||
|
103efdb7a9
|
|||
|
8406979975
|
|||
|
a2abf10e39
|
|||
|
957209d2a0
|
|||
|
2c3bce4844
|
|||
|
f011c8d71b
|
|||
|
a3cf0b7523
|
3
.git-blame-ignore-revs
Normal file
3
.git-blame-ignore-revs
Normal file
@@ -0,0 +1,3 @@
|
||||
# nix fmt & statix
|
||||
f011c8d71ba09bd94ab04b8d771858b90a03fbf9
|
||||
3aff25b4486a143cd6282f8845c16216598e1c7e
|
||||
@@ -4,3 +4,11 @@ repos:
|
||||
hooks:
|
||||
- id: nixfmt-nix
|
||||
args: [--, --check]
|
||||
- repo: local
|
||||
hooks:
|
||||
- id: statix
|
||||
name: statix
|
||||
entry: statix check
|
||||
language: system
|
||||
files: \.nix$
|
||||
pass_filenames: false
|
||||
|
||||
42
flake.nix
42
flake.nix
@@ -50,9 +50,21 @@
|
||||
}:
|
||||
|
||||
let
|
||||
my-lib = import ./lib { lib = nixpkgs.lib; };
|
||||
my-lib = import ./lib { inherit (nixpkgs) lib; };
|
||||
|
||||
overlays = [ ];
|
||||
overlays = [
|
||||
(_: prev: {
|
||||
inherit
|
||||
(
|
||||
(import inputs.nixpkgs-unstable {
|
||||
inherit (prev.stdenv.hostPlatform) system;
|
||||
config.allowUnfree = true;
|
||||
})
|
||||
)
|
||||
claude-code
|
||||
;
|
||||
})
|
||||
];
|
||||
|
||||
mkHost = my-lib.mkHost {
|
||||
inherit
|
||||
@@ -82,11 +94,17 @@
|
||||
system = "x86_64-linux";
|
||||
users = [ ];
|
||||
};
|
||||
|
||||
# nixos-rebuild build-image --image-variant qemu --flake .#sandbox
|
||||
sandbox = mkHost "sandbox" {
|
||||
system = "x86_64-linux";
|
||||
users = [ "gorazd" ];
|
||||
};
|
||||
};
|
||||
|
||||
nixosModules = import ./modules/nixos {
|
||||
inherit my-lib;
|
||||
lib = nixpkgs.lib;
|
||||
inherit (nixpkgs) lib;
|
||||
} { };
|
||||
}
|
||||
// flake-utils.lib.eachDefaultSystem (
|
||||
@@ -95,15 +113,25 @@
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
in
|
||||
{
|
||||
packages = import ./packages {
|
||||
packages =
|
||||
import ./packages
|
||||
{
|
||||
inherit my-lib;
|
||||
lib = nixpkgs.lib;
|
||||
} (inputs // { inherit system; });
|
||||
inherit (nixpkgs) lib;
|
||||
}
|
||||
{
|
||||
pkgs = nixpkgs.legacyPackages.${system};
|
||||
pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.${system};
|
||||
pkgs-master = inputs.nixpkgs-master.legacyPackages.${system};
|
||||
};
|
||||
|
||||
formatter = pkgs.nixfmt-tree;
|
||||
|
||||
devShells.default = pkgs.mkShell {
|
||||
packages = [ pkgs.pre-commit ];
|
||||
packages = [
|
||||
pkgs.pre-commit
|
||||
pkgs.statix
|
||||
];
|
||||
};
|
||||
}
|
||||
);
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ pkgs, lib, inputs, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
keys = import ../../users/matej/keys.nix;
|
||||
in
|
||||
|
||||
@@ -21,22 +21,42 @@ in
|
||||
inputs.self.nixosModules.printing
|
||||
inputs.self.nixosModules.zsh
|
||||
inputs.self.nixosModules.gnupg
|
||||
inputs.self.nixosModules.tuigreet
|
||||
inputs.self.nixosModules.workstation
|
||||
inputs.self.nixosModules.nvidia
|
||||
inputs.self.nixosModules.initrd-ssh
|
||||
];
|
||||
|
||||
# Modules
|
||||
yubikey.enable = true;
|
||||
openssh.enable = true;
|
||||
desktop.enable = true;
|
||||
printing.enable = true;
|
||||
zsh.enable = true;
|
||||
gnupg.enable = true;
|
||||
workstation.enable = true;
|
||||
tuigreet = {
|
||||
enable = true;
|
||||
command = "sway";
|
||||
};
|
||||
|
||||
sway = {
|
||||
enable = true;
|
||||
cmdFlags = [ "--unsupported-gpu" ];
|
||||
};
|
||||
|
||||
# Stylix theming
|
||||
nvidia.enable = true;
|
||||
|
||||
initrd-ssh = {
|
||||
enable = true;
|
||||
networkModule = "r8169";
|
||||
ip = {
|
||||
enable = true;
|
||||
address = "10.222.0.247";
|
||||
gateway = "10.222.0.1";
|
||||
interface = "enp5s0";
|
||||
};
|
||||
};
|
||||
|
||||
stylix = {
|
||||
enable = true;
|
||||
polarity = "dark";
|
||||
@@ -44,49 +64,22 @@ in
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml";
|
||||
};
|
||||
|
||||
# Boot
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
# Locale
|
||||
time.timeZone = "Europe/Ljubljana";
|
||||
environment.variables.TZ = "America/New_York";
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
# Docker
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
logDriver = "json-file";
|
||||
};
|
||||
|
||||
# nix-ld for pip-installed binaries
|
||||
# WARN:(matej) probably want to drop this in the future
|
||||
# WARN:(@janezicmatej) nix-ld for running pip-installed binaries outside nix, probably want to drop this
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld.libraries = options.programs.nix-ld.libraries.default;
|
||||
|
||||
# Security
|
||||
security.pki.certificateFiles = [ packages.ca-matheo-si ];
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
|
||||
# Services
|
||||
services.teamviewer.enable = true;
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
useRoutingFeatures = "both";
|
||||
};
|
||||
|
||||
# Greetd
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
default_session = {
|
||||
command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd sway";
|
||||
user = "greeter";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Programs
|
||||
programs.thunderbird.enable = true;
|
||||
programs._1password.enable = true;
|
||||
programs._1password-gui.enable = true;
|
||||
@@ -98,16 +91,28 @@ in
|
||||
localNetworkGameTransfers.openFirewall = true;
|
||||
};
|
||||
|
||||
# Hardware
|
||||
hardware.keyboard.zsa.enable = true;
|
||||
hardware.ledger.enable = true;
|
||||
hardware.bluetooth.powerOnBoot = true;
|
||||
|
||||
# System packages
|
||||
environment.systemPackages = with pkgs; [
|
||||
smartmontools
|
||||
networking = {
|
||||
hostName = "matej-nixos";
|
||||
useDHCP = false;
|
||||
networkmanager.enable = true;
|
||||
interfaces.enp5s0.ipv4.addresses = [
|
||||
{
|
||||
address = "10.222.0.247";
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
firewall.enable = false;
|
||||
defaultGateway = "10.222.0.1";
|
||||
nameservers = [
|
||||
"1.1.1.1"
|
||||
"8.8.8.8"
|
||||
];
|
||||
};
|
||||
|
||||
# XDG
|
||||
xdg.mime.defaultApplications = {
|
||||
"application/pdf" = "org.pwmt.zathura.desktop";
|
||||
};
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
# autogenerated by 'nixos-generate-config'
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
@@ -14,45 +12,17 @@
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
hardware.firmware = [ pkgs.linux-firmware ];
|
||||
|
||||
boot.initrd.availableKernelModules = [
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usbhid"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [
|
||||
"dm-snapshot"
|
||||
"r8169"
|
||||
];
|
||||
boot.kernelModules = [
|
||||
"kvm-amd"
|
||||
];
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.kernelParams = [
|
||||
"ip=10.222.0.247::10.222.0.1:255.255.255.0::enp5s0:none"
|
||||
];
|
||||
|
||||
boot.initrd.network = {
|
||||
enable = true;
|
||||
ssh = {
|
||||
enable = true;
|
||||
port = 22;
|
||||
hostKeys = [
|
||||
"/etc/secrets/initrd/ssh_host_rsa_key"
|
||||
"/etc/secrets/initrd/ssh_host_ed25519_key"
|
||||
];
|
||||
authorizedKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICQGLdINKzs+sEy62Pefng0bcedgU396+OryFgeH99/c janezicmatej"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDk00+Km03epQXQs+xEwwH3zcurACzkEH+kDOPBw6RQe openpgp:0xB095D449"
|
||||
];
|
||||
};
|
||||
postCommands = ''
|
||||
echo 'cryptsetup-askpass' >> /root/.profile
|
||||
'';
|
||||
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."cryptlvm".device =
|
||||
"/dev/disk/by-uuid/af0608c0-67cd-4ae4-b12c-252fa947da40";
|
||||
@@ -75,76 +45,6 @@
|
||||
{ device = "/dev/disk/by-uuid/ff4750e7-3a9f-42c2-bb68-c458a6560540"; }
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
|
||||
networking = {
|
||||
useDHCP = false;
|
||||
hostName = "matej-nixos";
|
||||
networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||
interfaces.enp5s0.ipv4.addresses = [
|
||||
{
|
||||
address = "10.222.0.247";
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
firewall = {
|
||||
enable = false;
|
||||
allowedTCPPorts = lib.range 8800 8900;
|
||||
};
|
||||
defaultGateway = "10.222.0.1";
|
||||
nameservers = [
|
||||
"1.1.1.1"
|
||||
"8.8.8.8"
|
||||
];
|
||||
|
||||
};
|
||||
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
# TODO: maybe move later
|
||||
hardware.bluetooth.enable = true; # enables support for Bluetooth
|
||||
hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot
|
||||
|
||||
# Enable OpenGL
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
# Load nvidia driver for Xorg and Wayland
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
||||
hardware.nvidia = {
|
||||
# Modesetting is required.
|
||||
modesetting.enable = true;
|
||||
|
||||
# Nvidia power management. Experimental, and can cause sleep/suspend to fail.
|
||||
# Enable this if you have graphical corruption issues or application crashes after waking
|
||||
# up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
|
||||
# of just the bare essentials.
|
||||
powerManagement.enable = false;
|
||||
|
||||
# Fine-grained power management. Turns off GPU when not in use.
|
||||
# Experimental and only works on modern Nvidia GPUs (Turing or newer).
|
||||
powerManagement.finegrained = false;
|
||||
|
||||
# Use the NVidia open source kernel module (not to be confused with the
|
||||
# independent third-party "nouveau" open source driver).
|
||||
# Support is limited to the Turing and later architectures. Full list of
|
||||
# supported GPUs is at:
|
||||
# https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus
|
||||
# Only available from driver 515.43.04+
|
||||
open = true;
|
||||
|
||||
# Enable the Nvidia settings menu,
|
||||
# accessible via `nvidia-settings`.
|
||||
nvidiaSettings = true;
|
||||
|
||||
# Optionally, you may need to select the appropriate driver version for your specific GPU.
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -8,9 +8,11 @@
|
||||
}:
|
||||
|
||||
{
|
||||
networking.hostName = "matej-tower";
|
||||
imports = [
|
||||
inputs.stylix.nixosModules.stylix
|
||||
inputs.lanzaboote.nixosModules.lanzaboote
|
||||
|
||||
inputs.self.nixosModules.yubikey
|
||||
inputs.self.nixosModules.sway
|
||||
inputs.self.nixosModules.openssh
|
||||
@@ -18,18 +20,29 @@
|
||||
inputs.self.nixosModules.printing
|
||||
inputs.self.nixosModules.zsh
|
||||
inputs.self.nixosModules.gnupg
|
||||
inputs.self.nixosModules.tuigreet
|
||||
inputs.self.nixosModules.workstation
|
||||
inputs.self.nixosModules.initrd-ssh
|
||||
];
|
||||
|
||||
# Modules
|
||||
yubikey.enable = true;
|
||||
openssh.enable = true;
|
||||
desktop.enable = true;
|
||||
printing.enable = true;
|
||||
zsh.enable = true;
|
||||
gnupg.enable = true;
|
||||
workstation.enable = true;
|
||||
tuigreet = {
|
||||
enable = true;
|
||||
command = "sway";
|
||||
};
|
||||
sway.enable = true;
|
||||
|
||||
# Stylix theming
|
||||
initrd-ssh = {
|
||||
enable = true;
|
||||
networkModule = "r8169";
|
||||
};
|
||||
|
||||
stylix = {
|
||||
enable = true;
|
||||
polarity = "dark";
|
||||
@@ -37,7 +50,8 @@
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-material-dark-medium.yaml";
|
||||
};
|
||||
|
||||
# Boot - Lanzaboote secure boot
|
||||
# lanzaboote secure boot
|
||||
boot.kernelParams = [ "btusb.reset=1" ];
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.loader.systemd-boot.enable = lib.mkForce false;
|
||||
boot.lanzaboote = {
|
||||
@@ -45,53 +59,26 @@
|
||||
pkiBundle = "/var/lib/sbctl";
|
||||
};
|
||||
|
||||
# Locale
|
||||
time.timeZone = "Europe/Ljubljana";
|
||||
environment.variables.TZ = "Europe/Ljubljana";
|
||||
|
||||
# Docker
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
logDriver = "json-file";
|
||||
};
|
||||
|
||||
# Services
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
useRoutingFeatures = "both";
|
||||
};
|
||||
services.udisks2.enable = true;
|
||||
|
||||
# Greetd
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
default_session = {
|
||||
command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd sway";
|
||||
user = "greeter";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Programs
|
||||
programs._1password.enable = true;
|
||||
programs._1password-gui.enable = true;
|
||||
|
||||
# Higher sample rate pipewire for audio equipment
|
||||
# higher sample rate for audio equipment
|
||||
services.pipewire.extraConfig.pipewire.adjust-sample-rate = {
|
||||
"context.properties" = {
|
||||
"default.clock.rate" = 192000;
|
||||
"defautlt.allowed-rates" = [ 192000 ];
|
||||
"default.allowed-rates" = [ 192000 ];
|
||||
};
|
||||
};
|
||||
|
||||
# System packages
|
||||
environment.systemPackages = with pkgs; [
|
||||
smartmontools
|
||||
easyeffects
|
||||
];
|
||||
|
||||
# XDG
|
||||
xdg.mime.defaultApplications = {
|
||||
"application/pdf" = "org.pwmt.zathura.desktop";
|
||||
};
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
# autogenerated by 'nixos-generate-config'
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
@@ -20,13 +18,9 @@
|
||||
"nvme"
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [
|
||||
"dm-snapshot"
|
||||
"r8169"
|
||||
"usbhid"
|
||||
];
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
@@ -51,34 +45,6 @@
|
||||
{ device = "/dev/disk/by-uuid/e0952ef2-1a9a-4022-bbcf-b2f016384258"; }
|
||||
];
|
||||
|
||||
boot.initrd.network = {
|
||||
enable = true;
|
||||
ssh = {
|
||||
enable = true;
|
||||
port = 22;
|
||||
hostKeys = [
|
||||
"/etc/secrets/initrd/ssh_host_rsa_key"
|
||||
"/etc/secrets/initrd/ssh_host_ed25519_key"
|
||||
];
|
||||
authorizedKeys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICQGLdINKzs+sEy62Pefng0bcedgU396+OryFgeH99/c janezicmatej"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDk00+Km03epQXQs+xEwwH3zcurACzkEH+kDOPBw6RQe openpgp:0xB095D449"
|
||||
];
|
||||
};
|
||||
postCommands = ''
|
||||
echo 'cryptsetup-askpass' >> /root/.profile
|
||||
'';
|
||||
|
||||
};
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp11s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
||||
132
hosts/sandbox/configuration.nix
Normal file
132
hosts/sandbox/configuration.nix
Normal 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";
|
||||
}
|
||||
18
hosts/sandbox/hardware-configuration.nix
Normal file
18
hosts/sandbox/hardware-configuration.nix
Normal 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";
|
||||
}
|
||||
34
justfile
34
justfile
@@ -24,3 +24,37 @@ iso:
|
||||
# garbage collect old generations
|
||||
clean:
|
||||
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}})"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
lib:
|
||||
|
||||
# takes dir as an argument and creates an attribute set by importing all .nix files in that directory
|
||||
# import all .nix files in dir as attribute set
|
||||
dir:
|
||||
let
|
||||
readDir = builtins.readDir dir;
|
||||
|
||||
@@ -15,15 +15,11 @@ let
|
||||
hostHWConfig = ../hosts/${name}/hardware-configuration.nix;
|
||||
hasHWConfig = builtins.pathExists hostHWConfig;
|
||||
|
||||
# Load NixOS-level user config (account, groups, SSH keys)
|
||||
userNixosConfigs = map (user: ../users/${user}/nixos.nix) (
|
||||
builtins.filter (user: builtins.pathExists ../users/${user}/nixos.nix) users
|
||||
);
|
||||
|
||||
# Load home-manager user config
|
||||
userHMConfigs = nixpkgs.lib.genAttrs users (
|
||||
user: import ../users/${user}/home-manager.nix
|
||||
);
|
||||
userHMConfigs = nixpkgs.lib.genAttrs users (user: import ../users/${user}/home-manager.nix);
|
||||
|
||||
in
|
||||
nixpkgs.lib.nixosSystem {
|
||||
|
||||
@@ -12,26 +12,20 @@
|
||||
};
|
||||
|
||||
config = lib.mkIf config.desktop.enable {
|
||||
# Audio
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
|
||||
# Bluetooth
|
||||
hardware.bluetooth.enable = true;
|
||||
services.blueman.enable = true;
|
||||
|
||||
# Security
|
||||
security.polkit.enable = true;
|
||||
|
||||
# D-Bus
|
||||
services.dbus.enable = true;
|
||||
|
||||
# Player control
|
||||
services.playerctld.enable = true;
|
||||
|
||||
# XDG Portals
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
xdgOpenUsePortal = true;
|
||||
@@ -41,7 +35,6 @@
|
||||
];
|
||||
};
|
||||
|
||||
# Fonts
|
||||
fonts.packages = with pkgs; [
|
||||
font-awesome
|
||||
nerd-fonts.jetbrains-mono
|
||||
|
||||
86
modules/nixos/initrd-ssh.nix
Normal file
86
modules/nixos/initrd-ssh.nix
Normal file
@@ -0,0 +1,86 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
let
|
||||
# TODO:(@janezicmatej) restructure keys import
|
||||
keys = import ../../users/matej/keys.nix;
|
||||
|
||||
# generate host keys for new machines: ./scripts/initrd-ssh-keygen.sh
|
||||
keyDir = "/etc/secrets/initrd";
|
||||
|
||||
mkIpString =
|
||||
{
|
||||
address,
|
||||
gateway,
|
||||
netmask,
|
||||
interface,
|
||||
...
|
||||
}:
|
||||
"${address}::${gateway}:${netmask}::${interface}:none";
|
||||
in
|
||||
{
|
||||
options = {
|
||||
initrd-ssh = {
|
||||
enable = lib.mkEnableOption "SSH in initrd for remote LUKS unlock";
|
||||
|
||||
ip = {
|
||||
enable = lib.mkEnableOption "static IP for initrd (otherwise DHCP)";
|
||||
|
||||
address = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
example = "10.222.0.247";
|
||||
};
|
||||
|
||||
gateway = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
example = "10.222.0.1";
|
||||
};
|
||||
|
||||
netmask = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "255.255.255.0";
|
||||
};
|
||||
|
||||
interface = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
example = "enp5s0";
|
||||
};
|
||||
};
|
||||
|
||||
authorizedKeys = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = keys.sshAuthorizedKeys;
|
||||
};
|
||||
|
||||
networkModule = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
example = "r8169";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf config.initrd-ssh.enable {
|
||||
boot.initrd.kernelModules = [ config.initrd-ssh.networkModule ];
|
||||
boot.kernelParams = lib.mkIf config.initrd-ssh.ip.enable [
|
||||
"ip=${mkIpString config.initrd-ssh.ip}"
|
||||
];
|
||||
|
||||
boot.initrd.network = {
|
||||
enable = true;
|
||||
ssh = {
|
||||
enable = true;
|
||||
port = 22;
|
||||
hostKeys = [
|
||||
"${keyDir}/ssh_host_rsa_key"
|
||||
"${keyDir}/ssh_host_ed25519_key"
|
||||
];
|
||||
inherit (config.initrd-ssh) authorizedKeys;
|
||||
};
|
||||
postCommands = ''
|
||||
echo 'cryptsetup-askpass' >> /root/.profile
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
23
modules/nixos/nvidia.nix
Normal file
23
modules/nixos/nvidia.nix
Normal file
@@ -0,0 +1,23 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options = {
|
||||
nvidia.enable = lib.mkEnableOption "NVIDIA GPU support";
|
||||
};
|
||||
|
||||
config = lib.mkIf config.nvidia.enable {
|
||||
hardware.graphics.enable = true;
|
||||
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
|
||||
hardware.nvidia = {
|
||||
modesetting.enable = true;
|
||||
open = true;
|
||||
nvidiaSettings = true;
|
||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -10,7 +10,6 @@
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 22;
|
||||
description = "SSH server port";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
cmdFlags = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
description = "additional command line flags to pass to sway";
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -24,23 +23,20 @@
|
||||
wrapperFeatures.gtk = true;
|
||||
extraOptions = config.sway.cmdFlags;
|
||||
extraSessionCommands = ''
|
||||
# Fix for some Java AWT applications (e.g. Android Studio),
|
||||
# use this if they aren't displayed properly:
|
||||
# fix for java awt apps not rendering
|
||||
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||
'';
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# default extra packages
|
||||
brightnessctl
|
||||
foot
|
||||
grim
|
||||
pulseaudio
|
||||
swayidle
|
||||
# swaylock - use swaylock-effects instead
|
||||
# use swaylock-effects instead of swaylock
|
||||
swaylock-effects
|
||||
wmenu
|
||||
# additional things i like
|
||||
slurp
|
||||
wofi
|
||||
wl-clipboard
|
||||
|
||||
33
modules/nixos/tuigreet.nix
Normal file
33
modules/nixos/tuigreet.nix
Normal file
@@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options = {
|
||||
tuigreet = {
|
||||
enable = lib.mkEnableOption "greetd with tuigreet";
|
||||
|
||||
command = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf config.tuigreet.enable {
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
useTextGreeter = true;
|
||||
settings = {
|
||||
default_session = {
|
||||
command = pkgs.writeShellScript "tuigreet-session" ''
|
||||
${pkgs.util-linux}/bin/setterm --blank 1 --powersave powerdown --powerdown 1
|
||||
exec ${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd ${config.tuigreet.command}
|
||||
'';
|
||||
user = "greeter";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
55
modules/nixos/vm-guest.nix
Normal file
55
modules/nixos/vm-guest.nix
Normal 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
|
||||
];
|
||||
};
|
||||
}
|
||||
29
modules/nixos/workstation.nix
Normal file
29
modules/nixos/workstation.nix
Normal file
@@ -0,0 +1,29 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options = {
|
||||
workstation = {
|
||||
enable = lib.mkEnableOption "workstation utilities";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf config.workstation.enable {
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
logDriver = "json-file";
|
||||
};
|
||||
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
useRoutingFeatures = "both";
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
smartmontools
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
{ nixpkgs, system, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
version = "v0.3.2";
|
||||
in
|
||||
pkgs.rustPlatform.buildRustPackage {
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
{ nixpkgs, system, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
version = "C6r62em";
|
||||
in
|
||||
|
||||
pkgs.stdenv.mkDerivation {
|
||||
pname = "ca-matheo-si";
|
||||
version = version;
|
||||
inherit version;
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "http://ipa2.matheo.si/ipa/config/ca.crt";
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{ nixpkgs-master, system, ... }:
|
||||
{ pkgs-master, ... }:
|
||||
|
||||
let
|
||||
nixpkgs = nixpkgs-master;
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
pkgs = pkgs-master;
|
||||
version = "e24855c";
|
||||
in
|
||||
pkgs.buildGoModule.override
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{ nixpkgs, system, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
version = "main";
|
||||
in
|
||||
pkgs.stdenv.mkDerivation {
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
{ nixpkgs-master, system, ... }:
|
||||
|
||||
let
|
||||
nixpkgs = nixpkgs-master;
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
version = "v1.25.0";
|
||||
python = pkgs.python313;
|
||||
in
|
||||
|
||||
python.pkgs.buildPythonPackage rec {
|
||||
pname = "releasectl";
|
||||
version = "1.2.0";
|
||||
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://gitlab.com/flarenetwork/infra-public/pipeliner/-/package_files/216813866/download";
|
||||
sha256 = "sha256-ScBG8BoOKDdOAHTFP+zwyk+Kfu31WoKQSRkutOvnJ5E";
|
||||
};
|
||||
|
||||
format = "wheel"; # if it uses poetry/PEP517, otherwise "setuptools"
|
||||
# nativeBuildInputs = [ python.pkgs.setuptools python.pkgs.wheel ];
|
||||
# propagatedBuildInputs = with python.pkgs; [
|
||||
# # add runtime deps here if needed
|
||||
# ];
|
||||
|
||||
# pyproject = true;
|
||||
# build-system = [ pkgs.python313Packages.hatchling ];
|
||||
|
||||
}
|
||||
24
scripts/initrd-ssh-keygen.sh
Executable file
24
scripts/initrd-ssh-keygen.sh
Executable file
@@ -0,0 +1,24 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
KEY_DIR="/etc/secrets/initrd"
|
||||
|
||||
echo "Generating initrd SSH host keys in $KEY_DIR"
|
||||
|
||||
sudo mkdir -p "$KEY_DIR"
|
||||
|
||||
if [[ ! -f "$KEY_DIR/ssh_host_rsa_key" ]]; then
|
||||
sudo ssh-keygen -t rsa -N "" -f "$KEY_DIR/ssh_host_rsa_key"
|
||||
echo "Generated: $KEY_DIR/ssh_host_rsa_key"
|
||||
else
|
||||
echo "Exists: $KEY_DIR/ssh_host_rsa_key"
|
||||
fi
|
||||
|
||||
if [[ ! -f "$KEY_DIR/ssh_host_ed25519_key" ]]; then
|
||||
sudo ssh-keygen -t ed25519 -N "" -f "$KEY_DIR/ssh_host_ed25519_key"
|
||||
echo "Generated: $KEY_DIR/ssh_host_ed25519_key"
|
||||
else
|
||||
echo "Exists: $KEY_DIR/ssh_host_ed25519_key"
|
||||
fi
|
||||
|
||||
echo "Done. Now run nixos-rebuild."
|
||||
1
statix.toml
Normal file
1
statix.toml
Normal file
@@ -0,0 +1 @@
|
||||
disabled = ["repeated_keys"]
|
||||
@@ -17,6 +17,26 @@ in
|
||||
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 = {
|
||||
enable = true;
|
||||
vimAlias = true;
|
||||
|
||||
@@ -13,7 +13,7 @@ in
|
||||
{
|
||||
home.stateVersion = "24.11";
|
||||
|
||||
# TODO:(janezicmatej) do i need this here?
|
||||
# TODO:(@janezicmatej) do i need this here?
|
||||
services.dunst.enable = true;
|
||||
|
||||
home.packages = [
|
||||
@@ -99,7 +99,6 @@ in
|
||||
luajit
|
||||
nodejs_22 # copilot
|
||||
|
||||
# treesitter
|
||||
tree-sitter
|
||||
|
||||
# lua_fzf
|
||||
@@ -109,7 +108,6 @@ in
|
||||
gnumake
|
||||
delta
|
||||
|
||||
# language server
|
||||
pyright
|
||||
typescript-language-server
|
||||
lua-language-server
|
||||
@@ -117,7 +115,6 @@ in
|
||||
nil
|
||||
nixd
|
||||
|
||||
# formatters
|
||||
nixpkgs-fmt
|
||||
stylua
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user