Compare commits

...
23 Commits
Author SHA1 Message Date
aaron 26473288b6 chore: ignore nixfmt reformat in git blame 2026-10-01 11:40:30 +02:00
aaron 2231d2fc3f style: format all nix files with nixfmt 2026-10-01 11:40:12 +02:00
aaron 4ec579b1fc chore(lint): add statix config and remove unused arguments 2026-10-01 11:40:03 +02:00
aaron c1d11138b3 Merge pull request 'feature: pull in the latest updates, fix some errors and add a devenv for this repository' (#80) from chore/update into main
Reviewed-on: #80
2026-10-01 11:26:12 +02:00
aaron 92b170e5e8 feature: pull in the latest updates, fix some errors and add a devenv for this repository 2026-10-01 11:20:22 +02:00
aaron 3d90a9759f Merge pull request 'feature(wl-mirror): add wl-mirror as dependency to noctalia' (#79) from feature/wl-mirror into main
Reviewed-on: #79
2026-09-29 20:29:06 +02:00
aaron 3b4f05a91c feature(wl-mirror): add wl-mirror as dependency to noctalia 2026-09-29 16:05:18 +02:00
aaron c1a7a9d085 Merge pull request 'chore(flake): update flake file' (#78) from chore/update into main
Reviewed-on: #78
2026-09-26 17:25:11 +02:00
aaron 848af4d44b chore(flake): update flake file 2026-09-26 17:23:47 +02:00
aaron e61289a26e Merge pull request 'fix(siri): add venv to the siril installation' (#77) from fix/siril into main
Reviewed-on: #77
2026-09-20 12:51:09 +02:00
aaron 28f5f4faa9 fix(siri): add venv to the siril installation 2026-09-19 18:48:20 +02:00
aaron 1007450e19 Merge pull request 'chore: update nix flake' (#76) from chore/update into main
Reviewed-on: #76
2026-09-15 12:49:26 +02:00
aaron 1be2731c53 chore: update nix flake 2026-09-15 12:34:30 +02:00
aaron b8d108f173 Merge pull request 'feature(shell): shorten the path in the agnoster prompt, if it gets too long' (#75) from feature/shorten_shell into main
Reviewed-on: #75
2026-09-14 16:47:19 +02:00
aaron 366a895a08 feature(shell): shorten the path in the agnoster prompt, if it gets too long 2026-09-14 16:46:17 +02:00
aaron 7ceef4775c Merge pull request 'feature: move from gpg-git-commit-signing to ssh-signing' (#74) from feature/ssh-git-sign into main
Reviewed-on: #74
2026-09-05 15:46:55 +02:00
aaron 1b9b584729 feature(gpg): add more signing-keys to the config to enable my laptop as well 2026-09-05 15:44:42 +02:00
aaron d9d6877714 feature(gpg): move git from gpg-signing to ssh-signing 2026-09-05 15:33:05 +02:00
aaron 6704ec389c Merge pull request 'chore(update): update flake file' (#73) from chore/update into main
Reviewed-on: #73
2026-08-31 13:52:26 +02:00
aaron aca9e5d7cc chore(update): update flake file 2026-08-30 18:46:17 +02:00
aaron 2c8fbf008d Merge pull request 'chore(update): update flake file' (#72) from chore/update into main
Reviewed-on: #72
2026-08-20 20:53:12 +02:00
aaron c4f1be8a38 chore(update): update flake file 2026-08-20 20:52:22 +02:00
aaron 6df7fcacbb Merge pull request 'fix: ship a numbered udev rule file for vial since otherwise it gets overwritten by systemd's udev file' (#71) from feature/vial into main
Reviewed-on: #71
2026-08-09 14:45:34 +02:00
52 changed files with 533 additions and 239 deletions
+2
View File
@@ -0,0 +1,2 @@
# nixfmt reformat
2231d2fc3fb4dc140c5f3257523dcdb513ac4dea
+4
View File
@@ -8,3 +8,7 @@ result-*
# vim # vim
*.swp *.swp
# devenv
.devenv*
devenv.local.nix
+65
View File
@@ -0,0 +1,65 @@
{
"nodes": {
"devenv": {
"locked": {
"dir": "src/modules",
"lastModified": 1790701375,
"narHash": "sha256-0FpLHIRDYiyo3EMTnMQSobZQknZaa3JuWo6vmMCK76o=",
"owner": "cachix",
"repo": "devenv",
"rev": "fe20b5cba7ab5e93ae73f956a8d3efc50e1753f4",
"type": "github"
},
"original": {
"dir": "src/modules",
"owner": "cachix",
"repo": "devenv",
"type": "github"
}
},
"nixpkgs": {
"inputs": {
"nixpkgs-src": "nixpkgs-src"
},
"locked": {
"lastModified": 1789506231,
"narHash": "sha256-vNkJbtmqyBfFhn/HnzQo4ROuoyYWuy/allqTfJb4kMY=",
"owner": "cachix",
"repo": "devenv-nixpkgs",
"rev": "c2f38fe7f9e04d9aadd354d380f2bd40531d9737",
"type": "github"
},
"original": {
"owner": "cachix",
"ref": "rolling",
"repo": "devenv-nixpkgs",
"type": "github"
}
},
"nixpkgs-src": {
"flake": false,
"locked": {
"lastModified": 1789370336,
"narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c7def046b9a883d46974757852106483d741586f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"devenv": "devenv",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}
+31
View File
@@ -0,0 +1,31 @@
{ pkgs, ... }:
{
packages = with pkgs; [
# issue tracker (git.0x29a.ch)
tea
# nix tooling
nixfmt # official formatter (RFC 166 style)
statix # lints for nix anti-patterns
deadnix # finds unused bindings and arguments
nixd # language server
nvd # diff system generations
];
scripts = {
lint.exec = ''
set -e
statix check .
# hardware-configuration.nix is generated; statix skips it via statix.toml
deadnix --fail --exclude hosts/*/hardware-configuration.nix -- .
'';
fmt.exec = ''
nixfmt $(git ls-files '*.nix')
'';
};
enterShell = ''
echo "nixconfig devenv: tea, lint, fmt"
'';
}
+3
View File
@@ -0,0 +1,3 @@
inputs:
nixpkgs:
url: github:cachix/devenv-nixpkgs/rolling
Generated
+16 -15
View File
@@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782949081, "lastModified": 1788450739,
"narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1785958398, "lastModified": 1790819692,
"narHash": "sha256-5r/JgsoNMTx+qIh83WkxpujEKBR7PF5ssnh5vYCuSAw=", "narHash": "sha256-rvubAPbh3QCliic3sAK+CXTrPCGgJstY52OTs/5H1J4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a7c70cc290290f373f50cd820403833d250459ac", "rev": "c8ecc29e5175452bee4a2aa1ba2383856d795338",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -43,11 +43,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1785967620, "lastModified": 1790689126,
"narHash": "sha256-IItrdb7Puk05RqOBWZYFC5X6Wl1sJmCfh5MWVHw5iMM=", "narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436", "rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -66,11 +66,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1785763201, "lastModified": 1790541651,
"narHash": "sha256-wA373y/B9orM3HatLu9oS+Ke5lmdZyBl/bdjd2gLMq4=", "narHash": "sha256-/496IQz8qNWHHLnc3Zvr0l4uxJ34igNhJhn7ZKAefFk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "c7be49306b23a952c0151cf4bbeacd944ed82f2a", "rev": "5980a626794486abad69fca7667f9c11dfbc3bd7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -86,11 +86,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1786013897, "lastModified": 1790718664,
"narHash": "sha256-u14Iaus6ROW6IWQUNGZ/IZJ3TcIUs1ngxn5sUMNnwMM=", "narHash": "sha256-LWil4xgSyqIFZ9sydvL1glFOoiqAOknWUwykC4sqxuY=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-shell", "repo": "noctalia-shell",
"rev": "0247e4c5e5268f8c2a5658b60b97cb5f2eca7766", "rev": "fd9759c892fe5034b682c185695f1bee121cd5b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -108,6 +108,7 @@
} }
}, },
"systems": { "systems": {
"flake": false,
"locked": { "locked": {
"lastModified": 1774449309, "lastModified": 1774449309,
"narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
+12 -3
View File
@@ -17,9 +17,17 @@
}; };
}; };
outputs = { self, nixpkgs, home-manager, nixvim, ... }@inputs: outputs =
{
nixpkgs,
home-manager,
nixvim,
...
}@inputs:
let let
mkHost = hostName: nixpkgs.lib.nixosSystem { mkHost =
hostName:
nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
@@ -35,7 +43,8 @@
} }
]; ];
}; };
in { in
{
nixosConfigurations = { nixosConfigurations = {
default = mkHost "default"; default = mkHost "default";
neon = mkHost "neon"; neon = mkHost "neon";
-4
View File
@@ -1,5 +1,3 @@
{ config, pkgs, inputs, ... }:
{ {
imports = [ imports = [
../../modules/nixos/appimage.nix ../../modules/nixos/appimage.nix
@@ -11,7 +9,6 @@
../../modules/nixos/claudecode.nix ../../modules/nixos/claudecode.nix
../../modules/nixos/drives.nix ../../modules/nixos/drives.nix
../../modules/nixos/gnupg.nix ../../modules/nixos/gnupg.nix
../../modules/nixos/gnuradio.nix
../../modules/nixos/graphics.nix ../../modules/nixos/graphics.nix
../../modules/nixos/greetd.nix ../../modules/nixos/greetd.nix
../../modules/nixos/locales.nix ../../modules/nixos/locales.nix
@@ -35,4 +32,3 @@
# install state version # install state version
system.stateVersion = "25.11"; # Don't change system.stateVersion = "25.11"; # Don't change
} }
+29 -13
View File
@@ -1,37 +1,53 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ "dm-crypt dm-mod" ]; boot.initrd.kernelModules = [ "dm-crypt dm-mod" ];
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt"; boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/mapper/lvmroot-root"; device = "/dev/mapper/lvmroot-root";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/AC1C-20EB"; device = "/dev/disk/by-uuid/AC1C-20EB";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [
"fmask=0022"
"dmask=0022"
];
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "/dev/mapper/lvmroot-home"; device = "/dev/mapper/lvmroot-home";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/mapper/lvmroot-swap"; } { device = "/dev/mapper/lvmroot-swap"; }
]; ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+11 -5
View File
@@ -1,10 +1,13 @@
# 0x29a nixos conifg # 0x29a nixos conifg
{ pkgs, lib, ... }: { pkgs, ... }:
{ {
# use flakes # use flakes
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [
"nix-command"
"flakes"
];
# configure bootloader # configure bootloader
boot.loader.systemd-boot.enable = false; boot.loader.systemd-boot.enable = false;
@@ -60,7 +63,8 @@
windowManager.qtile = { windowManager.qtile = {
enable = true; enable = true;
extraPackages = python3Packages: with python3Packages; [ extraPackages =
python3Packages: with python3Packages; [
qtile-extras qtile-extras
]; ];
}; };
@@ -97,7 +101,10 @@
autosuggestions.enable = true; autosuggestions.enable = true;
ohMyZsh = { ohMyZsh = {
enable = true; enable = true;
plugins = [ "git" "sudo" ]; plugins = [
"git"
"sudo"
];
theme = "agnoster"; theme = "agnoster";
}; };
}; };
@@ -130,4 +137,3 @@
# install state version # install state version
system.stateVersion = "25.05"; # Don't change system.stateVersion = "25.05"; # Don't change
} }
+34 -14
View File
@@ -1,35 +1,55 @@
# 0x29a nixos hardware configuration # 0x29a nixos hardware configuration
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
]; ];
# boot and initrd configs # boot and initrd configs
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules = [
boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ]; "uhci_hcd"
"ehci_pci"
"ahci"
"virtio_pci"
"virtio_scsi"
"sd_mod"
"sr_mod"
];
boot.initrd.kernelModules = [
"dm-snapshot"
"cryptd"
];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt"; boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
# file systems # file systems
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-label/nixroot"; device = "/dev/disk/by-label/nixroot";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-label/nixboot"; device = "/dev/disk/by-label/nixboot";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [
"fmask=0022"
"dmask=0022"
];
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "/dev/disk/by-label/nixhome"; device = "/dev/disk/by-label/nixhome";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-label/nixswap"; } { device = "/dev/disk/by-label/nixswap"; }
]; ];
# enable dhcp on all interfaces # enable dhcp on all interfaces
+7 -4
View File
@@ -1,4 +1,4 @@
{ config, pkgs, ... }: { pkgs, ... }:
{ {
# user config # user config
@@ -29,7 +29,6 @@
iotop iotop
iftop iftop
strace strace
ltrace
lsof lsof
sysstat sysstat
lm_sensors lm_sensors
@@ -51,12 +50,16 @@
syntaxHighlighting.enable = true; syntaxHighlighting.enable = true;
oh-my-zsh = { oh-my-zsh = {
enable = true; enable = true;
plugins = [ "git" "sudo" "python" "ansible" ]; plugins = [
"git"
"sudo"
"python"
"ansible"
];
theme = "agnoster"; theme = "agnoster";
}; };
}; };
## deploy qtile config ## deploy qtile config
#home.file."qtile-config" = { #home.file."qtile-config" = {
# target = ".config/qtile/config.py"; # target = ".config/qtile/config.py";
-3
View File
@@ -1,5 +1,3 @@
{ config, pkgs, inputs, ... }:
{ {
imports = [ imports = [
../../modules/nixos/appimage.nix ../../modules/nixos/appimage.nix
@@ -31,4 +29,3 @@
# install state version # install state version
system.stateVersion = "25.11"; # Don't change system.stateVersion = "25.11"; # Don't change
} }
+32 -14
View File
@@ -1,38 +1,56 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = [
boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ]; "xhci_pci"
"nvme"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [
"dm-snapshot"
"cryptd"
];
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt"; boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-label/nixroot"; device = "/dev/disk/by-label/nixroot";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-label/nixboot"; device = "/dev/disk/by-label/nixboot";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [
"fmask=0022"
"dmask=0022"
];
}; };
fileSystems."/home" = fileSystems."/home" = {
{ device = "/dev/disk/by-label/nixhome"; device = "/dev/disk/by-label/nixhome";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-label/nixswap"; } { device = "/dev/disk/by-label/nixswap"; }
]; ];
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, pkgs, inputs, ... }: { pkgs, ... }:
{ {
# user fonts # user fonts
-2
View File
@@ -1,5 +1,3 @@
{ config, pkgs, inputs, ... }:
{ {
programs.ghostty = { programs.ghostty = {
enable = true; enable = true;
+34 -5
View File
@@ -1,17 +1,46 @@
{ config, pkgs, inputs, ... }:
{ {
config,
lib,
pkgs,
...
}:
let
email = "aaron@0x29a.ch";
# public half of every machine's ~/.ssh/id_ed25519, each one verified as a
# signing key in gitea. the key a host signs with is picked up from the key
# file itself, this list only tells the local git which machines to trust
signingKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHRhwzo1oxaT3fEySSmILKNnu9v30cfjx5G7FKpmfqeX aaron@argon"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDkhvvTUcBSQdtXjX+Mw2Bp8HHhtiBm8aJi4ZxiBgZR aaron@neon"
];
in
{
# gitea verifies signatures against the account keys, this teaches the local
# git the same trust so `git log --show-signature` resolves as well
xdg.configFile."git/allowed_signers".text = lib.concatMapStrings (
key: "${email} ${key}\n"
) signingKeys;
programs.git = { programs.git = {
enable = true; enable = true;
settings = { settings = {
push = { autoSetupRemote = true; }; push = {
autoSetupRemote = true;
};
user = { user = {
name = "aaron"; name = "aaron";
email = "aaron@0x29a.ch"; inherit email;
}; };
gpg.ssh.allowedSignersFile = "${config.xdg.configHome}/git/allowed_signers";
}; };
signing = { signing = {
key = "7A830180A05DAC59CDE43B0677D2F5DB48184456"; format = "ssh";
# point at the *public* key so ssh-keygen signs through the ssh agent
# instead of reading the passphrase protected private key from disk
key = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
signer = "${pkgs.openssh}/bin/ssh-keygen";
signByDefault = true; signByDefault = true;
}; };
}; };
+11 -3
View File
@@ -1,4 +1,4 @@
{ config, pkgs, inputs, ... }: { pkgs, inputs, ... }:
{ {
programs.nixvim = { programs.nixvim = {
@@ -67,7 +67,11 @@
}; };
plugins.treesitter = { plugins.treesitter = {
enable = true; enable = true;
settings.ensure_installed = [ "markdown" "markdown_inline" "typst" ]; settings.ensure_installed = [
"markdown"
"markdown_inline"
"typst"
];
}; };
plugins.typst-preview = { plugins.typst-preview = {
enable = true; enable = true;
@@ -87,7 +91,11 @@
enable = true; enable = true;
settings = { settings = {
# render in normal mode, raw source in insert # render in normal mode, raw source in insert
render_modes = [ "n" "c" "t"]; render_modes = [
"n"
"c"
"t"
];
pipe_table.preset = "round"; pipe_table.preset = "round";
heading.width = "block"; heading.width = "block";
file_types = [ "markdown" ]; file_types = [ "markdown" ];
+25 -7
View File
@@ -1,14 +1,15 @@
{ config, pkgs, inputs, ... }: { pkgs, inputs, ... }:
{ {
# Noctalia v5 shell, managed via its upstream home-manager module. # Noctalia v5 shell, managed via home-manager's built-in programs.noctalia module.
# The noctalia flake's homeModules.default is not imported: it redeclares the same
# options and its disabledModules path ("programs/noctalia.nix") doesn't match HM's.
# See https://docs.noctalia.dev/v5/getting-started/nixos/ # See https://docs.noctalia.dev/v5/getting-started/nixos/
imports = [ inputs.noctalia.homeModules.default ];
programs.noctalia = { programs.noctalia = {
enable = true; enable = true;
# The module's `package` option has no default, so it must be set explicitly. # Use the package from the noctalia flake rather than nixpkgs.
package = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default; package = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default;
# settings is rendered to ~/.config/noctalia/config.toml # settings is rendered to ~/.config/noctalia/config.toml
@@ -72,9 +73,22 @@
radius = 0; radius = 0;
scale = 1.2; scale = 1.2;
widget_spacing = 20; widget_spacing = 20;
start = [ "control-center" "cpu" "ram" "temp" "active_window" ]; start = [
"control-center"
"cpu"
"ram"
"temp"
"active_window"
];
center = [ "workspaces" ]; center = [ "workspaces" ];
end = [ "tray" "bluetooth" "notifications" "volume" "network" "clock" ]; end = [
"tray"
"bluetooth"
"notifications"
"volume"
"network"
"clock"
];
}; };
}; };
@@ -102,7 +116,11 @@
# idle behavior # idle behavior
idle = { idle = {
behavior_order = [ "screen-off" "lock" "lock-and-suspend" ]; behavior_order = [
"screen-off"
"lock"
"lock-and-suspend"
];
behavior = { behavior = {
"screen-off" = { "screen-off" = {
enabled = true; enabled = true;
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, pkgs, inputs, ... }: { config, pkgs, ... }:
{ {
# user packages # user packages
+35 -2
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, inputs, ... }: { lib, ... }:
{ {
# configure z-shell to use omz with some plugins # configure z-shell to use omz with some plugins
@@ -9,7 +9,11 @@
oh-my-zsh = { oh-my-zsh = {
enable = true; enable = true;
# add git and agents as plugins # add git and agents as plugins
plugins = [ "git" "ssh-agent" "gpg-agent" ]; plugins = [
"git"
"ssh-agent"
"gpg-agent"
];
# everything here lands before `source $ZSH/oh-my-zsh.sh` # everything here lands before `source $ZSH/oh-my-zsh.sh`
extraConfig = '' extraConfig = ''
# make omz faster on large repositories # make omz faster on large repositories
@@ -23,6 +27,35 @@
fi fi
''; '';
}; };
# Unlike oh-my-zsh.extraConfig above, this lands *after*
# `source $ZSH/oh-my-zsh.sh`, which is where the theme's prompt functions
# come into existence.
initContent = lib.mkAfter ''
# Keep the prompt on one line in deeply nested trees.
#
# Both themes render the working directory as `%~`, the full path with
# $HOME collapsed to `~`. Somewhere like
# ~/git/bfh/cas-pml-sem/documents/bericht that is 39 columns on its own,
# and together with user@host and a long branch name the line wraps.
#
# `%(4~|…/%2~|%~)` is a prompt ternary: at four or more components show
# an ellipsis and the last two, otherwise show the path whole. Short
# paths like ~/git/nixconfig are left alone.
if [[ "$ZSH_THEME" == "agnoster" ]]; then
# agnoster calls prompt_dir on every render, so redefining it is
# enough. AGNOSTER_DIR_* keep the segment's own colours.
prompt_dir() {
prompt_segment "$AGNOSTER_DIR_BG" "$AGNOSTER_DIR_FG" '%(4~|…/%2~|%~)'
}
else
# gentoo builds PROMPT once at load time, so patch the string. Its
# `%~` is the non-root branch of `%(!.%1~.%~)`, and it is the first
# literal `%~` in there, so the root branch is untouched. ASCII `...`
# because this branch is the Linux console, whose font may lack U+2026.
PROMPT="''${PROMPT/\%~/%(4~|.../%2~|%~)}"
fi
'';
}; };
# set important env vars # set important env vars
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, pkgs, inputs, ... }: { pkgs, ... }:
{ {
# set gtk theme # set gtk theme
-2
View File
@@ -1,5 +1,3 @@
{ config, pkgs, inputs, ... }:
let let
# Powerline separators, U+E0B0..U+E0B3. # Powerline separators, U+E0B0..U+E0B3.
# #
-2
View File
@@ -1,5 +1,3 @@
{ config, lib, pkgs, ... }:
{ {
# AppImages ship a squashfs payload that the bundled runtime mounts through # AppImages ship a squashfs payload that the bundled runtime mounts through
# libfuse.so.2 at startup. nix-ld resolves the ELF interpreter but not that # libfuse.so.2 at startup. nix-ld resolves the ELF interpreter but not that
+22 -5
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { lib, pkgs, ... }:
let let
# Siril's Python plugins (sirilpy) run in a venv that pip-installs foreign # Siril's Python plugins (sirilpy) run in a venv that pip-installs foreign
@@ -15,7 +15,15 @@ let
# on PATH. nixpkgs only *propagates* python3 from the siril derivation (it # on PATH. nixpkgs only *propagates* python3 from the siril derivation (it
# isn't on the runtime PATH), so without the --prefix PATH below the GUI # isn't on the runtime PATH), so without the --prefix PATH below the GUI
# fails with "Python not found in system PATH" and never creates # fails with "Python not found in system PATH" and never creates
# ~/.local/share/siril/venv. We add the same interpreter siril references. # ~/.local/share/siril/venv.
#
# We deliberately do NOT put ${pkgs.python3}/bin on PATH directly: `venv`
# symlinks bin/python3 to whatever sys.executable was, so the venv would
# hard-link a /nix/store hash that gets garbage-collected after the next
# python bump, leaving a dangling symlink ("Error finding venv python
# path, unable to spawn python"). Instead we go through the stable
# /etc/siril/bin/python3 symlink (see environment.etc below), which NixOS
# re-points at the current python on every rebuild.
# #
# The VeraLux PyQt6 wheel ships only the built-in Windows/Fusion styles, so # The VeraLux PyQt6 wheel ships only the built-in Windows/Fusion styles, so
# the global QT_STYLE_OVERRIDE=adwaita-dark (inherited from the session) is # the global QT_STYLE_OVERRIDE=adwaita-dark (inherited from the session) is
@@ -26,9 +34,12 @@ let
# ignored again (harmless warning + Fusion fallback, no loss of function). # ignored again (harmless warning + Fusion fallback, no loss of function).
postBuild = '' postBuild = ''
wrapProgram $out/bin/siril \ wrapProgram $out/bin/siril \
--prefix PATH : ${lib.makeBinPath [ pkgs.python3 ]} \ --prefix PATH : /etc/siril/bin \
--prefix QT_PLUGIN_PATH : ${pkgs.adwaita-qt6}/lib/qt-6/plugins \ --prefix QT_PLUGIN_PATH : ${pkgs.adwaita-qt6}/lib/qt-6/plugins \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [ --prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath (
with pkgs;
[
stdenv.cc.cc.lib # libstdc++ / libgcc_s / libgomp (numpy etc.) stdenv.cc.cc.lib # libstdc++ / libgcc_s / libgomp (numpy etc.)
zlib zlib
zstd # libzstd.so.1 (PyQt6) zstd # libzstd.so.1 (PyQt6)
@@ -51,7 +62,9 @@ let
libxcb-image libxcb-image
libxcb-keysyms libxcb-keysyms
libxcb-render-util libxcb-render-util
])} ]
)
}
''; '';
}; };
in in
@@ -62,6 +75,10 @@ in
sirilWithPlugins sirilWithPlugins
]; ];
# Stable, GC-safe interpreter path for Siril's venv (see sirilWithPlugins).
# Same python as siril itself propagates, so sirilpy's ABI matches.
environment.etc."siril/bin/python3".source = "${pkgs.python3}/bin/python3";
# StarNet++ has no nixpkgs package. Download the StarNet v2 ORT CLI build # StarNet++ has no nixpkgs package. Download the StarNet v2 ORT CLI build
# (starnet2_linux_*_ORT_x64_cli) from https://www.starnetastro.com/download/ # (starnet2_linux_*_ORT_x64_cli) from https://www.starnetastro.com/download/
# and unzip it to ~/.local/share/siril/starnet/. Then in Siril set # and unzip it to ~/.local/share/siril/starnet/. Then in Siril set
-2
View File
@@ -1,5 +1,3 @@
{ config, lib, pkgs, ... }:
{ {
# enable sound through pipewire # enable sound through pipewire
services.pipewire = { services.pipewire = {
+5 -2
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# set bootloader to systemd # set bootloader to systemd
@@ -17,7 +17,10 @@
}; };
# kernel options # kernel options
boot.kernelParams = [ "quiet" "acpi.debug_level=0" ]; boot.kernelParams = [
"quiet"
"acpi.debug_level=0"
];
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
boot.consoleLogLevel = 2; boot.consoleLogLevel = 2;
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# install calibre for ebook management and kobo syncing # install calibre for ebook management and kobo syncing
-2
View File
@@ -1,5 +1,3 @@
{ config, lib, pkgs, ... }:
let let
caddyRootCA = '' caddyRootCA = ''
-----BEGIN CERTIFICATE----- -----BEGIN CERTIFICATE-----
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
+5 -2
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ...}: { pkgs, ... }:
{ {
# add docker group to user # add docker group to user
@@ -8,7 +8,10 @@
enable = true; enable = true;
# Customize Docker daemon settings # Customize Docker daemon settings
daemon.settings = { daemon.settings = {
dns = [ "1.1.1.1" "8.8.8.8" ]; dns = [
"1.1.1.1"
"8.8.8.8"
];
log-driver = "journald"; log-driver = "journald";
registry-mirrors = [ "https://mirror.gcr.io" ]; registry-mirrors = [ "https://mirror.gcr.io" ];
storage-driver = "overlay2"; storage-driver = "overlay2";
-2
View File
@@ -1,5 +1,3 @@
{ config, lib, pkgs, ... }:
# Add encrypted drives to argon # Add encrypted drives to argon
{ {
+19 -3
View File
@@ -1,15 +1,31 @@
{ config, lib, pkgs, ... }: { config, pkgs, ... }:
{ {
# enable gnupg agent # enable gnupg agent
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; # a graphical pinentry never grabs the tty, so a passphrase prompt can no
pinentryPackage = pkgs.pinentry-curses; # longer take over a terminal that a coding agent is driving
pinentryPackage = pkgs.pinentry-qt;
settings = {
# keep the key unlocked for a full working day instead of 10 minutes,
# so signing commits asks at most once per session
default-cache-ttl = 86400;
max-cache-ttl = 86400;
# fail an unattended signature instead of blocking on a prompt forever
pinentry-timeout = 120;
};
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gnupg gnupg
pinentry-qt
# fallback for sessions without a display, switch pinentryPackage to use it
pinentry-curses pinentry-curses
# prime the passphrase cache on demand, e.g. before an agent session
(writeShellScriptBin "gpg-unlock" ''
echo | ${config.programs.gnupg.package}/bin/gpg --clearsign --output /dev/null
echo "gpg key unlocked"
'')
]; ];
} }
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# install gnuradio companion along with it's osmocom library # install gnuradio companion along with it's osmocom library
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# enable amd GPU acceleration (mesa, vulkan, egl) # enable amd GPU acceleration (mesa, vulkan, egl)
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# greetd display manager with tuigreet # greetd display manager with tuigreet
-2
View File
@@ -1,5 +1,3 @@
{ config, lib, pkgs, ... }:
{ {
# set the time zone # set the time zone
time.timeZone = "Europe/Zurich"; time.timeZone = "Europe/Zurich";
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# user networkmanager # user networkmanager
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# just enable and install niri # just enable and install niri
+2 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, inputs, ... }: { pkgs, inputs, ... }:
{ {
# install noctalia and helper packages # install noctalia and helper packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@@ -9,5 +9,6 @@
brightnessctl brightnessctl
ddcutil ddcutil
playerctl playerctl
wl-mirror
]; ];
} }
-2
View File
@@ -1,5 +1,3 @@
{ config, lib, pkgs, ... }:
{ {
# enable the openssh daemon # enable the openssh daemon
services.openssh = { services.openssh = {
+1 -2
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# system packages # system packages
@@ -18,7 +18,6 @@
ldns ldns
lm_sensors lm_sensors
lsof lsof
ltrace
mtr mtr
neovim neovim
nfs-utils nfs-utils
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# protonvpn uses wireguard tunnels, which break strict reverse path filtering # protonvpn uses wireguard tunnels, which break strict reverse path filtering
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# enable sddm and use astronaut theme # enable sddm and use astronaut theme
-2
View File
@@ -1,5 +1,3 @@
{ config, lib, pkgs, ... }:
{ {
# list of enabled services on the system # list of enabled services on the system
services = { services = {
+8 -4
View File
@@ -1,11 +1,12 @@
{ config, lib, pkgs, ... }:
{ {
nix = { nix = {
# nix settings # nix settings
settings = { settings = {
# enable flakes and nix-command # enable flakes and nix-command
experimental-features = [ "nix-command" "flakes" ]; experimental-features = [
"nix-command"
"flakes"
];
# auto-optimize my nix-store # auto-optimize my nix-store
auto-optimise-store = true; auto-optimise-store = true;
# use all cores # use all cores
@@ -33,7 +34,10 @@
}; };
# add trusted users (able to modify the nix store) # add trusted users (able to modify the nix store)
nix.settings.trusted-users = [ "root" "@wheel" ]; nix.settings.trusted-users = [
"root"
"@wheel"
];
# allow unfree packages (steam, protonvpn, discord, etc.) # allow unfree packages (steam, protonvpn, discord, etc.)
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# enable steam and open firewall # enable steam and open firewall
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# Enable Thunar # Enable Thunar
+6 -2
View File
@@ -1,11 +1,15 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# create users # create users
users.users.aaron = { users.users.aaron = {
isNormalUser = true; isNormalUser = true;
group = "users"; group = "users";
extraGroups = [ "wheel" "networkmanager" "dialout" ]; extraGroups = [
"wheel"
"networkmanager"
"dialout"
];
shell = pkgs.zsh; shell = pkgs.zsh;
}; };
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# Vial-capable keyboards (lily58 pro r2g) expose a second, non-keyboard raw # Vial-capable keyboards (lily58 pro r2g) expose a second, non-keyboard raw
+8
View File
@@ -0,0 +1,8 @@
# statix configuration (run via `lint` in the devenv)
# Flat assignments like `boot.loader = ...; boot.plymouth = ...;` are the
# preferred style in this repo, so don't ask for them to be merged.
disabled = [ "repeated_keys" ]
# Generated by nixos-generate-config, not maintained by hand.
ignore = [ "hosts/*/hardware-configuration.nix" ]
-2
View File
@@ -1,5 +1,3 @@
{ config, pkgs, ... }:
{ {
imports = [ imports = [
../../modules/home-manager/fonts.nix ../../modules/home-manager/fonts.nix