Compare commits

...

18 Commits
disko ... main

Author SHA1 Message Date
Hektor Misplon 069a3b8333 Source relevant '.bashrc.d/*' files in NixOS home manager 2025-10-05 19:33:17 +02:00
Hektor Misplon 851f226518 Simplify NixOS fzf configuration 2025-10-05 18:47:53 +02:00
Hektor Misplon 7b872f4596 Update disko virtual machine configuration 2025-10-05 18:31:47 +02:00
Hektor Misplon 84ec0824e8 Migrate 'dots/.bashrc' fzf config to NixOS home manager 2025-10-05 18:00:39 +02:00
Hektor Misplon 8f2c473219 Add packages from 'dots/.bin/setup' 2025-10-05 16:34:46 +02:00
Hektor Misplon 475c21cbac Move packages into host's 'home.nix' 2025-10-05 13:55:59 +02:00
Hektor Misplon 671578567a Refactor 2025-10-05 13:44:25 +02:00
Hektor Misplon f92ed39653 Move home manager config into host's 'home.nix' 2025-10-05 13:40:01 +02:00
Hektor Misplon 91a1c7f6ca Format nix files using 'nixfmt' 2025-10-05 13:39:16 +02:00
Hektor Misplon fc7e346f1e Ignore 'nixos-efi-vars.fd' (output from building vm) 2025-10-05 13:39:16 +02:00
Hektor Misplon 0da72e9513 Update NixOS readme 2025-10-05 13:39:16 +02:00
Hektor Misplon 749bd75992 Use disko 'single-disk-ext4' template for vm host 2025-10-05 13:39:16 +02:00
Hektor Misplon 54b228381d Add 'kitty' package 2025-10-05 12:31:24 +02:00
Hektor Misplon ee62f092e5 Update readme 2025-10-05 12:31:24 +02:00
Hektor Misplon 6007760092 Add 'networking.hostId' (required for ZFS) 2025-10-05 12:31:24 +02:00
Hektor Misplon f8fddbba14 Fix ZFS issue with virtual disks (https://discourse.nixos.org/t/zfs-with-disko-faluire-to-import-zfs-pool/61988/3) 2025-10-05 12:31:24 +02:00
Hektor Misplon f824649f85 Fix inputrc path 2025-10-05 12:31:24 +02:00
Hektor Misplon c4fe75a1b9 Set up disko zfs encrypted root for 'vm' host 2025-10-05 12:31:24 +02:00
12 changed files with 375 additions and 55 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
result
result-*
nixos-efi-vars.fd

View File

@ -1,3 +1,15 @@
# nixos
My NixOS config
## Set up virtual machine ([`disko`](https://github.com/nix-community/disko/blob/master/docs/interactive-vm.md))
1. Build the virtual machine
```
nix build -L '.#nixosConfigurations.vm.config.system.build.vmWithDisko'
```
2. Run the virtual machine
```
./result/bin/disko-vm
```

71
flake.lock Normal file
View File

@ -0,0 +1,71 @@
{
"nodes": {
"disko": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1746728054,
"narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
"owner": "nix-community",
"repo": "disko",
"rev": "ff442f5d1425feb86344c028298548024f21256d",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "latest",
"repo": "disko",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1758463745,
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1759580034,
"narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"disko": "disko",
"home-manager": "home-manager",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}

View File

@ -1,21 +1,35 @@
{
inputs = {
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05";
home-manager.url = "github:nix-community/home-manager/release-25.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
nixpkgs = {
url = "github:nixos/nixpkgs?ref=nixos-25.05";
};
home-manager = {
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};
disko = {
url = "github:nix-community/disko/latest";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, home-manager }: {
nixosConfigurations.vm = nixpkgs.lib.nixosSystem {
outputs =
{
self,
nixpkgs,
disko,
home-manager,
}:
{
nixosConfigurations = {
vm = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
disko.nixosModules.disko
home-manager.nixosModules.home-manager
./hosts/vm/configuration.nix
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.h = ./hosts/vm/home.nix;
}
];
};
};
};
}

View File

@ -1,11 +1,11 @@
{ pkgs, ... }:
{ ... }:
{
system.stateVersion = "25.05";
imports =
[
imports = [
./hard.nix
./disk.nix
../../modules/bootloader.nix
../../modules/networking.nix
../../modules/users.nix
@ -15,16 +15,40 @@
../../modules/x.nix
];
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
programs.git.enable = true;
programs.firefox.enable = true;
disko = {
devices.disk.main.device = "/dev/vda";
devices.disk.main.imageName = "nixos-vm";
devices.disk.main.imageSize = "32G";
};
virtualisation.vmVariantWithDisko = {
virtualisation = {
cores = 8;
memorySize = 16384;
qemu.options = [
"-enable-kvm"
"-cpu host"
"-nographic"
];
};
};
nixpkgs.config.allowUnfree = true;
environment.systemPackages = with pkgs; [ neovim ];
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
users.h = ./home.nix;
};
services.qemuGuest.enable = true;
services.spice-vdagentd.enable = true;
services.openssh = {
enable = true;
startWhenNeeded = true;

36
hosts/vm/disk.nix Normal file
View File

@ -0,0 +1,36 @@
{
disko.devices = {
disk = {
main = {
type = "disk";
content = {
type = "gpt";
partitions = {
boot = {
size = "1M";
type = "EF02"; # for grub MBR
};
ESP = {
size = "1G";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
};
root = {
size = "100%";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
};
};
};
};
};
};
};
}

View File

@ -1,27 +1,30 @@
# 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.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/profiles/qemu-guest.nix")
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
boot.initrd.availableKernelModules = [
"ahci"
"xhci_pci"
"virtio_pci"
"sr_mod"
"virtio_blk"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/7d406784-bf6b-420e-a956-134f719c8206";
fsType = "ext4";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/4cbaffdb-0ca2-4735-87d0-eefe994f0e18"; }
];
# 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

View File

@ -6,7 +6,81 @@
home.username = "h";
home.homeDirectory = "/home/h";
home.file.".inputrc".source = ./dots/.inputrc;
programs = {
bash = {
enable = true;
enableCompletion = true;
initExtra = ''
for f in ${config.home.homeDirectory}/.bashrc.d/*; do
[ -f "$f" ] && source "$f"
done
'';
};
firefox.enable = true;
fzf = {
enable = true;
enableBashIntegration = true;
};
git.enable = true;
home-manager.enable = true;
};
programs.home-manager.enable = true;
home.packages = with pkgs; [
bash-completion
bash-language-server
bat
brightnessctl
entr
eslint_d
feh
firefox-devedition
fzf
git
haskell-language-server
haskellPackages.pandoc-crossref
haskellPackages.hadolint
htop
iosevka
jq
keepassxc
kitty
lua-language-server
neovim
nmap
nodejs_24
nodePackages.ts-node
nvimpager
ormolu
pandoc
parallel
pass
pnpm
ripgrep
silver-searcher
sshfs
stylelint
svelte-language-server
tailwindcss-language-server
taskwarrior3
tldr
tmux
tmuxp
tree
tree-sitter
typescript-language-server
unzip
vim-language-server
vimPlugins.vim-plug
vtsls
wget
xbanish
xclip
yaml-language-server
];
home.file = {
".inputrc".source = ../../dots/.inputrc;
".bashrc.d/prompt".source = ../../dots/.bashrc.d/prompt;
".bashrc.d/editor".source = ../../dots/.bashrc.d/editor;
};
}

View File

@ -0,0 +1,81 @@
{
disko.devices = {
disk = {
root = {
type = "disk";
device = "/dev/vda";
content = {
type = "gpt";
partitions = {
ESP = {
size = "1G";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "nofail" ];
};
};
zfs = {
size = "100%";
content = {
type = "zfs";
pool = "zroot";
};
};
};
};
};
};
zpool = {
zroot = {
type = "zpool";
rootFsOptions = {
mountpoint = "none";
compression = "zstd";
acltype = "posixacl";
xattr = "sa";
"com.sun:auto-snapshot" = "true";
};
options.ashift = "12";
datasets = {
"root" = {
type = "zfs_fs";
options = {
encryption = "aes-256-gcm";
keyformat = "passphrase";
#keylocation = "file:///tmp/secret.key";
keylocation = "prompt";
};
mountpoint = "/";
};
"root/nix" = {
type = "zfs_fs";
options.mountpoint = "/nix";
mountpoint = "/nix";
};
# README MORE: https://wiki.archlinux.org/title/ZFS#Swap_volume
"root/swap" = {
type = "zfs_volume";
size = "10M";
content = {
type = "swap";
};
options = {
volblocksize = "4096";
compression = "zle";
logbias = "throughput";
sync = "always";
primarycache = "metadata";
secondarycache = "none";
"com.sun:auto-snapshot" = "false";
};
};
};
};
};
};
}

View File

@ -2,7 +2,11 @@
{
networking.hostName = "nixos";
networking.wireless = { iwd = { enable = true; }; };
networking.wireless = {
iwd = {
enable = true;
};
};
networking.firewall = {
enable = true;
allowedTCPPorts = [ 22 ];