Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 aaron
|
5abbcb10ca
|
||
|
aaron
|
ea2682f31d
|
||
|
aaron
|
73e17de1a1 | ||
|
aaron
|
26473288b6
|
||
|
aaron
|
2231d2fc3f
|
||
|
aaron
|
4ec579b1fc
|
||
|
aaron
|
c1d11138b3 | ||
|
aaron
|
92b170e5e8
|
||
|
aaron
|
3d90a9759f | ||
|
aaron
|
3b4f05a91c
|
||
|
aaron
|
c1a7a9d085 | ||
|
aaron
|
848af4d44b
|
||
|
aaron
|
e61289a26e | ||
|
aaron
|
28f5f4faa9
|
||
|
aaron
|
1007450e19 | ||
|
aaron
|
1be2731c53
|
||
|
aaron
|
b8d108f173 | ||
|
aaron
|
366a895a08
|
||
|
aaron
|
7ceef4775c |
@@ -0,0 +1,2 @@
|
||||
# nixfmt reformat
|
||||
2231d2fc3fb4dc140c5f3257523dcdb513ac4dea
|
||||
@@ -8,3 +8,7 @@ result-*
|
||||
|
||||
# vim
|
||||
*.swp
|
||||
|
||||
# devenv
|
||||
.devenv*
|
||||
devenv.local.nix
|
||||
|
||||
+65
@@ -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
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
packages = with pkgs; [
|
||||
# gitea (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 .
|
||||
deadnix --fail --exclude hosts/*/hardware-configuration.nix -- .
|
||||
'';
|
||||
fmt.exec = ''
|
||||
nixfmt $(git ls-files '*.nix')
|
||||
'';
|
||||
};
|
||||
|
||||
enterShell = ''
|
||||
echo "nixconfig devenv: tea, lint, fmt"
|
||||
'';
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
inputs:
|
||||
nixpkgs:
|
||||
url: github:cachix/devenv-nixpkgs/rolling
|
||||
Generated
+15
-15
@@ -8,11 +8,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1787559586,
|
||||
"narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
|
||||
"lastModified": 1788450739,
|
||||
"narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
|
||||
"rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -28,11 +28,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1787797243,
|
||||
"narHash": "sha256-8+Q7NOB7RPajRjA4pbCDLzqH+MTjnG9x6LUPLfL2joA=",
|
||||
"lastModified": 1790819692,
|
||||
"narHash": "sha256-rvubAPbh3QCliic3sAK+CXTrPCGgJstY52OTs/5H1J4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "99c9ec63390f1d8c14d95d9e8b17cc29cfbd4e11",
|
||||
"rev": "c8ecc29e5175452bee4a2aa1ba2383856d795338",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -43,11 +43,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1787900134,
|
||||
"narHash": "sha256-VYXO0XZlgj06dxJZRhrD3WoSsvq/c7+/Akyoa22pefw=",
|
||||
"lastModified": 1790689126,
|
||||
"narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "83199d0d373dd3ac2b9a1996b1d0263f76ab7a4c",
|
||||
"rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -66,11 +66,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1787862710,
|
||||
"narHash": "sha256-dL1Tv7LekaTWUJxHRckjbupWczDdc3QOgRuVCM+WAvQ=",
|
||||
"lastModified": 1790541651,
|
||||
"narHash": "sha256-/496IQz8qNWHHLnc3Zvr0l4uxJ34igNhJhn7ZKAefFk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "8c096abcf376137527c134da4ee210332b08ccc0",
|
||||
"rev": "5980a626794486abad69fca7667f9c11dfbc3bd7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -86,11 +86,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1788099672,
|
||||
"narHash": "sha256-t4Rw5OeULK/WA2Jh9ja615sCs2AmvahkAUx/ymdf2YQ=",
|
||||
"lastModified": 1790718664,
|
||||
"narHash": "sha256-LWil4xgSyqIFZ9sydvL1glFOoiqAOknWUwykC4sqxuY=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "d891007c022a3a1d4484495fe8b350a00deafae9",
|
||||
"rev": "fd9759c892fe5034b682c185695f1bee121cd5b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -17,29 +17,38 @@
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, home-manager, nixvim, ... }@inputs:
|
||||
let
|
||||
mkHost = hostName: nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./hosts/${hostName}/hardware-configuration.nix
|
||||
./hosts/${hostName}/configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
home-manager.users.aaron.imports = [
|
||||
nixvim.homeModules.nixvim
|
||||
./users/aaron/home.nix
|
||||
outputs =
|
||||
{
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
nixvim,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
mkHost =
|
||||
hostName:
|
||||
nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
./hosts/${hostName}/hardware-configuration.nix
|
||||
./hosts/${hostName}/configuration.nix
|
||||
home-manager.nixosModules.home-manager
|
||||
{
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
home-manager.users.aaron.imports = [
|
||||
nixvim.homeModules.nixvim
|
||||
./users/aaron/home.nix
|
||||
];
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
nixosConfigurations = {
|
||||
default = mkHost "default";
|
||||
neon = mkHost "neon";
|
||||
argon = mkHost "argon";
|
||||
};
|
||||
};
|
||||
in {
|
||||
nixosConfigurations = {
|
||||
default = mkHost "default";
|
||||
neon = mkHost "neon";
|
||||
argon = mkHost "argon";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
{ config, pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../../modules/nixos/appimage.nix
|
||||
@@ -11,7 +9,6 @@
|
||||
../../modules/nixos/claudecode.nix
|
||||
../../modules/nixos/drives.nix
|
||||
../../modules/nixos/gnupg.nix
|
||||
../../modules/nixos/gnuradio.nix
|
||||
../../modules/nixos/graphics.nix
|
||||
../../modules/nixos/greetd.nix
|
||||
../../modules/nixos/locales.nix
|
||||
@@ -29,10 +26,12 @@
|
||||
../../modules/nixos/vial.nix
|
||||
];
|
||||
|
||||
# host-specific niri config (outputs, input devices)
|
||||
home-manager.users.aaron.imports = [ ./niri.nix ];
|
||||
|
||||
# set hostname
|
||||
networking.hostName = "argon";
|
||||
|
||||
# install state version
|
||||
system.stateVersion = "25.11"; # Don't change
|
||||
}
|
||||
|
||||
|
||||
@@ -1,38 +1,54 @@
|
||||
# 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 + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [
|
||||
(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.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/mapper/lvmroot-root";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/mapper/lvmroot-root";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/AC1C-20EB";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/mapper/lvmroot-home";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/mapper/lvmroot-swap"; }
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/AC1C-20EB";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
];
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/mapper/lvmroot-home";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/mapper/lvmroot-swap"; }
|
||||
];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
# argon: desktop with two 1440p monitors side by side
|
||||
{
|
||||
wayland.windowManager.niri.settings = {
|
||||
input = {
|
||||
touchpad.off = { };
|
||||
trackpoint.off = { };
|
||||
};
|
||||
|
||||
_children = [
|
||||
{
|
||||
output = {
|
||||
_args = [ "DP-1" ];
|
||||
mode = "2560x1440@165.000";
|
||||
scale = 1;
|
||||
transform = "normal";
|
||||
position._props = {
|
||||
x = 0;
|
||||
y = 0;
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
output = {
|
||||
_args = [ "DP-2" ];
|
||||
mode = "2560x1440@143.912";
|
||||
scale = 1;
|
||||
transform = "normal";
|
||||
position._props = {
|
||||
x = 2560;
|
||||
y = 0;
|
||||
};
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -1,10 +1,13 @@
|
||||
# 0x29a nixos conifg
|
||||
|
||||
{ pkgs, lib, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# use flakes
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
|
||||
# configure bootloader
|
||||
boot.loader.systemd-boot.enable = false;
|
||||
@@ -29,7 +32,7 @@
|
||||
services.qemuGuest.enable = true;
|
||||
|
||||
# networking
|
||||
networking.hostName = "nixos";
|
||||
networking.hostName = "nixos";
|
||||
networking.networkmanager.enable = true;
|
||||
|
||||
# time zone.
|
||||
@@ -60,9 +63,10 @@
|
||||
|
||||
windowManager.qtile = {
|
||||
enable = true;
|
||||
extraPackages = python3Packages: with python3Packages; [
|
||||
qtile-extras
|
||||
];
|
||||
extraPackages =
|
||||
python3Packages: with python3Packages; [
|
||||
qtile-extras
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -71,8 +75,8 @@
|
||||
|
||||
# enable sound
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
|
||||
# define a user account
|
||||
@@ -97,7 +101,10 @@
|
||||
autosuggestions.enable = true;
|
||||
ohMyZsh = {
|
||||
enable = true;
|
||||
plugins = [ "git" "sudo" ];
|
||||
plugins = [
|
||||
"git"
|
||||
"sudo"
|
||||
];
|
||||
theme = "agnoster";
|
||||
};
|
||||
};
|
||||
@@ -116,8 +123,8 @@
|
||||
# Some programs need SUID wrappers
|
||||
programs.mtr.enable = true;
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
|
||||
# enable the OpenSSH daemon
|
||||
@@ -130,4 +137,3 @@
|
||||
# install state version
|
||||
system.stateVersion = "25.05"; # Don't change
|
||||
}
|
||||
|
||||
|
||||
@@ -1,36 +1,56 @@
|
||||
# 0x29a nixos hardware configuration
|
||||
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
imports = [
|
||||
(modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
|
||||
# boot and initrd configs
|
||||
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"uhci_hcd"
|
||||
"ehci_pci"
|
||||
"ahci"
|
||||
"virtio_pci"
|
||||
"virtio_scsi"
|
||||
"sd_mod"
|
||||
"sr_mod"
|
||||
];
|
||||
boot.initrd.kernelModules = [
|
||||
"dm-snapshot"
|
||||
"cryptd"
|
||||
];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/nixcrypt";
|
||||
|
||||
# file systems
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-label/nixroot";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-label/nixboot";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-label/nixhome";
|
||||
fsType = "ext4";
|
||||
};
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-label/nixswap"; }
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixroot";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-label/nixboot";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
];
|
||||
};
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-label/nixhome";
|
||||
fsType = "ext4";
|
||||
};
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-label/nixswap"; }
|
||||
];
|
||||
|
||||
# enable dhcp on all interfaces
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# user config
|
||||
@@ -29,7 +29,6 @@
|
||||
iotop
|
||||
iftop
|
||||
strace
|
||||
ltrace
|
||||
lsof
|
||||
sysstat
|
||||
lm_sensors
|
||||
@@ -51,12 +50,16 @@
|
||||
syntaxHighlighting.enable = true;
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
plugins = [ "git" "sudo" "python" "ansible" ];
|
||||
plugins = [
|
||||
"git"
|
||||
"sudo"
|
||||
"python"
|
||||
"ansible"
|
||||
];
|
||||
theme = "agnoster";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
## deploy qtile config
|
||||
#home.file."qtile-config" = {
|
||||
# target = ".config/qtile/config.py";
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
{ config, pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../../modules/nixos/appimage.nix
|
||||
@@ -25,10 +23,12 @@
|
||||
../../modules/nixos/vial.nix
|
||||
];
|
||||
|
||||
# host-specific niri config (input devices, laptop binds)
|
||||
home-manager.users.aaron.imports = [ ./niri.nix ];
|
||||
|
||||
# set hostname
|
||||
networking.hostName = "neon";
|
||||
|
||||
# install state version
|
||||
system.stateVersion = "25.11"; # Don't change
|
||||
}
|
||||
|
||||
|
||||
@@ -1,39 +1,57 @@
|
||||
# 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 + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
||||
boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ];
|
||||
boot.initrd.availableKernelModules = [
|
||||
"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.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-label/nixroot";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-label/nixroot";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-label/nixboot";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-label/nixhome";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-label/nixswap"; }
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-label/nixboot";
|
||||
fsType = "vfat";
|
||||
options = [
|
||||
"fmask=0022"
|
||||
"dmask=0022"
|
||||
];
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-label/nixhome";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{ device = "/dev/disk/by-label/nixswap"; }
|
||||
];
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
# neon: laptop, built-in display is auto-configured by niri
|
||||
{ lib, ... }:
|
||||
|
||||
let
|
||||
brightness = step: {
|
||||
_props.allow-when-locked = true;
|
||||
spawn = [
|
||||
"brightnessctl"
|
||||
"--class=backlight"
|
||||
"set"
|
||||
step
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
wayland.windowManager.niri.settings = {
|
||||
input.touchpad = {
|
||||
tap = { };
|
||||
natural-scroll = { };
|
||||
};
|
||||
|
||||
layout.gaps = lib.mkForce 10;
|
||||
|
||||
binds = {
|
||||
"Print".screenshot = { };
|
||||
"Ctrl+Print".screenshot-screen = { };
|
||||
"Mod+Shift+P".power-off-monitors = { };
|
||||
|
||||
# finer brightness steps; mkForce, since spawn lists would otherwise be concatenated
|
||||
"XF86MonBrightnessUp" = lib.mkForce (brightness "+1%");
|
||||
"XF86MonBrightnessDown" = lib.mkForce (brightness "1%-");
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, pkgs, inputs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# user fonts
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
{ config, pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,4 +1,9 @@
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
email = "aaron@0x29a.ch";
|
||||
@@ -14,16 +19,19 @@ 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;
|
||||
xdg.configFile."git/allowed_signers".text = lib.concatMapStrings (
|
||||
key: "${email} ${key}\n"
|
||||
) signingKeys;
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
settings = {
|
||||
push = { autoSetupRemote = true; };
|
||||
push = {
|
||||
autoSetupRemote = true;
|
||||
};
|
||||
user = {
|
||||
name = "aaron";
|
||||
email = email;
|
||||
name = "aaron";
|
||||
inherit email;
|
||||
};
|
||||
gpg.ssh.allowedSignersFile = "${config.xdg.configHome}/git/allowed_signers";
|
||||
};
|
||||
|
||||
@@ -0,0 +1,298 @@
|
||||
{ lib, osConfig, ... }:
|
||||
|
||||
let
|
||||
# Mod+1..9 focus a workspace, Mod+Ctrl+1..9 move the column there.
|
||||
workspaceBinds = lib.mergeAttrsList (
|
||||
map (n: {
|
||||
"Mod+${toString n}".focus-workspace = n;
|
||||
"Mod+Ctrl+${toString n}".move-column-to-workspace = n;
|
||||
}) (lib.range 1 9)
|
||||
);
|
||||
|
||||
# Shorthand for binds that only run spawn-sh while allowed on the lock screen.
|
||||
lockedSh = cmd: {
|
||||
_props.allow-when-locked = true;
|
||||
spawn-sh = cmd;
|
||||
};
|
||||
in
|
||||
{
|
||||
# Niri config, rendered to ~/.config/niri/config.kdl by home-manager's built-in
|
||||
# wayland.windowManager.niri module. The compositor itself, its session, systemd
|
||||
# units and portals are provided by the NixOS module (modules/nixos/niri.nix), so
|
||||
# this module only writes the config. Host-specific outputs and input devices
|
||||
# live in hosts/<host>/niri.nix.
|
||||
|
||||
wayland.windowManager.niri = {
|
||||
# only on hosts that run niri (see modules/nixos/niri.nix)
|
||||
enable = osConfig.programs.niri.enable;
|
||||
|
||||
# Use the system's niri so the config is validated against the running version.
|
||||
package = osConfig.programs.niri.package;
|
||||
systemd.enable = false;
|
||||
portalPackage = null;
|
||||
xwaylandSatellitePackage = null; # installed system-wide
|
||||
|
||||
settings = {
|
||||
input = {
|
||||
keyboard = {
|
||||
xkb.layout = "ch";
|
||||
numlock = { };
|
||||
};
|
||||
mouse = {
|
||||
natural-scroll = { };
|
||||
accel-speed = 0.5;
|
||||
scroll-method = "no-scroll";
|
||||
};
|
||||
};
|
||||
|
||||
environment.GTK_IM_MODULE = "simple";
|
||||
|
||||
layout = {
|
||||
gaps = 16;
|
||||
center-focused-column = "never";
|
||||
|
||||
preset-column-widths._children = [
|
||||
{ proportion = 0.33333; }
|
||||
{ proportion = 0.5; }
|
||||
{ proportion = 0.66667; }
|
||||
{ fixed = 2560; }
|
||||
];
|
||||
|
||||
default-column-width.proportion = 0.5;
|
||||
|
||||
focus-ring = {
|
||||
on = { };
|
||||
width = 2;
|
||||
active-color = "#4c566a";
|
||||
inactive-color = "#2e3440";
|
||||
urgent-color = "#a3be8c";
|
||||
};
|
||||
|
||||
border.off = { };
|
||||
|
||||
shadow = {
|
||||
on = { };
|
||||
draw-behind-window = true;
|
||||
softness = 30;
|
||||
spread = 10;
|
||||
offset._props = {
|
||||
x = 0;
|
||||
y = 5;
|
||||
};
|
||||
color = "#0007";
|
||||
};
|
||||
};
|
||||
|
||||
spawn-at-startup = "noctalia";
|
||||
|
||||
hotkey-overlay.skip-at-startup = { };
|
||||
|
||||
screenshot-path = "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png";
|
||||
|
||||
_children = [
|
||||
# Open the Firefox picture-in-picture player as floating by default.
|
||||
{
|
||||
window-rule._children = [
|
||||
{
|
||||
match._props = {
|
||||
app-id = "firefox$";
|
||||
title = "^Picture-in-Picture$";
|
||||
};
|
||||
}
|
||||
{ open-floating = true; }
|
||||
];
|
||||
}
|
||||
# Block out the password manager from screen capture.
|
||||
{
|
||||
window-rule._children = [
|
||||
{ match._props.app-id = "^org\\.keepassxc\\.KeePassXC$"; }
|
||||
{ block-out-from = "screen-capture"; }
|
||||
];
|
||||
}
|
||||
{
|
||||
window-rule = {
|
||||
geometry-corner-radius = 12;
|
||||
clip-to-geometry = true;
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
binds = workspaceBinds // {
|
||||
# programs: terminal, app launcher, screen locker
|
||||
"Mod+Return" = {
|
||||
_props.hotkey-overlay-title = "Open a Terminal";
|
||||
spawn = "ghostty";
|
||||
};
|
||||
"Mod+D" = {
|
||||
_props.hotkey-overlay-title = "Run an Application";
|
||||
spawn = [
|
||||
"noctalia"
|
||||
"msg"
|
||||
"panel-toggle"
|
||||
"launcher"
|
||||
];
|
||||
};
|
||||
"Super+Alt+L" = {
|
||||
_props.hotkey-overlay-title = "Lock the Screen";
|
||||
spawn = [
|
||||
"noctalia"
|
||||
"msg"
|
||||
"session"
|
||||
"lock"
|
||||
];
|
||||
};
|
||||
|
||||
# media keys (PipeWire / WirePlumber)
|
||||
"XF86AudioRaiseVolume" = lockedSh "wpctl set-volume @DEFAULT_SINK@ 0.01+ -l 1.0";
|
||||
"XF86AudioLowerVolume" = lockedSh "wpctl set-volume @DEFAULT_SINK@ 0.01-";
|
||||
"XF86AudioMute" = lockedSh "wpctl set-mute @DEFAULT_SINK@ toggle";
|
||||
"XF86AudioMicMute" = lockedSh "wpctl set-mute @DEFAULT_SOURCE@ toggle";
|
||||
"XF86AudioPlay" = lockedSh "playerctl play-pause";
|
||||
"XF86AudioStop" = lockedSh "playerctl stop";
|
||||
"XF86AudioPrev" = lockedSh "playerctl previous";
|
||||
"XF86AudioNext" = lockedSh "playerctl next";
|
||||
"XF86MonBrightnessUp" = {
|
||||
_props.allow-when-locked = true;
|
||||
spawn = [
|
||||
"brightnessctl"
|
||||
"--class=backlight"
|
||||
"set"
|
||||
"+10%"
|
||||
];
|
||||
};
|
||||
"XF86MonBrightnessDown" = {
|
||||
_props.allow-when-locked = true;
|
||||
spawn = [
|
||||
"brightnessctl"
|
||||
"--class=backlight"
|
||||
"set"
|
||||
"10%-"
|
||||
];
|
||||
};
|
||||
|
||||
"Mod+O" = {
|
||||
_props.repeat = false;
|
||||
toggle-overview = { };
|
||||
};
|
||||
"Mod+Q" = {
|
||||
_props.repeat = false;
|
||||
close-window = { };
|
||||
};
|
||||
|
||||
# focus / move columns and windows
|
||||
"Mod+Left".focus-column-left = { };
|
||||
"Mod+Down".focus-window-down = { };
|
||||
"Mod+Up".focus-window-up = { };
|
||||
"Mod+Right".focus-column-right = { };
|
||||
"Mod+H".focus-column-left = { };
|
||||
"Mod+J".focus-window-down = { };
|
||||
"Mod+K".focus-window-up = { };
|
||||
"Mod+L".focus-column-right = { };
|
||||
|
||||
"Mod+Shift+Left".move-column-left = { };
|
||||
"Mod+Shift+Down".move-window-down = { };
|
||||
"Mod+Shift+Up".move-window-up = { };
|
||||
"Mod+Shift+Right".move-column-right = { };
|
||||
"Mod+Shift+H".move-column-left = { };
|
||||
"Mod+Shift+J".move-window-down = { };
|
||||
"Mod+Shift+K".move-window-up = { };
|
||||
"Mod+Shift+L".move-column-right = { };
|
||||
|
||||
"Mod+Home".focus-column-first = { };
|
||||
"Mod+End".focus-column-last = { };
|
||||
"Mod+Ctrl+Home".move-column-to-first = { };
|
||||
"Mod+Ctrl+End".move-column-to-last = { };
|
||||
|
||||
# move columns between monitors
|
||||
"Mod+Ctrl+Left".move-column-to-monitor-left = { };
|
||||
"Mod+Ctrl+Down".move-column-to-monitor-down = { };
|
||||
"Mod+Ctrl+Up".move-column-to-monitor-up = { };
|
||||
"Mod+Ctrl+Right".move-column-to-monitor-right = { };
|
||||
"Mod+Ctrl+H".move-column-to-monitor-left = { };
|
||||
"Mod+Ctrl+J".move-column-to-monitor-down = { };
|
||||
"Mod+Ctrl+K".move-column-to-monitor-up = { };
|
||||
"Mod+Ctrl+L".move-column-to-monitor-right = { };
|
||||
|
||||
# workspaces
|
||||
"Mod+Page_Down".focus-workspace-down = { };
|
||||
"Mod+Page_Up".focus-workspace-up = { };
|
||||
"Mod+U".focus-workspace-down = { };
|
||||
"Mod+I".focus-workspace-up = { };
|
||||
"Mod+Ctrl+Page_Down".move-column-to-workspace-down = { };
|
||||
"Mod+Ctrl+Page_Up".move-column-to-workspace-up = { };
|
||||
"Mod+Ctrl+U".move-column-to-workspace-down = { };
|
||||
"Mod+Ctrl+I".move-column-to-workspace-up = { };
|
||||
|
||||
"Mod+Shift+Page_Down".move-workspace-down = { };
|
||||
"Mod+Shift+Page_Up".move-workspace-up = { };
|
||||
"Mod+Shift+U".move-workspace-down = { };
|
||||
"Mod+Shift+I".move-workspace-up = { };
|
||||
|
||||
# mouse wheel
|
||||
"Mod+WheelScrollDown" = {
|
||||
_props.cooldown-ms = 150;
|
||||
focus-workspace-down = { };
|
||||
};
|
||||
"Mod+WheelScrollUp" = {
|
||||
_props.cooldown-ms = 150;
|
||||
focus-workspace-up = { };
|
||||
};
|
||||
"Mod+Ctrl+WheelScrollDown" = {
|
||||
_props.cooldown-ms = 150;
|
||||
move-column-to-workspace-down = { };
|
||||
};
|
||||
"Mod+Ctrl+WheelScrollUp" = {
|
||||
_props.cooldown-ms = 150;
|
||||
move-column-to-workspace-up = { };
|
||||
};
|
||||
|
||||
"Mod+WheelScrollRight".focus-column-right = { };
|
||||
"Mod+WheelScrollLeft".focus-column-left = { };
|
||||
"Mod+Ctrl+WheelScrollRight".move-column-right = { };
|
||||
"Mod+Ctrl+WheelScrollLeft".move-column-left = { };
|
||||
|
||||
"Mod+Shift+WheelScrollDown".focus-column-right = { };
|
||||
"Mod+Shift+WheelScrollUp".focus-column-left = { };
|
||||
"Mod+Ctrl+Shift+WheelScrollDown".move-column-right = { };
|
||||
"Mod+Ctrl+Shift+WheelScrollUp".move-column-left = { };
|
||||
|
||||
# columns
|
||||
"Mod+BracketLeft".consume-or-expel-window-left = { };
|
||||
"Mod+BracketRight".consume-or-expel-window-right = { };
|
||||
"Mod+Comma".consume-window-into-column = { };
|
||||
"Mod+Period".expel-window-from-column = { };
|
||||
|
||||
"Mod+R".switch-preset-column-width = { };
|
||||
"Mod+Shift+R".switch-preset-window-height = { };
|
||||
"Mod+Ctrl+R".reset-window-height = { };
|
||||
"Mod+F".maximize-column = { };
|
||||
"Mod+Shift+F".fullscreen-window = { };
|
||||
"Mod+Ctrl+F".expand-column-to-available-width = { };
|
||||
|
||||
"Mod+C".center-column = { };
|
||||
"Mod+Ctrl+C".center-visible-columns = { };
|
||||
|
||||
"Mod+Minus".set-column-width = "-10%";
|
||||
"Mod+Equal".set-column-width = "+10%";
|
||||
"Mod+Shift+Minus".set-window-height = "-10%";
|
||||
"Mod+Shift+Equal".set-window-height = "+10%";
|
||||
|
||||
"Mod+Space".toggle-window-floating = { };
|
||||
"Mod+Shift+Space".switch-focus-between-floating-and-tiling = { };
|
||||
"Mod+W".toggle-column-tabbed-display = { };
|
||||
|
||||
# screenshots
|
||||
"Mod+P".screenshot = { };
|
||||
"Alt+Print".screenshot-window = { };
|
||||
|
||||
# escape hatch for apps that inhibit keyboard shortcuts
|
||||
"Mod+Escape" = {
|
||||
_props.allow-inhibiting = false;
|
||||
toggle-keyboard-shortcuts-inhibit = { };
|
||||
};
|
||||
|
||||
"Mod+Shift+E".quit = { };
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, pkgs, inputs, ... }:
|
||||
{ pkgs, inputs, ... }:
|
||||
|
||||
{
|
||||
programs.nixvim = {
|
||||
@@ -57,7 +57,7 @@
|
||||
servers.pyright.enable = true;
|
||||
servers.ruff.enable = true;
|
||||
keymaps.lspBuf = {
|
||||
"<leader>K" = "hover";
|
||||
"<leader>K" = "hover";
|
||||
"<leader>gd" = "definition";
|
||||
"<leader>gr" = "references";
|
||||
"<leader>f" = "format";
|
||||
@@ -67,7 +67,11 @@
|
||||
};
|
||||
plugins.treesitter = {
|
||||
enable = true;
|
||||
settings.ensure_installed = [ "markdown" "markdown_inline" "typst" ];
|
||||
settings.ensure_installed = [
|
||||
"markdown"
|
||||
"markdown_inline"
|
||||
"typst"
|
||||
];
|
||||
};
|
||||
plugins.typst-preview = {
|
||||
enable = true;
|
||||
@@ -87,7 +91,11 @@
|
||||
enable = true;
|
||||
settings = {
|
||||
# render in normal mode, raw source in insert
|
||||
render_modes = [ "n" "c" "t"];
|
||||
render_modes = [
|
||||
"n"
|
||||
"c"
|
||||
"t"
|
||||
];
|
||||
pipe_table.preset = "round";
|
||||
heading.width = "block";
|
||||
file_types = [ "markdown" ];
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
{ 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/
|
||||
imports = [ inputs.noctalia.homeModules.default ];
|
||||
|
||||
programs.noctalia = {
|
||||
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;
|
||||
|
||||
# settings is rendered to ~/.config/noctalia/config.toml
|
||||
# settings is rendered to ~/.config/noctalia/config.toml
|
||||
settings = {
|
||||
# theme / colors
|
||||
theme = {
|
||||
@@ -72,9 +73,22 @@
|
||||
radius = 0;
|
||||
scale = 1.2;
|
||||
widget_spacing = 20;
|
||||
start = [ "control-center" "cpu" "ram" "temp" "active_window" ];
|
||||
start = [
|
||||
"control-center"
|
||||
"cpu"
|
||||
"ram"
|
||||
"temp"
|
||||
"active_window"
|
||||
];
|
||||
center = [ "workspaces" ];
|
||||
end = [ "tray" "bluetooth" "notifications" "volume" "network" "clock" ];
|
||||
end = [
|
||||
"tray"
|
||||
"bluetooth"
|
||||
"notifications"
|
||||
"volume"
|
||||
"network"
|
||||
"clock"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -102,7 +116,11 @@
|
||||
|
||||
# idle behavior
|
||||
idle = {
|
||||
behavior_order = [ "screen-off" "lock" "lock-and-suspend" ];
|
||||
behavior_order = [
|
||||
"screen-off"
|
||||
"lock"
|
||||
"lock-and-suspend"
|
||||
];
|
||||
behavior = {
|
||||
"screen-off" = {
|
||||
enabled = true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, pkgs, inputs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
# user packages
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
{ lib, ... }:
|
||||
|
||||
{
|
||||
# configure z-shell to use omz with some plugins
|
||||
@@ -9,7 +9,11 @@
|
||||
oh-my-zsh = {
|
||||
enable = true;
|
||||
# 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`
|
||||
extraConfig = ''
|
||||
# make omz faster on large repositories
|
||||
@@ -23,6 +27,35 @@
|
||||
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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, pkgs, inputs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# set gtk theme
|
||||
@@ -6,8 +6,8 @@
|
||||
enable = true;
|
||||
theme = {
|
||||
name = "Adwaita-dark";
|
||||
package = pkgs.gnome-themes-extra;
|
||||
};
|
||||
package = pkgs.gnome-themes-extra;
|
||||
};
|
||||
gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
|
||||
gtk4.theme = null;
|
||||
gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
{ config, pkgs, inputs, ... }:
|
||||
|
||||
let
|
||||
# Powerline separators, U+E0B0..U+E0B3.
|
||||
#
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# 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
|
||||
|
||||
+45
-28
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
# 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
|
||||
# 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
|
||||
# ~/.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 global QT_STYLE_OVERRIDE=adwaita-dark (inherited from the session) is
|
||||
@@ -26,32 +34,37 @@ let
|
||||
# ignored again (harmless warning + Fusion fallback, no loss of function).
|
||||
postBuild = ''
|
||||
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 LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [
|
||||
stdenv.cc.cc.lib # libstdc++ / libgcc_s / libgomp (numpy etc.)
|
||||
zlib
|
||||
zstd # libzstd.so.1 (PyQt6)
|
||||
libGL # libGL.so.1 (PyQt6)
|
||||
# PyQt6 (VeraLux) — Qt bundles xcb support so it needs these even
|
||||
# on Wayland; libxkbcommon is the keymap lib used by Wayland too.
|
||||
glib
|
||||
fontconfig
|
||||
freetype
|
||||
dbus
|
||||
libxkbcommon
|
||||
# Qt platform plugins: the wayland plugin (libqwayland.so) needs the
|
||||
# wayland client libs; the xcb fallback needs libxcb-cursor.so.0.
|
||||
wayland # libwayland-client/cursor/egl (wayland plugin)
|
||||
libxcb-cursor # libxcb-cursor.so.0 (xcb plugin)
|
||||
libx11
|
||||
libxcb
|
||||
libxcb-util
|
||||
libxcb-wm
|
||||
libxcb-image
|
||||
libxcb-keysyms
|
||||
libxcb-render-util
|
||||
])}
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath (
|
||||
with pkgs;
|
||||
[
|
||||
stdenv.cc.cc.lib # libstdc++ / libgcc_s / libgomp (numpy etc.)
|
||||
zlib
|
||||
zstd # libzstd.so.1 (PyQt6)
|
||||
libGL # libGL.so.1 (PyQt6)
|
||||
# PyQt6 (VeraLux) — Qt bundles xcb support so it needs these even
|
||||
# on Wayland; libxkbcommon is the keymap lib used by Wayland too.
|
||||
glib
|
||||
fontconfig
|
||||
freetype
|
||||
dbus
|
||||
libxkbcommon
|
||||
# Qt platform plugins: the wayland plugin (libqwayland.so) needs the
|
||||
# wayland client libs; the xcb fallback needs libxcb-cursor.so.0.
|
||||
wayland # libwayland-client/cursor/egl (wayland plugin)
|
||||
libxcb-cursor # libxcb-cursor.so.0 (xcb plugin)
|
||||
libx11
|
||||
libxcb
|
||||
libxcb-util
|
||||
libxcb-wm
|
||||
libxcb-image
|
||||
libxcb-keysyms
|
||||
libxcb-render-util
|
||||
]
|
||||
)
|
||||
}
|
||||
'';
|
||||
};
|
||||
in
|
||||
@@ -62,6 +75,10 @@ in
|
||||
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
|
||||
# (starnet2_linux_*_ORT_x64_cli) from https://www.starnetastro.com/download/
|
||||
# and unzip it to ~/.local/share/siril/starnet/. Then in Siril set
|
||||
@@ -72,7 +89,7 @@ in
|
||||
# run it. Its own opencv/onnxruntime libs are found via the bundled ./lib.
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld.libraries = with pkgs; [
|
||||
stdenv.cc.cc.lib # libstdc++ / libgcc_s
|
||||
stdenv.cc.cc.lib # libstdc++ / libgcc_s
|
||||
zlib
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# enable sound through pipewire
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# set bootloader to systemd
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
# enable systemd initrd
|
||||
boot.initrd.systemd.enable = true;
|
||||
|
||||
|
||||
# plymouth
|
||||
boot.plymouth = {
|
||||
enable = true;
|
||||
@@ -17,7 +17,10 @@
|
||||
};
|
||||
|
||||
# kernel options
|
||||
boot.kernelParams = [ "quiet" "acpi.debug_level=0" ];
|
||||
boot.kernelParams = [
|
||||
"quiet"
|
||||
"acpi.debug_level=0"
|
||||
];
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.consoleLogLevel = 2;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# install calibre for ebook management and kobo syncing
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
caddyRootCA = ''
|
||||
-----BEGIN CERTIFICATE-----
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ...}:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# add docker group to user
|
||||
@@ -8,7 +8,10 @@
|
||||
enable = true;
|
||||
# Customize Docker 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";
|
||||
registry-mirrors = [ "https://mirror.gcr.io" ];
|
||||
storage-driver = "overlay2";
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
# Add encrypted drives to argon
|
||||
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
# enable gnupg agent
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# install gnuradio companion along with it's osmocom library
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# enable amd GPU acceleration (mesa, vulkan, egl)
|
||||
@@ -11,7 +11,7 @@
|
||||
environment.systemPackages = with pkgs; [
|
||||
amdgpu_top
|
||||
];
|
||||
|
||||
|
||||
# add amdgpu to the initrd for plymouth
|
||||
hardware.amdgpu.initrd.enable = true;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# greetd display manager with tuigreet
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# set the time zone
|
||||
time.timeZone = "Europe/Zurich";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# user networkmanager
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
# enable bluetooth
|
||||
hardware.bluetooth.enable = true;
|
||||
|
||||
|
||||
# Add network-related packages
|
||||
environment.systemPackages = with pkgs; [
|
||||
wireguard-tools
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# just enable and install niri
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, inputs, ... }:
|
||||
{ pkgs, inputs, ... }:
|
||||
{
|
||||
# install noctalia and helper packages
|
||||
environment.systemPackages = with pkgs; [
|
||||
@@ -9,5 +9,6 @@
|
||||
brightnessctl
|
||||
ddcutil
|
||||
playerctl
|
||||
wl-mirror
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# enable the openssh daemon
|
||||
services.openssh = {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# system packages
|
||||
@@ -18,7 +18,6 @@
|
||||
ldns
|
||||
lm_sensors
|
||||
lsof
|
||||
ltrace
|
||||
mtr
|
||||
neovim
|
||||
nfs-utils
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# protonvpn uses wireguard tunnels, which break strict reverse path filtering
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# enable sddm and use astronaut theme
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# list of enabled services on the system
|
||||
services = {
|
||||
|
||||
@@ -1,17 +1,18 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
nix = {
|
||||
# nix settings
|
||||
settings = {
|
||||
# enable flakes and nix-command
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
# auto-optimize my nix-store
|
||||
auto-optimise-store = true;
|
||||
# use all cores
|
||||
max-jobs = "auto";
|
||||
max-jobs = "auto";
|
||||
# use all available cores per job
|
||||
cores = 0;
|
||||
cores = 0;
|
||||
# add trusted substituters (binary caches)
|
||||
substituters = [
|
||||
"https://cache.nixos.org"
|
||||
@@ -23,7 +24,7 @@
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
# enable automatic garbage collection
|
||||
gc = {
|
||||
automatic = true;
|
||||
@@ -31,9 +32,12 @@
|
||||
options = "--delete-older-than 7d";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
# 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.)
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# enable steam and open firewall
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# Enable Thunar
|
||||
|
||||
@@ -1,11 +1,15 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# create users
|
||||
users.users.aaron = {
|
||||
isNormalUser = true;
|
||||
group = "users";
|
||||
extraGroups = [ "wheel" "networkmanager" "dialout" ];
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"networkmanager"
|
||||
"dialout"
|
||||
];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
# Vial-capable keyboards (lily58 pro r2g) expose a second, non-keyboard raw
|
||||
|
||||
@@ -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" ]
|
||||
@@ -1,11 +1,10 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../../modules/home-manager/fonts.nix
|
||||
../../modules/home-manager/git.nix
|
||||
../../modules/home-manager/ghostty.nix
|
||||
../../modules/home-manager/nixvim.nix
|
||||
../../modules/home-manager/niri.nix
|
||||
../../modules/home-manager/noctalia.nix
|
||||
../../modules/home-manager/programs.nix
|
||||
../../modules/home-manager/shell.nix
|
||||
|
||||
Reference in New Issue
Block a user