Compare commits

...
10 Commits
52 changed files with 445 additions and 230 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
+12 -12
View File
@@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789430117, "lastModified": 1790819692,
"narHash": "sha256-t+U1mijItLJ64xZOifpfQ17kpAL73nU7pDI48ScacVc=", "narHash": "sha256-rvubAPbh3QCliic3sAK+CXTrPCGgJstY52OTs/5H1J4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "cda90fd8838825c689fde9d3f3b4e937937790df", "rev": "c8ecc29e5175452bee4a2aa1ba2383856d795338",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -43,11 +43,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1789286504, "lastModified": 1790689126,
"narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=", "narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec", "rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -66,11 +66,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1789344271, "lastModified": 1790541651,
"narHash": "sha256-ezmg5oQSZWYdmomx6K1J+/6w7dRc7bquDMggc8eAE28=", "narHash": "sha256-/496IQz8qNWHHLnc3Zvr0l4uxJ34igNhJhn7ZKAefFk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "afcfb8c1dc075881bbaa6fa5745aebbdb179f8b8", "rev": "5980a626794486abad69fca7667f9c11dfbc3bd7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -86,11 +86,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1789436433, "lastModified": 1790718664,
"narHash": "sha256-/Dy5P/7nCIss+uAhdF+8I59ww5WQUF4EBs1QJCB1aec=", "narHash": "sha256-LWil4xgSyqIFZ9sydvL1glFOoiqAOknWUwykC4sqxuY=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-shell", "repo": "noctalia-shell",
"rev": "e4eb0ff97743c1d07d0f5a0d5770b277b6485b03", "rev": "fd9759c892fe5034b682c185695f1bee121cd5b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
+32 -23
View File
@@ -17,29 +17,38 @@
}; };
}; };
outputs = { self, nixpkgs, home-manager, nixvim, ... }@inputs: outputs =
let {
mkHost = hostName: nixpkgs.lib.nixosSystem { nixpkgs,
system = "x86_64-linux"; home-manager,
specialArgs = { inherit inputs; }; nixvim,
modules = [ ...
./hosts/${hostName}/hardware-configuration.nix }@inputs:
./hosts/${hostName}/configuration.nix let
home-manager.nixosModules.home-manager mkHost =
{ hostName:
home-manager.extraSpecialArgs = { inherit inputs; }; nixpkgs.lib.nixosSystem {
home-manager.users.aaron.imports = [ system = "x86_64-linux";
nixvim.homeModules.nixvim specialArgs = { inherit inputs; };
./users/aaron/home.nix 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";
};
};
} }
-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
} }
+38 -22
View File
@@ -1,38 +1,54 @@
# 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" =
{ device = "/dev/mapper/lvmroot-home";
fsType = "ext4";
};
swapDevices =
[ { device = "/dev/mapper/lvmroot-swap"; }
]; ];
};
fileSystems."/home" = {
device = "/dev/mapper/lvmroot-home";
fsType = "ext4";
};
swapDevices = [
{ device = "/dev/mapper/lvmroot-swap"; }
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+18 -12
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;
@@ -29,7 +32,7 @@
services.qemuGuest.enable = true; services.qemuGuest.enable = true;
# networking # networking
networking.hostName = "nixos"; networking.hostName = "nixos";
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
# time zone. # time zone.
@@ -60,9 +63,10 @@
windowManager.qtile = { windowManager.qtile = {
enable = true; enable = true;
extraPackages = python3Packages: with python3Packages; [ extraPackages =
qtile-extras python3Packages: with python3Packages; [
]; qtile-extras
];
}; };
}; };
@@ -71,8 +75,8 @@
# enable sound # enable sound
services.pipewire = { services.pipewire = {
enable = true; enable = true;
pulse.enable = true; pulse.enable = true;
}; };
# define a user account # define a user account
@@ -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";
}; };
}; };
@@ -116,8 +123,8 @@
# Some programs need SUID wrappers # Some programs need SUID wrappers
programs.mtr.enable = true; programs.mtr.enable = true;
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
}; };
# enable the OpenSSH daemon # enable the OpenSSH daemon
@@ -130,4 +137,3 @@
# install state version # install state version
system.stateVersion = "25.05"; # Don't change system.stateVersion = "25.05"; # Don't change
} }
+41 -21
View File
@@ -1,36 +1,56 @@
# 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"
fileSystems."/home" = "dmask=0022"
{ device = "/dev/disk/by-label/nixhome";
fsType = "ext4";
};
swapDevices =
[ { device = "/dev/disk/by-label/nixswap"; }
]; ];
};
fileSystems."/home" = {
device = "/dev/disk/by-label/nixhome";
fsType = "ext4";
};
swapDevices = [
{ device = "/dev/disk/by-label/nixswap"; }
];
# enable dhcp on all interfaces # enable dhcp on all interfaces
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
+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
} }
+41 -23
View File
@@ -1,39 +1,57 @@
# 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" =
{ device = "/dev/disk/by-label/nixhome";
fsType = "ext4";
};
swapDevices =
[ { device = "/dev/disk/by-label/nixswap"; }
]; ];
};
fileSystems."/home" = {
device = "/dev/disk/by-label/nixhome";
fsType = "ext4";
};
swapDevices = [
{ device = "/dev/disk/by-label/nixswap"; }
];
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+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;
+14 -6
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, inputs, ... }: {
config,
lib,
pkgs,
...
}:
let let
email = "aaron@0x29a.ch"; email = "aaron@0x29a.ch";
@@ -14,16 +19,19 @@ in
{ {
# gitea verifies signatures against the account keys, this teaches the local # gitea verifies signatures against the account keys, this teaches the local
# git the same trust so `git log --show-signature` resolves as well # git the same trust so `git log --show-signature` resolves as well
xdg.configFile."git/allowed_signers".text = xdg.configFile."git/allowed_signers".text = lib.concatMapStrings (
lib.concatMapStrings (key: "${email} ${key}\n") signingKeys; 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 = email; inherit email;
}; };
gpg.ssh.allowedSignersFile = "${config.xdg.configHome}/git/allowed_signers"; gpg.ssh.allowedSignersFile = "${config.xdg.configHome}/git/allowed_signers";
}; };
+12 -4
View File
@@ -1,4 +1,4 @@
{ config, pkgs, inputs, ... }: { pkgs, inputs, ... }:
{ {
programs.nixvim = { programs.nixvim = {
@@ -57,7 +57,7 @@
servers.pyright.enable = true; servers.pyright.enable = true;
servers.ruff.enable = true; servers.ruff.enable = true;
keymaps.lspBuf = { keymaps.lspBuf = {
"<leader>K" = "hover"; "<leader>K" = "hover";
"<leader>gd" = "definition"; "<leader>gd" = "definition";
"<leader>gr" = "references"; "<leader>gr" = "references";
"<leader>f" = "format"; "<leader>f" = "format";
@@ -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" ];
+26 -8
View File
@@ -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/ # 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
settings = { settings = {
# theme / colors # theme / colors
theme = { theme = {
@@ -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
+6 -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
+3 -3
View File
@@ -1,4 +1,4 @@
{ config, pkgs, inputs, ... }: { pkgs, ... }:
{ {
# set gtk theme # set gtk theme
@@ -6,8 +6,8 @@
enable = true; enable = true;
theme = { theme = {
name = "Adwaita-dark"; name = "Adwaita-dark";
package = pkgs.gnome-themes-extra; package = pkgs.gnome-themes-extra;
}; };
gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
gtk4.theme = null; gtk4.theme = null;
gtk4.extraConfig.gtk-application-prefer-dark-theme = 1; gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;
-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
+31 -26
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
@@ -36,30 +36,35 @@ let
wrapProgram $out/bin/siril \ wrapProgram $out/bin/siril \
--prefix PATH : /etc/siril/bin \ --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 : ${
stdenv.cc.cc.lib # libstdc++ / libgcc_s / libgomp (numpy etc.) lib.makeLibraryPath (
zlib with pkgs;
zstd # libzstd.so.1 (PyQt6) [
libGL # libGL.so.1 (PyQt6) stdenv.cc.cc.lib # libstdc++ / libgcc_s / libgomp (numpy etc.)
# PyQt6 (VeraLux) — Qt bundles xcb support so it needs these even zlib
# on Wayland; libxkbcommon is the keymap lib used by Wayland too. zstd # libzstd.so.1 (PyQt6)
glib libGL # libGL.so.1 (PyQt6)
fontconfig # PyQt6 (VeraLux) — Qt bundles xcb support so it needs these even
freetype # on Wayland; libxkbcommon is the keymap lib used by Wayland too.
dbus glib
libxkbcommon fontconfig
# Qt platform plugins: the wayland plugin (libqwayland.so) needs the freetype
# wayland client libs; the xcb fallback needs libxcb-cursor.so.0. dbus
wayland # libwayland-client/cursor/egl (wayland plugin) libxkbcommon
libxcb-cursor # libxcb-cursor.so.0 (xcb plugin) # Qt platform plugins: the wayland plugin (libqwayland.so) needs the
libx11 # wayland client libs; the xcb fallback needs libxcb-cursor.so.0.
libxcb wayland # libwayland-client/cursor/egl (wayland plugin)
libxcb-util libxcb-cursor # libxcb-cursor.so.0 (xcb plugin)
libxcb-wm libx11
libxcb-image libxcb
libxcb-keysyms libxcb-util
libxcb-render-util libxcb-wm
])} libxcb-image
libxcb-keysyms
libxcb-render-util
]
)
}
''; '';
}; };
in in
@@ -84,7 +89,7 @@ in
# run it. Its own opencv/onnxruntime libs are found via the bundled ./lib. # run it. Its own opencv/onnxruntime libs are found via the bundled ./lib.
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [ programs.nix-ld.libraries = with pkgs; [
stdenv.cc.cc.lib # libstdc++ / libgcc_s stdenv.cc.cc.lib # libstdc++ / libgcc_s
zlib zlib
]; ];
} }
+2 -4
View File
@@ -1,9 +1,7 @@
{ config, lib, pkgs, ... }:
{ {
# enable sound through pipewire # enable sound through pipewire
services.pipewire = { services.pipewire = {
enable = true; enable = true;
pulse.enable = true; pulse.enable = true;
}; };
} }
+6 -3
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# set bootloader to systemd # set bootloader to systemd
@@ -9,7 +9,7 @@
# enable systemd initrd # enable systemd initrd
boot.initrd.systemd.enable = true; boot.initrd.systemd.enable = true;
# plymouth # plymouth
boot.plymouth = { boot.plymouth = {
enable = true; enable = true;
@@ -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
{ {
+1 -1
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { config, pkgs, ... }:
{ {
# enable gnupg agent # enable gnupg agent
+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
+2 -2
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# enable amd GPU acceleration (mesa, vulkan, egl) # enable amd GPU acceleration (mesa, vulkan, egl)
@@ -11,7 +11,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
amdgpu_top amdgpu_top
]; ];
# add amdgpu to the initrd for plymouth # add amdgpu to the initrd for plymouth
hardware.amdgpu.initrd.enable = true; hardware.amdgpu.initrd.enable = true;
} }
+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";
+2 -2
View File
@@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }: { pkgs, ... }:
{ {
# user networkmanager # user networkmanager
@@ -13,7 +13,7 @@
# enable bluetooth # enable bluetooth
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
# Add network-related packages # Add network-related packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wireguard-tools wireguard-tools
+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 = {
+12 -8
View File
@@ -1,17 +1,18 @@
{ 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
max-jobs = "auto"; max-jobs = "auto";
# use all available cores per job # use all available cores per job
cores = 0; cores = 0;
# add trusted substituters (binary caches) # add trusted substituters (binary caches)
substituters = [ substituters = [
"https://cache.nixos.org" "https://cache.nixos.org"
@@ -23,7 +24,7 @@
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
]; ];
}; };
# enable automatic garbage collection # enable automatic garbage collection
gc = { gc = {
automatic = true; automatic = true;
@@ -31,9 +32,12 @@
options = "--delete-older-than 7d"; options = "--delete-older-than 7d";
}; };
}; };
# 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