Compare commits
18
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6a080b2319
|
||
|
|
3e0e1d48f9 | ||
|
|
3fed9c1fc8
|
||
|
|
87eb1bcb72
|
||
|
|
06b656477b
|
||
|
|
8d19be9527
|
||
|
|
1abb1ca6a1
|
||
|
|
4633687ccb
|
||
|
|
99a910265f | ||
|
|
5abbcb10ca
|
||
|
|
ea2682f31d
|
||
|
|
73e17de1a1 | ||
|
|
26473288b6
|
||
|
|
2231d2fc3f
|
||
|
|
4ec579b1fc
|
||
|
|
c1d11138b3 | ||
|
|
92b170e5e8
|
||
|
|
3d90a9759f |
@@ -0,0 +1,2 @@
|
|||||||
|
# nixfmt reformat
|
||||||
|
2231d2fc3fb4dc140c5f3257523dcdb513ac4dea
|
||||||
@@ -8,3 +8,7 @@ result-*
|
|||||||
|
|
||||||
# vim
|
# vim
|
||||||
*.swp
|
*.swp
|
||||||
|
|
||||||
|
# devenv
|
||||||
|
.devenv*
|
||||||
|
devenv.local.nix
|
||||||
|
|||||||
@@ -6,20 +6,20 @@ My personal NixOS configurations.
|
|||||||
|
|
||||||
```bash
|
```bash
|
||||||
.
|
.
|
||||||
├── flake.lock
|
├── flake.nix # hosts and home-manager wiring
|
||||||
├── flake.nix # flake definition
|
|
||||||
├── hosts
|
├── hosts
|
||||||
│ └── neon
|
│ ├── argon # desktop
|
||||||
│ ├── configuration.nix # import nix-modules for specific host
|
│ ├── neon # laptop
|
||||||
│ └── hardware-configuration.nix # hardware configs for specific host
|
│ └── default # test vm
|
||||||
|
│ ├── configuration.nix # host-specific settings and module imports
|
||||||
|
│ ├── hardware-configuration.nix # generated by nixos-generate-config
|
||||||
|
│ └── niri.nix # host-specific niri settings (outputs, input)
|
||||||
├── modules
|
├── modules
|
||||||
│ ├── home-manager
|
│ ├── home-manager # user modules, imported by users/aaron/home.nix
|
||||||
│ │ ├── xyz_module.nix
|
│ └── nixos # system modules, imported by the hosts
|
||||||
│ └── nixos
|
|
||||||
│ └── xyz_module.nix
|
|
||||||
└── users
|
└── users
|
||||||
└── aaron
|
└── aaron
|
||||||
└── home.nix # import home-manager modules for specific user
|
└── home.nix # imports home-manager modules
|
||||||
```
|
```
|
||||||
|
|
||||||
## installation
|
## installation
|
||||||
|
|||||||
+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
+12
-12
@@ -28,11 +28,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790365885,
|
"lastModified": 1790819692,
|
||||||
"narHash": "sha256-iQ0ebhiVo64NktTnwft9hNxlFu4j5cvljVxyJaEVIP4=",
|
"narHash": "sha256-rvubAPbh3QCliic3sAK+CXTrPCGgJstY52OTs/5H1J4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "7b4c5ec4bedaf1e062bbc1bcaeddbc6bd242aa1b",
|
"rev": "c8ecc29e5175452bee4a2aa1ba2383856d795338",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -43,11 +43,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790323409,
|
"lastModified": 1790689126,
|
||||||
"narHash": "sha256-VVTPf+Hyd5ebpjBMHmrLMSBIeW6ls48Bqtosj7CNKLA=",
|
"narHash": "sha256-ilerN1WLSvF+HMjziC/Wv99J5y02maDH+6hZPwsORKg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e94cb152ed51bd6e24eb4a41f1460252beb52cd2",
|
"rev": "b4fd65b198c599cbe814fcb9f42d25d021595ec9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -66,11 +66,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790359697,
|
"lastModified": 1790541651,
|
||||||
"narHash": "sha256-AIMlxsdXEAiv7KQQ/fcarzqe541iUrT+hCUVS71CrJI=",
|
"narHash": "sha256-/496IQz8qNWHHLnc3Zvr0l4uxJ34igNhJhn7ZKAefFk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "4571c7a95787165cc7102d417a0fe4519bf6a995",
|
"rev": "5980a626794486abad69fca7667f9c11dfbc3bd7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -86,11 +86,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1790432627,
|
"lastModified": 1790718664,
|
||||||
"narHash": "sha256-iegtG9qBQ3PwY9imebhurqwB61t0Ow0c5BovD8+3WpQ=",
|
"narHash": "sha256-LWil4xgSyqIFZ9sydvL1glFOoiqAOknWUwykC4sqxuY=",
|
||||||
"owner": "noctalia-dev",
|
"owner": "noctalia-dev",
|
||||||
"repo": "noctalia-shell",
|
"repo": "noctalia-shell",
|
||||||
"rev": "94712e922116d74381bc67bfc92df70cf4dc76b5",
|
"rev": "fd9759c892fe5034b682c185695f1bee121cd5b3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -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 = [
|
||||||
@@ -27,6 +35,9 @@
|
|||||||
./hosts/${hostName}/configuration.nix
|
./hosts/${hostName}/configuration.nix
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
|
home-manager.useGlobalPkgs = true;
|
||||||
|
home-manager.useUserPackages = true;
|
||||||
|
home-manager.backupCommand = "mv -f {file} {file}.hm-bak-$(date +%Y%m%d%H%M%S)";
|
||||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||||
home-manager.users.aaron.imports = [
|
home-manager.users.aaron.imports = [
|
||||||
nixvim.homeModules.nixvim
|
nixvim.homeModules.nixvim
|
||||||
@@ -35,7 +46,8 @@
|
|||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
default = mkHost "default";
|
default = mkHost "default";
|
||||||
neon = mkHost "neon";
|
neon = mkHost "neon";
|
||||||
|
|||||||
@@ -1,18 +1,25 @@
|
|||||||
{ config, pkgs, inputs, ... }:
|
# argon: desktop with an amd gpu and three luks-encrypted data drives.
|
||||||
|
# The drives are unlocked in the initrd with keyfiles from /etc/nixos/keys.
|
||||||
|
|
||||||
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
# luks name -> partition uuid, mounted at /mnt/<name>
|
||||||
|
drives = {
|
||||||
|
data1 = "dfae62cc-bad1-4879-bf9a-461bde833625";
|
||||||
|
data2 = "8312edae-9247-481b-a313-52a7f848f027";
|
||||||
|
nvmecache = "2352250e-4ebe-4f9a-bf66-0d4aaa961bd8";
|
||||||
|
};
|
||||||
|
key = name: "/etc/nixos/keys/${name}.key";
|
||||||
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../modules/nixos/appimage.nix
|
../../modules/nixos/appimage.nix
|
||||||
../../modules/nixos/astro.nix
|
../../modules/nixos/astro.nix
|
||||||
../../modules/nixos/audio.nix
|
../../modules/nixos/audio.nix
|
||||||
../../modules/nixos/bootloader.nix
|
../../modules/nixos/bootloader.nix
|
||||||
../../modules/nixos/calibre.nix
|
|
||||||
../../modules/nixos/certificates.nix
|
../../modules/nixos/certificates.nix
|
||||||
../../modules/nixos/claudecode.nix
|
|
||||||
../../modules/nixos/drives.nix
|
|
||||||
../../modules/nixos/gnupg.nix
|
../../modules/nixos/gnupg.nix
|
||||||
../../modules/nixos/gnuradio.nix
|
|
||||||
../../modules/nixos/graphics.nix
|
|
||||||
../../modules/nixos/greetd.nix
|
../../modules/nixos/greetd.nix
|
||||||
../../modules/nixos/locales.nix
|
../../modules/nixos/locales.nix
|
||||||
../../modules/nixos/networking.nix
|
../../modules/nixos/networking.nix
|
||||||
@@ -29,10 +36,36 @@
|
|||||||
../../modules/nixos/vial.nix
|
../../modules/nixos/vial.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# set hostname
|
# host-specific niri config (outputs, input devices)
|
||||||
|
home-manager.users.aaron.imports = [ ./niri.nix ];
|
||||||
|
|
||||||
|
# amd gpu: mesa/vulkan, and amdgpu in the initrd for plymouth
|
||||||
|
hardware.graphics = {
|
||||||
|
enable = true;
|
||||||
|
enable32Bit = true;
|
||||||
|
};
|
||||||
|
hardware.amdgpu.initrd.enable = true;
|
||||||
|
|
||||||
|
# encrypted data drives
|
||||||
|
boot.initrd.secrets = lib.mapAttrs' (name: _: lib.nameValuePair (key name) (key name)) drives;
|
||||||
|
boot.initrd.luks.devices = lib.mapAttrs (name: uuid: {
|
||||||
|
device = "/dev/disk/by-uuid/${uuid}";
|
||||||
|
keyFile = key name;
|
||||||
|
}) drives;
|
||||||
|
fileSystems = lib.mapAttrs' (
|
||||||
|
name: _:
|
||||||
|
lib.nameValuePair "/mnt/${name}" {
|
||||||
|
device = "/dev/mapper/${name}";
|
||||||
|
fsType = "ext4";
|
||||||
|
options = [ "nofail" ];
|
||||||
|
}
|
||||||
|
) drives;
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
amdgpu_top
|
||||||
|
calibre # ebook management and kobo syncing
|
||||||
|
];
|
||||||
|
|
||||||
networking.hostName = "argon";
|
networking.hostName = "argon";
|
||||||
|
system.stateVersion = "25.11"; # don't change
|
||||||
# install state version
|
|
||||||
system.stateVersion = "25.11"; # Don't change
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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";
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
# 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
|
# 0x29a nixos config
|
||||||
|
|
||||||
{ 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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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";
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
{ config, pkgs, inputs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../../modules/nixos/appimage.nix
|
../../modules/nixos/appimage.nix
|
||||||
@@ -7,7 +5,6 @@
|
|||||||
../../modules/nixos/audio.nix
|
../../modules/nixos/audio.nix
|
||||||
../../modules/nixos/bootloader.nix
|
../../modules/nixos/bootloader.nix
|
||||||
../../modules/nixos/certificates.nix
|
../../modules/nixos/certificates.nix
|
||||||
../../modules/nixos/claudecode.nix
|
|
||||||
../../modules/nixos/docker.nix
|
../../modules/nixos/docker.nix
|
||||||
../../modules/nixos/gnupg.nix
|
../../modules/nixos/gnupg.nix
|
||||||
../../modules/nixos/locales.nix
|
../../modules/nixos/locales.nix
|
||||||
@@ -25,10 +22,9 @@
|
|||||||
../../modules/nixos/vial.nix
|
../../modules/nixos/vial.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# set hostname
|
# host-specific niri config (input devices, laptop binds)
|
||||||
|
home-manager.users.aaron.imports = [ ./niri.nix ];
|
||||||
|
|
||||||
networking.hostName = "neon";
|
networking.hostName = "neon";
|
||||||
|
system.stateVersion = "25.11"; # don't change
|
||||||
# install state version
|
|
||||||
system.stateVersion = "25.11"; # Don't change
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -0,0 +1,24 @@
|
|||||||
|
# neon: laptop, the built-in display is auto-configured by niri
|
||||||
|
|
||||||
|
{ lib, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
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
|
||||||
|
"XF86MonBrightnessUp".spawn-sh = lib.mkForce "brightnessctl --class=backlight set +1%";
|
||||||
|
"XF86MonBrightnessDown".spawn-sh = lib.mkForce "brightnessctl --class=backlight set 1%-";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, inputs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# user fonts
|
# user fonts
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
{ config, pkgs, inputs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.ghostty = {
|
programs.ghostty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -1,36 +1,39 @@
|
|||||||
{ config, lib, pkgs, inputs, ... }:
|
# Commits are signed with each machine's ~/.ssh/id_ed25519 through the ssh
|
||||||
|
# agent. gitea verifies them against the account keys; allowed_signers gives
|
||||||
|
# the local git the same trust, so `git log --show-signature` resolves too.
|
||||||
|
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
email = "aaron@0x29a.ch";
|
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 = [
|
signingKeys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHRhwzo1oxaT3fEySSmILKNnu9v30cfjx5G7FKpmfqeX aaron@argon"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHRhwzo1oxaT3fEySSmILKNnu9v30cfjx5G7FKpmfqeX aaron@argon"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDkhvvTUcBSQdtXjX+Mw2Bp8HHhtiBm8aJi4ZxiBgZR aaron@neon"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGDkhvvTUcBSQdtXjX+Mw2Bp8HHhtiBm8aJi4ZxiBgZR aaron@neon"
|
||||||
];
|
];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# gitea verifies signatures against the account keys, this teaches the local
|
xdg.configFile."git/allowed_signers".text = lib.concatMapStrings (
|
||||||
# git the same trust so `git log --show-signature` resolves as well
|
key: "${email} ${key}\n"
|
||||||
xdg.configFile."git/allowed_signers".text =
|
) signingKeys;
|
||||||
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 = email;
|
inherit email;
|
||||||
};
|
};
|
||||||
gpg.ssh.allowedSignersFile = "${config.xdg.configHome}/git/allowed_signers";
|
gpg.ssh.allowedSignersFile = "${config.xdg.configHome}/git/allowed_signers";
|
||||||
};
|
};
|
||||||
signing = {
|
signing = {
|
||||||
format = "ssh";
|
format = "ssh";
|
||||||
# point at the *public* key so ssh-keygen signs through the ssh agent
|
# the public key makes ssh-keygen sign through the agent
|
||||||
# instead of reading the passphrase protected private key from disk
|
|
||||||
key = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
|
key = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
|
||||||
signer = "${pkgs.openssh}/bin/ssh-keygen";
|
signer = "${pkgs.openssh}/bin/ssh-keygen";
|
||||||
signByDefault = true;
|
signByDefault = true;
|
||||||
|
|||||||
@@ -0,0 +1,270 @@
|
|||||||
|
# Only renders ~/.config/niri/config.kdl; niri itself, its session and portals
|
||||||
|
# come from modules/nixos/niri.nix. Outputs and input devices that differ
|
||||||
|
# per machine live in hosts/<host>/niri.nix.
|
||||||
|
|
||||||
|
{ 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)
|
||||||
|
);
|
||||||
|
|
||||||
|
# shell command that also works on the lock screen
|
||||||
|
lockedSh = cmd: {
|
||||||
|
_props.allow-when-locked = true;
|
||||||
|
spawn-sh = cmd;
|
||||||
|
};
|
||||||
|
in
|
||||||
|
{
|
||||||
|
wayland.windowManager.niri = {
|
||||||
|
# only on hosts that run niri
|
||||||
|
enable = osConfig.programs.niri.enable;
|
||||||
|
|
||||||
|
# validate the config against the installed niri
|
||||||
|
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-sh = "noctalia msg panel-toggle launcher";
|
||||||
|
};
|
||||||
|
"Super+Alt+L" = {
|
||||||
|
_props.hotkey-overlay-title = "Lock the Screen";
|
||||||
|
spawn-sh = "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" = lockedSh "brightnessctl --class=backlight set +10%";
|
||||||
|
"XF86MonBrightnessDown" = lockedSh "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,13 +1,10 @@
|
|||||||
{ config, pkgs, inputs, ... }:
|
{ pkgs, inputs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.nixvim = {
|
programs.nixvim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
# We keep `inputs.nixvim.inputs.nixpkgs.follows = "nixpkgs"` in flake.nix so
|
# same nixpkgs as the flake's `follows`, silences nixvim's pin warning
|
||||||
# the whole config shares a single nixpkgs. Setting `source` explicitly to
|
|
||||||
# that same nixpkgs acknowledges the override and silences nixvim's warning
|
|
||||||
# about its pinned nixpkgs being bypassed.
|
|
||||||
nixpkgs.source = inputs.nixpkgs;
|
nixpkgs.source = inputs.nixpkgs;
|
||||||
|
|
||||||
# set aliases
|
# set aliases
|
||||||
@@ -67,7 +64,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 +88,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" ];
|
||||||
@@ -96,8 +101,6 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# install dependencies
|
# telescope live_grep
|
||||||
home.packages = with pkgs; [
|
home.packages = [ pkgs.ripgrep ];
|
||||||
ripgrep
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -23,15 +24,18 @@
|
|||||||
|
|
||||||
# general
|
# general
|
||||||
shell = {
|
shell = {
|
||||||
font_family = "0xProto Nerd Font Mono";
|
font_family = "0xProto Nerd Font";
|
||||||
ui_scale = 1.2;
|
|
||||||
avatar_path = "/home/aaron/syncthing/pictures/Logo-Aaron-Totenkopf-rund-schwarz.png";
|
avatar_path = "/home/aaron/syncthing/pictures/Logo-Aaron-Totenkopf-rund-schwarz.png";
|
||||||
telemetry_enabled = false;
|
telemetry_enabled = false;
|
||||||
clipboard_enabled = true;
|
clipboard_enabled = true;
|
||||||
password_style = "random";
|
password_style = "random";
|
||||||
|
|
||||||
|
launcher = {
|
||||||
|
categories = false;
|
||||||
|
providers.emoji.global = false;
|
||||||
|
};
|
||||||
|
|
||||||
panel = {
|
panel = {
|
||||||
launcher_compact = true;
|
|
||||||
open_near_click_control_center = true;
|
open_near_click_control_center = true;
|
||||||
open_near_click_session = true;
|
open_near_click_session = true;
|
||||||
open_near_click_wallpaper = true;
|
open_near_click_wallpaper = true;
|
||||||
@@ -72,9 +76,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"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -83,7 +100,7 @@
|
|||||||
bluetooth.capsule = true;
|
bluetooth.capsule = true;
|
||||||
control-center = {
|
control-center = {
|
||||||
capsule_radius = 8;
|
capsule_radius = 8;
|
||||||
custom_image = "/home/aaron/Pictures/nix_flake_logo.png";
|
custom_image = "/home/aaron/syncthing/pictures/nix_flake_logo.png";
|
||||||
scale = 1.4;
|
scale = 1.4;
|
||||||
};
|
};
|
||||||
cpu.capsule = true;
|
cpu.capsule = true;
|
||||||
@@ -102,17 +119,25 @@
|
|||||||
|
|
||||||
# idle behavior
|
# idle behavior
|
||||||
idle = {
|
idle = {
|
||||||
behavior_order = [ "screen-off" "lock" "lock-and-suspend" ];
|
pre_action_fade_seconds = 5;
|
||||||
|
behavior_order = [
|
||||||
|
"screen-off"
|
||||||
|
"lock"
|
||||||
|
"lock-and-suspend"
|
||||||
|
];
|
||||||
behavior = {
|
behavior = {
|
||||||
"screen-off" = {
|
"screen-off" = {
|
||||||
|
action = "screen_off";
|
||||||
|
enabled = true;
|
||||||
|
timeout = 300;
|
||||||
|
};
|
||||||
|
"lock" = {
|
||||||
|
action = "lock";
|
||||||
enabled = true;
|
enabled = true;
|
||||||
timeout = 600;
|
timeout = 600;
|
||||||
};
|
};
|
||||||
"lock" = {
|
|
||||||
enabled = true;
|
|
||||||
timeout = 660;
|
|
||||||
};
|
|
||||||
"lock-and-suspend" = {
|
"lock-and-suspend" = {
|
||||||
|
action = "lock_and_suspend";
|
||||||
enabled = true;
|
enabled = true;
|
||||||
timeout = 1800;
|
timeout = 1800;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, inputs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# user packages
|
# user packages
|
||||||
|
|||||||
@@ -1,21 +1,26 @@
|
|||||||
{ config, lib, pkgs, inputs, ... }:
|
# zsh with oh-my-zsh: agnoster where glyphs render, gentoo on the console.
|
||||||
|
# Deep paths are shortened to `…/last/two` so the prompt stays on one line:
|
||||||
|
# `%(4~|…/%2~|%~)` shows the last two components from four levels down.
|
||||||
|
|
||||||
|
{ lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# configure z-shell to use omz with some plugins
|
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
autosuggestion.enable = true;
|
autosuggestion.enable = true;
|
||||||
syntaxHighlighting.enable = true;
|
syntaxHighlighting.enable = true;
|
||||||
oh-my-zsh = {
|
oh-my-zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# add git and agents as plugins
|
plugins = [
|
||||||
plugins = [ "git" "ssh-agent" "gpg-agent" ];
|
"git"
|
||||||
# everything here lands before `source $ZSH/oh-my-zsh.sh`
|
"ssh-agent"
|
||||||
|
"gpg-agent"
|
||||||
|
];
|
||||||
|
# runs before oh-my-zsh is sourced
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
# make omz faster on large repositories
|
# faster git status on large repositories
|
||||||
DISABLE_UNTRACKED_FILES_DIRTY=true
|
DISABLE_UNTRACKED_FILES_DIRTY=true
|
||||||
|
|
||||||
# only display a fancy theme when glyphs are rendered
|
|
||||||
if [[ "$TERM" == "linux" || "$TERM" == "screen" ]]; then
|
if [[ "$TERM" == "linux" || "$TERM" == "screen" ]]; then
|
||||||
ZSH_THEME="gentoo"
|
ZSH_THEME="gentoo"
|
||||||
else
|
else
|
||||||
@@ -24,37 +29,20 @@
|
|||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
# Unlike oh-my-zsh.extraConfig above, this lands *after*
|
# runs after oh-my-zsh, once the theme's prompt exists
|
||||||
# `source $ZSH/oh-my-zsh.sh`, which is where the theme's prompt functions
|
|
||||||
# come into existence.
|
|
||||||
initContent = lib.mkAfter ''
|
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
|
if [[ "$ZSH_THEME" == "agnoster" ]]; then
|
||||||
# agnoster calls prompt_dir on every render, so redefining it is
|
# agnoster renders prompt_dir on every prompt, so override it
|
||||||
# enough. AGNOSTER_DIR_* keep the segment's own colours.
|
|
||||||
prompt_dir() {
|
prompt_dir() {
|
||||||
prompt_segment "$AGNOSTER_DIR_BG" "$AGNOSTER_DIR_FG" '%(4~|…/%2~|%~)'
|
prompt_segment "$AGNOSTER_DIR_BG" "$AGNOSTER_DIR_FG" '%(4~|…/%2~|%~)'
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
# gentoo builds PROMPT once at load time, so patch the string. Its
|
# gentoo builds PROMPT once; ascii dots, the console font lacks …
|
||||||
# `%~` 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~|%~)}"
|
PROMPT="''${PROMPT/\%~/%(4~|.../%2~|%~)}"
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
# set important env vars
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
EDITOR = "vim";
|
EDITOR = "vim";
|
||||||
NH_FLAKE = "/home/aaron/git/nixconfig";
|
NH_FLAKE = "/home/aaron/git/nixconfig";
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
{ config, pkgs, inputs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# set gtk theme
|
|
||||||
gtk = {
|
gtk = {
|
||||||
enable = true;
|
enable = true;
|
||||||
theme = {
|
theme = {
|
||||||
@@ -13,7 +12,6 @@
|
|||||||
gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;
|
gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;
|
||||||
};
|
};
|
||||||
|
|
||||||
# set qt theme
|
|
||||||
qt = {
|
qt = {
|
||||||
enable = true;
|
enable = true;
|
||||||
platformTheme.name = "qt6";
|
platformTheme.name = "qt6";
|
||||||
@@ -22,10 +20,4 @@
|
|||||||
package = pkgs.adwaita-qt;
|
package = pkgs.adwaita-qt;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# ensure packages are installed
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
gnome-themes-extra
|
|
||||||
adwaita-qt
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,56 +1,37 @@
|
|||||||
{ config, pkgs, inputs, ... }:
|
# Nord-style status line built natively, no theme plugin.
|
||||||
|
# The powerline separators (U+E0B0..U+E0B3) are written as escapes via
|
||||||
|
# fromJSON: literal private-use glyphs get stripped silently on copy/paste.
|
||||||
|
# Commas inside #{?...} separate arguments, hence the escaped `#,` below.
|
||||||
|
|
||||||
let
|
let
|
||||||
# Powerline separators, U+E0B0..U+E0B3.
|
|
||||||
#
|
|
||||||
# Written as escapes rather than literal glyphs. These are Private Use Area
|
|
||||||
# codepoints: they render only with a patched font, they survive copy/paste
|
|
||||||
# badly, and when they get stripped the loss is invisible, the config still
|
|
||||||
# parses, the status bar just quietly loses its separators. Nix has no \u
|
|
||||||
# escape of its own, but fromJSON does.
|
|
||||||
sep = builtins.fromJSON ''
|
sep = builtins.fromJSON ''
|
||||||
{
|
{
|
||||||
"right": "\ue0b0",
|
"right": "",
|
||||||
"rightThin": "\ue0b1",
|
"rightThin": "",
|
||||||
"left": "\ue0b2",
|
"left": "",
|
||||||
"leftThin": "\ue0b3"
|
"leftThin": ""
|
||||||
}
|
}
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
# defaults
|
|
||||||
enable = true;
|
enable = true;
|
||||||
prefix = "C-a";
|
prefix = "C-a";
|
||||||
keyMode = "vi";
|
keyMode = "vi";
|
||||||
mouse = true;
|
mouse = true;
|
||||||
|
terminal = "tmux-256color"; # truecolor, italics and undercurl in nvim
|
||||||
# tmux-256color gives truecolor, italics and undercurl in nvim.
|
escapeTime = 10; # the 500ms default lags leaving insert mode in nvim
|
||||||
terminal = "tmux-256color";
|
focusEvents = true; # nvim autoread
|
||||||
|
|
||||||
# Default is 500ms. Causes lag you feel when leaving insert mode in nvim,
|
|
||||||
# because tmux is waiting to see whether Esc starts an escape sequence.
|
|
||||||
escapeTime = 10;
|
|
||||||
|
|
||||||
# nvim autoread / :checktime react to focus.
|
|
||||||
focusEvents = true;
|
|
||||||
|
|
||||||
# History limit.
|
|
||||||
historyLimit = 50000;
|
historyLimit = 50000;
|
||||||
|
baseIndex = 1; # window numbers match the number row
|
||||||
# Window numbers matching the number row.
|
|
||||||
baseIndex = 1;
|
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
# Status keys
|
|
||||||
set -g status-keys vi
|
set -g status-keys vi
|
||||||
|
|
||||||
# Tell tmux the outer terminal can do 24-bit colour (tmux >= 3.2).
|
# outer terminal does 24-bit colour
|
||||||
set -sa terminal-features ",*:RGB"
|
set -sa terminal-features ",*:RGB"
|
||||||
|
|
||||||
# Shift+Enter / extended keys
|
# forward Shift+Enter and other extended keys as CSI-u (tmux >= 3.5)
|
||||||
# These make tmux forward CSI-u sequences unconditionally.
|
|
||||||
# Needs tmux >= 3.5 for the format option,
|
|
||||||
set -s extended-keys always
|
set -s extended-keys always
|
||||||
set -s extended-keys-format csi-u
|
set -s extended-keys-format csi-u
|
||||||
set -as terminal-features '*:extkeys'
|
set -as terminal-features '*:extkeys'
|
||||||
@@ -90,27 +71,18 @@ in
|
|||||||
bind -r K resize-pane -U 5
|
bind -r K resize-pane -U 5
|
||||||
bind -r L resize-pane -R 5
|
bind -r L resize-pane -R 5
|
||||||
|
|
||||||
# Wayland clipboard integration
|
# copy to both the clipboard and primary selection
|
||||||
# Copy selection to both clipboard (Ctrl+V / Shift+Insert) and primary (middle-click)
|
|
||||||
bind -T copy-mode-vi v send-keys -X begin-selection
|
bind -T copy-mode-vi v send-keys -X begin-selection
|
||||||
bind -T copy-mode-vi C-v send-keys -X rectangle-toggle
|
bind -T copy-mode-vi C-v send-keys -X rectangle-toggle
|
||||||
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
|
bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
|
||||||
bind -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
|
bind -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
|
||||||
bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
|
bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "wl-copy && wl-copy --primary"
|
||||||
# Uncomment if you want yanks to also travel over SSH via OSC52.
|
|
||||||
# Locally redundant with wl-copy above.
|
|
||||||
#set -g set-clipboard on
|
|
||||||
|
|
||||||
# Kill commands
|
# Kill commands
|
||||||
bind q confirm-before -p "kill window #W? (y/n)" kill-window
|
bind q confirm-before -p "kill window #W? (y/n)" kill-window
|
||||||
bind Q confirm-before -p "kill session #S? (y/n)" kill-session
|
bind Q confirm-before -p "kill session #S? (y/n)" kill-session
|
||||||
|
|
||||||
# Bars
|
# Bars
|
||||||
# This is the nord-tmux status line. #{prefix_highlight} came from that
|
|
||||||
# theme's tmux-prefix-highlight integration -- a plugin you never loaded,
|
|
||||||
# so the token expanded to nothing. tmux can do it natively. Commas inside
|
|
||||||
# #{?...} are argument separators and have to be escaped as #, hence the
|
|
||||||
# look of the style spec.
|
|
||||||
set -g status-left-length 24
|
set -g status-left-length 24
|
||||||
set -g status-left "#[fg=black,bg=blue,bold] #{=20:session_name} #[fg=blue,bg=black,nobold,noitalics,nounderscore]${sep.right}"
|
set -g status-left "#[fg=black,bg=blue,bold] #{=20:session_name} #[fg=blue,bg=black,nobold,noitalics,nounderscore]${sep.right}"
|
||||||
set -g status-right "#{?client_prefix,#[fg=black#,bg=yellow#,bold] ^A ,}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]${sep.left}#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]${sep.leftThin}#[fg=white,bg=brightblack] %H:%M #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]${sep.left}#[fg=black,bg=cyan,bold] #H "
|
set -g status-right "#{?client_prefix,#[fg=black#,bg=yellow#,bold] ^A ,}#[fg=brightblack,bg=black,nobold,noitalics,nounderscore]${sep.left}#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]${sep.leftThin}#[fg=white,bg=brightblack] %H:%M #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore]${sep.left}#[fg=black,bg=cyan,bold] #H "
|
||||||
|
|||||||
@@ -1,19 +1,10 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
# Running an AppImage directly fails on NixOS: its runtime dlopens
|
||||||
|
# libfuse.so.2, which nix-ld doesn't cover. appimage-run unpacks the image
|
||||||
|
# into an FHS sandbox instead. Used for the BitBox02 wallet from bitbox.swiss.
|
||||||
|
|
||||||
{
|
{
|
||||||
# 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
|
|
||||||
# dlopen, so running one directly dies with "dlopen(): error loading
|
|
||||||
# libfuse.so.2". appimage-run sidesteps the mount entirely: it unpacks the
|
|
||||||
# image and runs the payload inside an FHS sandbox, which the bundled Qt and
|
|
||||||
# electron style binaries need anyway.
|
|
||||||
#
|
|
||||||
# Used for the BitBox02 wallet AppImage, downloaded fresh from
|
|
||||||
# https://bitbox.swiss/download/ rather than installed from nixpkgs.
|
|
||||||
programs.appimage = {
|
programs.appimage = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# register AppImages with binfmt_misc so ./Something.AppImage runs as-is,
|
binfmt = true; # ./Something.AppImage runs without the appimage-run prefix
|
||||||
# no appimage-run prefix to remember.
|
|
||||||
binfmt = true;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+37
-55
@@ -1,57 +1,44 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
# Stellarium for target finding, Siril for stacking.
|
||||||
|
#
|
||||||
|
# Siril's python plugins run in a venv of foreign manylinux wheels (numpy,
|
||||||
|
# PyQt6, ...), dlopened by nixpkgs python, so nix-ld doesn't help. The wrapper
|
||||||
|
# puts their libs on LD_LIBRARY_PATH, a python on PATH to bootstrap the venv,
|
||||||
|
# and adwaita-qt6 on QT_PLUGIN_PATH so the dark style override resolves.
|
||||||
|
# The python comes from /etc/siril/bin, a stable symlink: a /nix/store path
|
||||||
|
# would leave the venv dangling after the next python bump and gc.
|
||||||
|
#
|
||||||
|
# StarNet++ has no package: unzip the v2 ORT cli build from starnetastro.com
|
||||||
|
# to ~/.local/share/siril/starnet/ and point Siril's preferences at ./starnet2.
|
||||||
|
# It runs through nix-ld and finds its own libs in the bundled ./lib.
|
||||||
|
|
||||||
|
{ lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
# Siril's Python plugins (sirilpy) run in a venv that pip-installs foreign
|
|
||||||
# manylinux wheels (numpy, GraXpert deps, ...). Those .so files need
|
|
||||||
# libstdc++ at runtime. nix-ld does NOT cover this: it only handles the
|
|
||||||
# initial exec of a foreign binary, but here a *native* nixpkgs python
|
|
||||||
# dlopen()s the foreign wheel. So we put the libs on LD_LIBRARY_PATH, which
|
|
||||||
# the python subprocess inherits from the Siril process.
|
|
||||||
sirilWithPlugins = pkgs.symlinkJoin {
|
sirilWithPlugins = pkgs.symlinkJoin {
|
||||||
name = "siril-with-plugins";
|
name = "siril-with-plugins";
|
||||||
paths = [ pkgs.siril ];
|
paths = [ pkgs.siril ];
|
||||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||||
# Siril bootstraps its sirilpy venv at first run by locating a `python3`
|
|
||||||
# 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 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
|
|
||||||
# rejected ("invalid style override") and windows fall back to a light
|
|
||||||
# theme. We expose nixpkgs adwaita-qt6's style plugin on QT_PLUGIN_PATH so
|
|
||||||
# the override resolves. This works because nixpkgs qt6 and the bundled Qt
|
|
||||||
# share a major.minor (6.11); if they ever drift the plugin is simply
|
|
||||||
# ignored again (harmless warning + Fusion fallback, no loss of function).
|
|
||||||
postBuild = ''
|
postBuild = ''
|
||||||
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 (
|
||||||
|
with pkgs;
|
||||||
|
[
|
||||||
|
stdenv.cc.cc.lib # libstdc++, libgcc_s, libgomp (numpy)
|
||||||
zlib
|
zlib
|
||||||
zstd # libzstd.so.1 (PyQt6)
|
zstd # PyQt6
|
||||||
libGL # libGL.so.1 (PyQt6)
|
libGL # PyQt6
|
||||||
# PyQt6 (VeraLux) — Qt bundles xcb support so it needs these even
|
# Qt needs these even on wayland
|
||||||
# on Wayland; libxkbcommon is the keymap lib used by Wayland too.
|
|
||||||
glib
|
glib
|
||||||
fontconfig
|
fontconfig
|
||||||
freetype
|
freetype
|
||||||
dbus
|
dbus
|
||||||
libxkbcommon
|
libxkbcommon
|
||||||
# Qt platform plugins: the wayland plugin (libqwayland.so) needs the
|
# Qt platform plugins: wayland, and the xcb fallback
|
||||||
# wayland client libs; the xcb fallback needs libxcb-cursor.so.0.
|
wayland
|
||||||
wayland # libwayland-client/cursor/egl (wayland plugin)
|
libxcb-cursor
|
||||||
libxcb-cursor # libxcb-cursor.so.0 (xcb plugin)
|
|
||||||
libx11
|
libx11
|
||||||
libxcb
|
libxcb
|
||||||
libxcb-util
|
libxcb-util
|
||||||
@@ -59,32 +46,27 @@ let
|
|||||||
libxcb-image
|
libxcb-image
|
||||||
libxcb-keysyms
|
libxcb-keysyms
|
||||||
libxcb-render-util
|
libxcb-render-util
|
||||||
])}
|
]
|
||||||
|
)
|
||||||
|
}
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# install stellarium for target finding and siril for stacking
|
environment.systemPackages = [
|
||||||
environment.systemPackages = with pkgs; [
|
pkgs.stellarium
|
||||||
stellarium
|
|
||||||
sirilWithPlugins
|
sirilWithPlugins
|
||||||
];
|
];
|
||||||
|
|
||||||
# Stable, GC-safe interpreter path for Siril's venv (see sirilWithPlugins).
|
# same python siril propagates, so sirilpy's abi matches
|
||||||
# Same python as siril itself propagates, so sirilpy's ABI matches.
|
|
||||||
environment.etc."siril/bin/python3".source = "${pkgs.python3}/bin/python3";
|
environment.etc."siril/bin/python3".source = "${pkgs.python3}/bin/python3";
|
||||||
|
|
||||||
# StarNet++ has no nixpkgs package. Download the StarNet v2 ORT CLI build
|
# for StarNet++
|
||||||
# (starnet2_linux_*_ORT_x64_cli) from https://www.starnetastro.com/download/
|
programs.nix-ld = {
|
||||||
# and unzip it to ~/.local/share/siril/starnet/. Then in Siril set
|
enable = true;
|
||||||
# Preferences -> Miscellaneous -> StarNet executable
|
libraries = with pkgs; [
|
||||||
# to the extracted ./starnet2 binary.
|
stdenv.cc.cc.lib
|
||||||
#
|
|
||||||
# The binary is a generic dynamically-linked ELF, so NixOS needs nix-ld to
|
|
||||||
# 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
|
|
||||||
zlib
|
zlib
|
||||||
];
|
];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
# enable sound through pipewire
|
# enable sound through pipewire
|
||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# set bootloader to systemd
|
# set bootloader to systemd
|
||||||
@@ -17,10 +17,19 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
# 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;
|
||||||
|
|
||||||
|
# /tmp in RAM, nix builds go to /var/tmp instead (see settings.nix)
|
||||||
|
boot.tmp = {
|
||||||
|
useTmpfs = true;
|
||||||
|
tmpfsSize = "50%";
|
||||||
|
};
|
||||||
|
|
||||||
# Add boot-related packages
|
# Add boot-related packages
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
efibootmgr
|
efibootmgr
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# install calibre for ebook management and kobo syncing
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
calibre
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,3 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
let
|
let
|
||||||
caddyRootCA = ''
|
caddyRootCA = ''
|
||||||
-----BEGIN CERTIFICATE-----
|
-----BEGIN CERTIFICATE-----
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
claude-code
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,26 +1,15 @@
|
|||||||
{ config, lib, pkgs, ...}:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
# add docker group to user
|
# rootless only: no root daemon and no root-equivalent docker group
|
||||||
users.users.aaron.extraGroups = [ "docker" ];
|
virtualisation.docker.rootless = {
|
||||||
|
|
||||||
virtualisation.docker = {
|
|
||||||
enable = true;
|
|
||||||
# Customize Docker daemon settings
|
|
||||||
daemon.settings = {
|
|
||||||
dns = [ "1.1.1.1" "8.8.8.8" ];
|
|
||||||
log-driver = "journald";
|
|
||||||
registry-mirrors = [ "https://mirror.gcr.io" ];
|
|
||||||
storage-driver = "overlay2";
|
|
||||||
};
|
|
||||||
# Use the rootless mode
|
|
||||||
rootless = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
setSocketVariable = true;
|
setSocketVariable = true;
|
||||||
};
|
daemon.settings = {
|
||||||
# Install docker-compose
|
dns = [
|
||||||
extraPackages = with pkgs; [
|
"1.1.1.1"
|
||||||
docker-compose
|
"8.8.8.8"
|
||||||
];
|
];
|
||||||
|
log-driver = "journald";
|
||||||
|
registry-mirrors = [ "https://mirror.gcr.io" ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,47 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
# Add encrypted drives to argon
|
|
||||||
|
|
||||||
{
|
|
||||||
# copy keyfiles into initrd to make them available during early boot
|
|
||||||
boot.initrd.secrets = {
|
|
||||||
"/etc/nixos/keys/data1.key" = "/etc/nixos/keys/data1.key";
|
|
||||||
"/etc/nixos/keys/data2.key" = "/etc/nixos/keys/data2.key";
|
|
||||||
"/etc/nixos/keys/nvmecache.key" = "/etc/nixos/keys/nvmecache.key";
|
|
||||||
};
|
|
||||||
|
|
||||||
# decrypt data drives with keyfiles for argon
|
|
||||||
boot.initrd.luks.devices = {
|
|
||||||
"data1" = {
|
|
||||||
device = "/dev/disk/by-uuid/dfae62cc-bad1-4879-bf9a-461bde833625";
|
|
||||||
keyFile = "/etc/nixos/keys/data1.key";
|
|
||||||
};
|
|
||||||
"data2" = {
|
|
||||||
device = "/dev/disk/by-uuid/8312edae-9247-481b-a313-52a7f848f027";
|
|
||||||
keyFile = "/etc/nixos/keys/data2.key";
|
|
||||||
};
|
|
||||||
"nvmecache" = {
|
|
||||||
device = "/dev/disk/by-uuid/2352250e-4ebe-4f9a-bf66-0d4aaa961bd8";
|
|
||||||
keyFile = "/etc/nixos/keys/nvmecache.key";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# mount decrypted filesystems
|
|
||||||
fileSystems."/mnt/data1" = {
|
|
||||||
device = "/dev/mapper/data1";
|
|
||||||
fsType = "ext4";
|
|
||||||
options = [ "nofail" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/mnt/data2" = {
|
|
||||||
device = "/dev/mapper/data2";
|
|
||||||
fsType = "ext4";
|
|
||||||
options = [ "nofail" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/mnt/nvmecache" = {
|
|
||||||
device = "/dev/mapper/nvmecache";
|
|
||||||
fsType = "ext4";
|
|
||||||
options = [ "nofail" ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
+8
-13
@@ -1,29 +1,24 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
# A graphical pinentry never grabs the tty, so a passphrase prompt can't take
|
||||||
|
# over a terminal driven by a coding agent. The cache lasts a working day, and
|
||||||
|
# an unattended signature fails after two minutes instead of blocking forever.
|
||||||
|
|
||||||
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# enable gnupg agent
|
|
||||||
programs.gnupg.agent = {
|
programs.gnupg.agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# a graphical pinentry never grabs the tty, so a passphrase prompt can no
|
|
||||||
# longer take over a terminal that a coding agent is driving
|
|
||||||
pinentryPackage = pkgs.pinentry-qt;
|
pinentryPackage = pkgs.pinentry-qt;
|
||||||
settings = {
|
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;
|
default-cache-ttl = 86400;
|
||||||
max-cache-ttl = 86400;
|
max-cache-ttl = 86400;
|
||||||
# fail an unattended signature instead of blocking on a prompt forever
|
|
||||||
pinentry-timeout = 120;
|
pinentry-timeout = 120;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = [
|
||||||
gnupg
|
pkgs.pinentry-curses # fallback for sessions without a display
|
||||||
pinentry-qt
|
|
||||||
# fallback for sessions without a display, switch pinentryPackage to use it
|
|
||||||
pinentry-curses
|
|
||||||
# prime the passphrase cache on demand, e.g. before an agent session
|
# prime the passphrase cache on demand, e.g. before an agent session
|
||||||
(writeShellScriptBin "gpg-unlock" ''
|
(pkgs.writeShellScriptBin "gpg-unlock" ''
|
||||||
echo | ${config.programs.gnupg.package}/bin/gpg --clearsign --output /dev/null
|
echo | ${config.programs.gnupg.package}/bin/gpg --clearsign --output /dev/null
|
||||||
echo "gpg key unlocked"
|
echo "gpg key unlocked"
|
||||||
'')
|
'')
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# install gnuradio companion along with it's osmocom library
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
(gnuradio.override {
|
|
||||||
extraPackages = with gnuradio.pkgs; [ osmosdr ];
|
|
||||||
})
|
|
||||||
gqrx
|
|
||||||
hackrf
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
# enable amd GPU acceleration (mesa, vulkan, egl)
|
|
||||||
hardware.graphics = {
|
|
||||||
enable = true;
|
|
||||||
enable32Bit = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# install amdgpu_top
|
|
||||||
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
|
# greetd display manager with tuigreet
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
# set the time zone
|
# set the time zone
|
||||||
time.timeZone = "Europe/Zurich";
|
time.timeZone = "Europe/Zurich";
|
||||||
|
|||||||
@@ -1,20 +1,12 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# user networkmanager
|
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
# firewall default configs
|
# wifi firmware and bluetooth
|
||||||
networking.firewall.allowedTCPPorts = [ ];
|
|
||||||
networking.firewall.allowedUDPPorts = [ ];
|
|
||||||
|
|
||||||
# enable wifi firmware
|
|
||||||
hardware.enableAllFirmware = true;
|
hardware.enableAllFirmware = true;
|
||||||
|
|
||||||
# enable bluetooth
|
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
|
|
||||||
# Add network-related packages
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
update-systemd-resolved
|
update-systemd-resolved
|
||||||
|
|||||||
@@ -1,11 +1,7 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# just enable and install niri
|
# compositor and session; the config itself lives in home-manager
|
||||||
programs.niri.enable = true;
|
programs.niri.enable = true;
|
||||||
|
environment.systemPackages = [ pkgs.xwayland-satellite ];
|
||||||
# Add compositor-related packages
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
xwayland-satellite
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
{ config, lib, pkgs, inputs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# install noctalia and helper packages
|
# helpers for the noctalia shell (the shell itself comes from home-manager)
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
|
|
||||||
adw-gtk3
|
adw-gtk3
|
||||||
adwaita-qt
|
|
||||||
adwaita-qt6
|
adwaita-qt6
|
||||||
brightnessctl
|
brightnessctl
|
||||||
ddcutil
|
ddcutil
|
||||||
playerctl
|
playerctl
|
||||||
|
wl-clipboard
|
||||||
wl-mirror
|
wl-mirror
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
# enable the openssh daemon
|
# enable the openssh daemon
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# system packages
|
# baseline tools for every host
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
btop
|
btop
|
||||||
cifs-utils
|
cifs-utils
|
||||||
|
claude-code
|
||||||
cowsay
|
cowsay
|
||||||
dnsutils
|
dnsutils
|
||||||
ethtool
|
ethtool
|
||||||
@@ -14,32 +15,25 @@
|
|||||||
imv
|
imv
|
||||||
iperf3
|
iperf3
|
||||||
jq
|
jq
|
||||||
kdePackages.qtmultimedia
|
|
||||||
ldns
|
ldns
|
||||||
lm_sensors
|
lm_sensors
|
||||||
lsof
|
lsof
|
||||||
ltrace
|
|
||||||
mtr
|
mtr
|
||||||
neovim
|
|
||||||
nfs-utils
|
nfs-utils
|
||||||
nh
|
nh
|
||||||
nix-output-monitor
|
nix-output-monitor
|
||||||
nmap
|
nmap
|
||||||
nvd
|
|
||||||
p7zip
|
p7zip
|
||||||
pciutils
|
pciutils
|
||||||
socat
|
socat
|
||||||
sof-firmware
|
|
||||||
strace
|
strace
|
||||||
sysstat
|
sysstat
|
||||||
tree
|
tree
|
||||||
unzip
|
unzip
|
||||||
usbutils
|
usbutils
|
||||||
vial
|
|
||||||
vim
|
vim
|
||||||
wget
|
wget
|
||||||
which
|
which
|
||||||
wl-clipboard
|
|
||||||
xz
|
xz
|
||||||
zip
|
zip
|
||||||
zstd
|
zstd
|
||||||
|
|||||||
@@ -1,13 +1,8 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# protonvpn uses wireguard tunnels, which break strict reverse path filtering
|
# wireguard replies may leave on another interface, so strict rpfilter drops them
|
||||||
# because packets arrive on the tunnel interface but may be routed back differently.
|
|
||||||
# "loose" checks that the source is routable through *any* interface (not necessarily
|
|
||||||
# the same one), which is sufficient for wireguard while still preventing IP spoofing.
|
|
||||||
networking.firewall.checkReversePath = "loose";
|
networking.firewall.checkReversePath = "loose";
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = [ pkgs.proton-vpn ];
|
||||||
proton-vpn
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-14
@@ -1,25 +1,15 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# enable sddm and use astronaut theme
|
|
||||||
services.displayManager.sddm = {
|
services.displayManager.sddm = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wayland.enable = true;
|
wayland.enable = true;
|
||||||
autoNumlock = true;
|
autoNumlock = true;
|
||||||
enableHidpi = true;
|
enableHidpi = true;
|
||||||
theme = "sddm-astronaut-theme";
|
theme = "sddm-astronaut-theme";
|
||||||
settings = {
|
extraPackages = [ pkgs.sddm-astronaut ]; # theme's qml dependencies
|
||||||
Theme = {
|
|
||||||
Current = "sddm-astronaut-theme";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
extraPackages = with pkgs; [
|
|
||||||
sddm-astronaut
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Make the theme available in the system path so sddm can find it
|
# sddm looks for themes in the system path
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = [ pkgs.sddm-astronaut ];
|
||||||
sddm-astronaut
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
# list of enabled services on the system
|
# list of enabled services on the system
|
||||||
services = {
|
services = {
|
||||||
|
|||||||
+17
-27
@@ -1,30 +1,25 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
nix = {
|
nix = {
|
||||||
# nix settings
|
|
||||||
settings = {
|
settings = {
|
||||||
# enable flakes and nix-command
|
experimental-features = [
|
||||||
experimental-features = [ "nix-command" "flakes" ];
|
"nix-command"
|
||||||
# auto-optimize my nix-store
|
"flakes"
|
||||||
auto-optimise-store = true;
|
|
||||||
# use all cores
|
|
||||||
max-jobs = "auto";
|
|
||||||
# use all available cores per job
|
|
||||||
cores = 0;
|
|
||||||
# add trusted substituters (binary caches)
|
|
||||||
substituters = [
|
|
||||||
"https://cache.nixos.org"
|
|
||||||
"https://nix-community.cachix.org"
|
|
||||||
];
|
];
|
||||||
# add keys
|
auto-optimise-store = true;
|
||||||
trusted-public-keys = [
|
# parallel builds, each using all cores
|
||||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
max-jobs = "auto";
|
||||||
|
cores = 0;
|
||||||
|
# cache.nixos.org is the default, these come on top
|
||||||
|
extra-substituters = [ "https://nix-community.cachix.org" ];
|
||||||
|
extra-trusted-public-keys = [
|
||||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||||
];
|
];
|
||||||
|
trusted-users = [
|
||||||
|
"root"
|
||||||
|
"@wheel"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# enable automatic garbage collection
|
|
||||||
gc = {
|
gc = {
|
||||||
automatic = true;
|
automatic = true;
|
||||||
dates = "weekly";
|
dates = "weekly";
|
||||||
@@ -32,17 +27,12 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# add trusted users (able to modify the nix store)
|
# build on disk, big builds would fill the /tmp tmpfs
|
||||||
nix.settings.trusted-users = [ "root" "@wheel" ];
|
systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp";
|
||||||
|
|
||||||
# allow unfree packages (steam, protonvpn, discord, etc.)
|
# steam, protonvpn, discord, etc.
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
# links /libexec from derivations to /run/current-system/sw
|
# links /libexec from derivations to /run/current-system/sw
|
||||||
environment.pathsToLink = [ "/libexec" ];
|
environment.pathsToLink = [ "/libexec" ];
|
||||||
|
|
||||||
# enable home-manager globally
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.backupCommand = "mv -f {file} {file}.hm-bak-$(date +%Y%m%d%H%M%S)";
|
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-11
@@ -1,20 +1,13 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# enable steam and open firewall
|
|
||||||
programs.steam = {
|
programs.steam = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
# fix black screen when running under xwayland-satellite
|
||||||
|
package = pkgs.steam.override { extraArgs = "-system-composer"; };
|
||||||
remotePlay.openFirewall = true;
|
remotePlay.openFirewall = true;
|
||||||
dedicatedServer.openFirewall = true;
|
dedicatedServer.openFirewall = true;
|
||||||
localNetworkGameTransfers.openFirewall = true;
|
localNetworkGameTransfers.openFirewall = true;
|
||||||
# add proton-glorious-eggroll
|
extraCompatPackages = [ pkgs.proton-ge-bin ];
|
||||||
extraCompatPackages = with pkgs; [
|
|
||||||
proton-ge-bin
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# fix black screen in steam when using xwayland-satellite
|
|
||||||
programs.steam.package = pkgs.steam.override {
|
|
||||||
extraArgs = "-system-composer";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,9 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Enable Thunar
|
|
||||||
programs.thunar.enable = true;
|
programs.thunar.enable = true;
|
||||||
|
|
||||||
# Install Tumbler thumbnailer service
|
# thumbnails: tumbler service plus the path it loads extensions from
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = [ pkgs.tumbler ];
|
||||||
tumbler
|
|
||||||
];
|
|
||||||
|
|
||||||
# Ensure Thunar can locate the thumbnailer extensions
|
|
||||||
environment.pathsToLink = [ "share/thumbnailers" ];
|
environment.pathsToLink = [ "share/thumbnailers" ];
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-10
@@ -1,18 +1,16 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# create users
|
|
||||||
users.users.aaron = {
|
users.users.aaron = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
group = "users";
|
extraGroups = [
|
||||||
extraGroups = [ "wheel" "networkmanager" "dialout" ];
|
"wheel"
|
||||||
|
"networkmanager"
|
||||||
|
"dialout"
|
||||||
|
];
|
||||||
shell = pkgs.zsh;
|
shell = pkgs.zsh;
|
||||||
};
|
};
|
||||||
|
|
||||||
# add default zsh config
|
# login shell; plugins and prompt are configured in home-manager
|
||||||
programs.zsh = {
|
programs.zsh.enable = true;
|
||||||
enable = true;
|
|
||||||
enableCompletion = true;
|
|
||||||
autosuggestions.enable = true;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
+9
-14
@@ -1,26 +1,21 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
# Vial keyboards (lily58 pro r2g) expose a raw HID interface that vial.rocks
|
||||||
|
# drives over WebHID; its /dev/hidraw* node is root-only by default.
|
||||||
|
# The rule ships as 60-vial.rules because uaccess is only applied by
|
||||||
|
# 73-seat-late.rules, and services.udev.extraRules lands at 99, too late.
|
||||||
|
|
||||||
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Vial-capable keyboards (lily58 pro r2g) expose a second, non-keyboard raw
|
|
||||||
# HID interface that vial.rocks drives over WebHID. Its /dev/hidraw* node is
|
|
||||||
# root-only by default, so neither chromium nor the native app can open it.
|
|
||||||
#
|
|
||||||
# This has to ship as a numbered rules file rather than via
|
|
||||||
# services.udev.extraRules: extraRules lands in 99-local.rules, but the
|
|
||||||
# builtin that turns TAG+="uaccess" into an actual ACL is invoked from
|
|
||||||
# systemd's 73-seat-late.rules. A tag set at 99 is set too late to be seen,
|
|
||||||
# so the device ends up correctly tagged and still unreadable. 60- sorts
|
|
||||||
# safely ahead of 73.
|
|
||||||
services.udev.packages = [
|
services.udev.packages = [
|
||||||
(pkgs.writeTextFile {
|
(pkgs.writeTextFile {
|
||||||
name = "vial-udev-rules";
|
name = "vial-udev-rules";
|
||||||
destination = "/lib/udev/rules.d/60-vial.rules";
|
destination = "/lib/udev/rules.d/60-vial.rules";
|
||||||
# Vial firmware advertises itself through a magic USB serial, so this
|
# the magic serial matches any vial board; uaccess grants the seat owner
|
||||||
# matches any vial board rather than just the lily58. uaccess hands the
|
|
||||||
# device to whoever owns the active seat, no group membership needed.
|
|
||||||
text = ''
|
text = ''
|
||||||
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", TAG+="uaccess"
|
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{serial}=="*vial:f64c2b3c*", TAG+="uaccess"
|
||||||
'';
|
'';
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
|
environment.systemPackages = [ pkgs.vial ];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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 = [
|
imports = [
|
||||||
../../modules/home-manager/fonts.nix
|
../../modules/home-manager/fonts.nix
|
||||||
../../modules/home-manager/git.nix
|
../../modules/home-manager/git.nix
|
||||||
../../modules/home-manager/ghostty.nix
|
../../modules/home-manager/ghostty.nix
|
||||||
../../modules/home-manager/nixvim.nix
|
../../modules/home-manager/nixvim.nix
|
||||||
|
../../modules/home-manager/niri.nix
|
||||||
../../modules/home-manager/noctalia.nix
|
../../modules/home-manager/noctalia.nix
|
||||||
../../modules/home-manager/programs.nix
|
../../modules/home-manager/programs.nix
|
||||||
../../modules/home-manager/shell.nix
|
../../modules/home-manager/shell.nix
|
||||||
|
|||||||
Reference in New Issue
Block a user